diff options
author | Lucas Dupin <dupin@google.com> | 2017-05-11 14:52:36 -0700 |
---|---|---|
committer | Lucas Dupin <dupin@google.com> | 2017-05-18 10:58:05 -0700 |
commit | 0865104423971393ad6d00b0e8f5aeb2d908b59a (patch) | |
tree | 853a69ef25032361651a6bc3dcf68916e5ae0bf6 /res | |
parent | 789303e3fef438a1745baac60cbfaf1f6f9a1580 (diff) | |
download | packages_apps_PhoneCommon-0865104423971393ad6d00b0e8f5aeb2d908b59a.tar.gz packages_apps_PhoneCommon-0865104423971393ad6d00b0e8f5aeb2d908b59a.tar.bz2 packages_apps_PhoneCommon-0865104423971393ad6d00b0e8f5aeb2d908b59a.zip |
Light theme with transparency, new grid
New dialer theme, used on top of extracted gradient.
Test: Open emergency dialer with light background image
Bug: 37014702
Change-Id: I2e729adfdd21dd3273e09ba2b5f9ed88c5b17037
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/dialpad.xml | 16 | ||||
-rw-r--r-- | res/layout/dialpad_view_unthemed.xml | 8 | ||||
-rw-r--r-- | res/values/attrs.xml | 3 | ||||
-rw-r--r-- | res/values/dimens.xml | 2 | ||||
-rw-r--r-- | res/values/styles.xml | 30 |
5 files changed, 43 insertions, 16 deletions
diff --git a/res/layout/dialpad.xml b/res/layout/dialpad.xml index ebfb22d..77dd5ff 100644 --- a/res/layout/dialpad.xml +++ b/res/layout/dialpad.xml @@ -27,7 +27,7 @@ android:layout_height="0dp" android:layout_weight="1" android:orientation="horizontal"> - <Space style="@style/DialpadSpaceStyle" /> + <Space style="?attr/dialpad_margin_style" /> <include layout="@layout/dialpad_key_one" /> <include layout="@layout/dialpad_key" android:id="@+id/two" @@ -35,7 +35,7 @@ <include layout="@layout/dialpad_key" android:id="@+id/three" style="@style/DialpadKeyButtonStyle" /> - <Space style="@style/DialpadSpaceStyle" /> + <Space style="?attr/dialpad_margin_style" /> </LinearLayout> <LinearLayout @@ -43,7 +43,7 @@ android:layout_height="0dp" android:layout_weight="1" android:orientation="horizontal"> - <Space style="@style/DialpadSpaceStyle" /> + <Space style="?attr/dialpad_margin_style" /> <include layout="@layout/dialpad_key" android:id="@+id/four" style="@style/DialpadKeyButtonStyle" /> @@ -53,7 +53,7 @@ <include layout="@layout/dialpad_key" android:id="@+id/six" style="@style/DialpadKeyButtonStyle" /> - <Space style="@style/DialpadSpaceStyle" /> + <Space style="?attr/dialpad_margin_style" /> </LinearLayout> <LinearLayout @@ -61,7 +61,7 @@ android:layout_height="0dp" android:layout_weight="1" android:orientation="horizontal"> - <Space style="@style/DialpadSpaceStyle" /> + <Space style="?attr/dialpad_margin_style" /> <include layout="@layout/dialpad_key" android:id="@+id/seven" style="@style/DialpadKeyButtonStyle" /> @@ -71,7 +71,7 @@ <include layout="@layout/dialpad_key" android:id="@+id/nine" style="@style/DialpadKeyButtonStyle" /> - <Space style="@style/DialpadSpaceStyle" /> + <Space style="?attr/dialpad_margin_style" /> </LinearLayout> <LinearLayout @@ -79,11 +79,11 @@ android:layout_height="0dp" android:layout_weight="1" android:orientation="horizontal"> - <Space style="@style/DialpadSpaceStyle" /> + <Space style="?attr/dialpad_margin_style" /> <include layout="@layout/dialpad_key_star" /> <include layout="@layout/dialpad_key_zero" /> <include layout="@layout/dialpad_key_pound" /> - <Space style="@style/DialpadSpaceStyle" /> + <Space style="?attr/dialpad_margin_style" /> </LinearLayout> <Space android:layout_width="match_parent" diff --git a/res/layout/dialpad_view_unthemed.xml b/res/layout/dialpad_view_unthemed.xml index 16b6208..0516a36 100644 --- a/res/layout/dialpad_view_unthemed.xml +++ b/res/layout/dialpad_view_unthemed.xml @@ -56,7 +56,7 @@ <View android:layout_width="match_parent" android:layout_height="1dp" - android:background="#e3e3e3" /> + android:background="?attr/dialpad_separator_color" /> </LinearLayout> @@ -119,8 +119,8 @@ android:id="@+id/deleteButton" android:background="@drawable/btn_dialpad_key" android:tint="?attr/dialpad_icon_tint" - android:paddingLeft="@dimen/dialpad_digits_padding" - android:paddingRight="@dimen/dialpad_digits_padding" + android:paddingStart="@dimen/dialpad_digits_padding" + android:paddingEnd="?attr/dialpad_delete_padding" android:layout_width="wrap_content" android:layout_height="match_parent" android:state_enabled="false" @@ -131,7 +131,7 @@ <View android:layout_width="match_parent" android:layout_height="1dp" - android:background="#e3e3e3" /> + android:background="?attr/dialpad_separator_color" /> <Space android:layout_width="match_parent" diff --git a/res/values/attrs.xml b/res/values/attrs.xml index c47f81b..50d8662 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -30,5 +30,8 @@ <attr name="dialpad_icon_tint" format="color" /> <attr name="dialpad_voicemail_tint" format="color" /> <attr name="dialpad_background" format="color" /> + <attr name="dialpad_separator_color" format="color" /> + <attr name="dialpad_margin_style" format="reference"/> + <attr name="dialpad_delete_padding" format="dimension" /> </declare-styleable> </resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index adaef0a..7734bd4 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -56,7 +56,7 @@ <!-- Corner radius of the floating action button --> <dimen name="floating_action_button_radius">28dp</dimen> <!-- Z translation of the floating action button --> - <dimen name="floating_action_button_translation_z">8dp</dimen> + <dimen name="floating_action_button_translation_z">2dp</dimen> <!-- Padding to be applied to the bottom of lists to make space for the floating action button --> <dimen name="floating_action_button_list_bottom_padding">88dp</dimen> diff --git a/res/values/styles.xml b/res/values/styles.xml index 8eee67d..c087966 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -21,6 +21,12 @@ <item name="android:layout_weight">3</item> </style> + <style name="DialpadNoSpaceStyle"> + <item name="android:layout_width">0dp</item> + <item name="android:layout_height">match_parent</item> + <item name="android:visibility">gone</item> + </style> + <style name="DialpadKeyNumberStyle"> <item name="android:textColor">?attr/dialpad_text_color_primary</item> <item name="android:textSize">@dimen/dialpad_key_numbers_size</item> @@ -92,14 +98,32 @@ <item name="dialpad_icon_tint">@color/dialpad_icon_tint</item> <item name="dialpad_voicemail_tint">@color/dialpad_voicemail_tint</item> <item name="dialpad_background">@color/background_dialpad</item> + <item name="dialpad_separator_color">#e3e3e3</item> + <item name="dialpad_margin_style">@style/DialpadSpaceStyle</item> + <item name="dialpad_delete_padding">@dimen/dialpad_digits_padding</item> + </style> + + <style name="Dialpad_LightTransparent"> + <item name="dialpad_text_color">#414549</item> + <item name="dialpad_text_color_primary">#414549</item> + <item name="dialpad_text_color_secondary">#767C80</item> + <item name="dialpad_icon_tint">?attr/dialpad_text_color_secondary</item> + <item name="dialpad_voicemail_tint">?attr/dialpad_text_color_secondary</item> + <item name="dialpad_background">@android:color/transparent</item> + <item name="dialpad_separator_color">?attr/dialpad_text_color_secondary</item> + <item name="dialpad_margin_style">@style/DialpadNoSpaceStyle</item> + <item name="dialpad_delete_padding">1dp</item> </style> - <style name="Dialpad_Dark"> + <style name="Dialpad_DarkTransparent"> <item name="dialpad_text_color">@android:color/white</item> <item name="dialpad_text_color_primary">@android:color/white</item> - <item name="dialpad_text_color_secondary">#ffd4d6d7</item> + <item name="dialpad_text_color_secondary">#ccffffff</item> <item name="dialpad_icon_tint">@android:color/white</item> <item name="dialpad_voicemail_tint">?attr/dialpad_text_color_secondary</item> - <item name="dialpad_background">#00000000</item> + <item name="dialpad_background">@android:color/transparent</item> + <item name="dialpad_separator_color">#7fffffff</item> + <item name="dialpad_margin_style">@style/DialpadNoSpaceStyle</item> + <item name="dialpad_delete_padding">1dp</item> </style> </resources> |