diff options
Diffstat (limited to 'java')
12 files changed, 43 insertions, 34 deletions
diff --git a/java/com/android/dialer/app/res/values-night/colors.xml b/java/com/android/dialer/app/res/values-night/colors.xml index d5ff76b43..e758d9085 100644 --- a/java/com/android/dialer/app/res/values-night/colors.xml +++ b/java/com/android/dialer/app/res/values-night/colors.xml @@ -15,6 +15,6 @@ --> <resources> - <color name="nav_item">@*android:color/system_neutral1_300</color> - <color name="nav_item_selected">@*android:color/system_accent1_400</color> + <color name="nav_item">@*android:color/system_accent1_100</color> + <color name="nav_item_selected">@*android:color/system_accent1_100</color> </resources> diff --git a/java/com/android/dialer/app/res/values/colors.xml b/java/com/android/dialer/app/res/values/colors.xml index a00137ef4..afb760a8b 100644 --- a/java/com/android/dialer/app/res/values/colors.xml +++ b/java/com/android/dialer/app/res/values/colors.xml @@ -26,6 +26,7 @@ <!-- Colors for blocked numbers list --> <color name="blocked_number_block_color">#F44336</color> - <color name="nav_item">@*android:color/system_neutral1_600</color> - <color name="nav_item_selected">@*android:color/system_accent1_600</color> + <color name="nav_item">@*android:color/system_neutral2_1000</color> + <color name="nav_item_selected">@*android:color/system_neutral2_1000</color> + <color name="ic_launcher_background">#2D81FE</color> </resources> diff --git a/java/com/android/dialer/dialpadview/res/layout/dialpad_view_unthemed.xml b/java/com/android/dialer/dialpadview/res/layout/dialpad_view_unthemed.xml index daf5fdcc6..e31544303 100644 --- a/java/com/android/dialer/dialpadview/res/layout/dialpad_view_unthemed.xml +++ b/java/com/android/dialer/dialpadview/res/layout/dialpad_view_unthemed.xml @@ -81,7 +81,7 @@ android:contentDescription="@string/description_dialpad_back" android:gravity="center" android:src="@drawable/quantum_ic_close_vd_theme_24" - android:tint="@*android:color/system_accent1_500" + android:tint="@color/dialer_buttons_color" android:tintMode="src_in" android:visibility="gone"/> @@ -96,7 +96,7 @@ android:contentDescription="@string/description_dialpad_overflow" android:gravity="center" android:src="@drawable/quantum_ic_more_vert_vd_theme_24" - android:tint="@*android:color/system_accent1_500" + android:tint="@color/dialer_buttons_color" android:tintMode="src_in" android:visibility="gone"/> <FrameLayout android:layout_width="0dp" @@ -142,7 +142,7 @@ android:contentDescription="@string/description_delete_button" android:src="@drawable/quantum_ic_backspace_white_24" android:state_enabled="false" - android:tint="@*android:color/system_accent1_500" + android:tint="@color/dialer_buttons_color" android:tintMode="src_in"/> </LinearLayout> diff --git a/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_item.xml b/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_item.xml index 921171fd4..59c653712 100644 --- a/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_item.xml +++ b/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_item.xml @@ -30,9 +30,9 @@ <ImageView android:id="@+id/bottom_nav_item_image" - android:layout_width="28dp" - android:layout_height="28dp" - android:layout_marginBottom="2dp" + android:layout_width="24dp" + android:layout_height="24dp" + android:layout_marginBottom="8dp" android:layout_marginTop="6dp"/> <TextView @@ -60,6 +60,6 @@ android:layout_height="wrap_content" android:layout_marginBottom="6dp" android:gravity="center_horizontal" - android:textSize="15sp" + android:textSize="14sp" style="@style/Dialer.TextAppearance.OVERLINE"/> </com.android.dialer.main.impl.bottomnav.BottomNavItem> diff --git a/java/com/android/dialer/main/impl/res/layout/main_activity.xml b/java/com/android/dialer/main/impl/res/layout/main_activity.xml index 25db63773..8ab666741 100644 --- a/java/com/android/dialer/main/impl/res/layout/main_activity.xml +++ b/java/com/android/dialer/main/impl/res/layout/main_activity.xml @@ -62,7 +62,7 @@ android:layout_gravity="end|bottom" android:src="@drawable/quantum_ic_dialpad_white_24" android:contentDescription="@string/dialpad_button_content_description" - app:backgroundTint="?android:attr/colorAccent"/> + app:backgroundTint="@color/dialer_theme_color"/> <include android:id="@+id/promotion_bottom_sheet" layout="@layout/promotion_bottom_sheet"/> diff --git a/java/com/android/dialer/main/impl/toolbar/SearchBarView.java b/java/com/android/dialer/main/impl/toolbar/SearchBarView.java index 60b067379..1c326d16a 100644 --- a/java/com/android/dialer/main/impl/toolbar/SearchBarView.java +++ b/java/com/android/dialer/main/impl/toolbar/SearchBarView.java @@ -187,11 +187,12 @@ final class SearchBarView extends FrameLayout { */ private void setMargins(float fraction) { int margin = (int) (this.margin * fraction); + int sideMargin = (int) (this.margin * 2f); MarginLayoutParams params = (MarginLayoutParams) getLayoutParams(); params.topMargin = margin; params.bottomMargin = margin; - params.leftMargin = margin; - params.rightMargin = margin; + params.leftMargin = sideMargin; + params.rightMargin = sideMargin; searchBoxExpanded.getLayoutParams().height = (int) (animationEndHeight - (animationEndHeight - animationStartHeight) * fraction); } diff --git a/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml b/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml index d46e406d6..7a366fa57 100644 --- a/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml +++ b/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml @@ -27,7 +27,8 @@ android:id="@+id/search_view_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="@dimen/search_bar_margin" + android:layout_marginVertical="8dp" + android:layout_marginHorizontal="16dp" android:background="@drawable/search_bar_background_rounded_corners" android:minHeight="@dimen/collapsed_search_bar_height"> diff --git a/java/com/android/dialer/main/impl/toolbar/res/values/dimens.xml b/java/com/android/dialer/main/impl/toolbar/res/values/dimens.xml index ed6f197fa..cdb154c56 100644 --- a/java/com/android/dialer/main/impl/toolbar/res/values/dimens.xml +++ b/java/com/android/dialer/main/impl/toolbar/res/values/dimens.xml @@ -19,4 +19,4 @@ <dimen name="collapsed_search_bar_height">48dp</dimen> <!-- collapsed + margin * 2 --> <dimen name="expanded_search_bar_height">64dp</dimen> -</resources>
\ No newline at end of file +</resources> diff --git a/java/com/android/dialer/theme/common/res/values/colors.xml b/java/com/android/dialer/theme/common/res/values/colors.xml index 1831862b1..5e6b45088 100644 --- a/java/com/android/dialer/theme/common/res/values/colors.xml +++ b/java/com/android/dialer/theme/common/res/values/colors.xml @@ -16,7 +16,7 @@ --> <!-- The colors in this file aren't configured at the theme level. --> <resources> - <color name="dialer_call_green">#00C853</color> + <color name="dialer_call_green">@color/dialer_theme_color</color> <color name="dialer_end_call_button_color">#BD2A2A</color> <color name="dialer_divider_line_color">#D8D8D8</color> <color name="dialer_link_color">#2A56C6</color> @@ -31,4 +31,4 @@ <!-- Legacy --> <color name="blue_grey_100">#CFD8DC</color> -</resources>
\ No newline at end of file +</resources> diff --git a/java/com/android/dialer/theme/hidden/res/values-night/colors_dialer_dark.xml b/java/com/android/dialer/theme/hidden/res/values-night/colors_dialer_dark.xml index 8d04c7253..e8211e80c 100644 --- a/java/com/android/dialer/theme/hidden/res/values-night/colors_dialer_dark.xml +++ b/java/com/android/dialer/theme/hidden/res/values-night/colors_dialer_dark.xml @@ -15,10 +15,14 @@ --> <resources> <!-- Essential theme colors --> - <color name="dialer_theme_color">#5195EA</color> - <color name="dialer_theme_color_20pct">#335195EA</color> - <color name="dialer_secondary_color">#5195EA</color> - <color name="dialer_ripple_color">#33ffffff</color> - <color name="dialer_search_bar_color">@color/google_grey_900</color> - <color name="settings_primary_dark">#2374CE</color> + <color name="dialer_theme_color">@*android:color/system_accent1_100</color> + <color name="dialer_theme_color_20pct">@*android:color/system_accent1_100</color> + <color name="dialer_dark_theme_color_20pct">@color/dialer_theme_color</color> + <color name="dialer_theme_color_dark">@color/dialer_background_color</color> + <color name="dialer_secondary_color">@*android:color/system_accent2_50</color> + <color name="dialer_background_color">@*android:color/system_neutral1_900</color> + <color name="dialer_background_floating">@*android:color/system_neutral2_800</color> + <color name="dialer_search_bar_color">@*android:color/system_neutral2_800</color> + <color name="rounded_dialpad_bg_color">@*android:color/system_neutral2_800</color> + <color name="dialer_buttons_color">@*android:color/system_accent1_100</color> </resources> diff --git a/java/com/android/dialer/theme/hidden/res/values/colors_dialer_light.xml b/java/com/android/dialer/theme/hidden/res/values/colors_dialer_light.xml index 1fe096390..b3772ce32 100644 --- a/java/com/android/dialer/theme/hidden/res/values/colors_dialer_light.xml +++ b/java/com/android/dialer/theme/hidden/res/values/colors_dialer_light.xml @@ -15,15 +15,17 @@ --> <resources> <!-- Essential theme colors --> - <color name="dialer_theme_color">@android:color/system_accent1_600</color> - <color name="dialer_theme_color_20pct">#332A56C6</color> + <color name="dialer_theme_color">@*android:color/system_accent1_600</color> + <color name="dialer_theme_color_20pct">@*android:color/system_accent1_600</color> + <color name="dialer_dark_theme_color_20pct">@*android:color/system_accent1_600</color> <color name="dialer_theme_color_dark">@color/dialer_background_color</color> - <color name="dialer_secondary_color">@android:color/system_accent3_400</color> - <color name="dialer_background_color">@android:color/system_neutral1_50</color> - <color name="dialer_background_floating">@android:color/system_neutral1_100</color> + <color name="dialer_secondary_color">@*android:color/system_accent2_600</color> + <color name="dialer_background_color">@*android:color/system_neutral1_50</color> + <color name="dialer_background_floating">@*android:color/system_neutral2_100</color> <color name="dialer_ripple_color">#1f000000</color> - <color name="dialer_search_bar_color">@android:color/system_neutral1_100</color> - <color name="settings_primary_dark">@android:color/system_accent1_700</color> - <color name="settings_primary">@android:color/system_accent1_600</color> - <color name="rounded_dialpad_bg_color">@android:color/system_neutral1_100</color> + <color name="dialer_search_bar_color">@*android:color/system_neutral2_100</color> + <color name="settings_primary_dark">@*android:color/system_accent1_700</color> + <color name="settings_primary">@*android:color/system_accent1_600</color> + <color name="rounded_dialpad_bg_color">@*android:color/system_neutral2_100</color> + <color name="dialer_buttons_color">@*android:color/system_neutral2_1000</color> </resources> diff --git a/java/com/android/incallui/commontheme/res/drawable/incall_end_call_background.xml b/java/com/android/incallui/commontheme/res/drawable/incall_end_call_background.xml index 3c9f4bc0b..01cee625e 100644 --- a/java/com/android/incallui/commontheme/res/drawable/incall_end_call_background.xml +++ b/java/com/android/incallui/commontheme/res/drawable/incall_end_call_background.xml @@ -4,7 +4,7 @@ <item> <shape android:shape="oval"> - <solid android:color="#FFDF0000"/> + <solid android:color="@color/dialer_theme_color"/> </shape> </item> </ripple> |