diff options
author | Andrew Lee <anwlee@google.com> | 2014-11-12 18:09:58 -0800 |
---|---|---|
committer | Andrew Lee <anwlee@google.com> | 2014-11-13 09:41:16 -0800 |
commit | fd053f46a6c4323f521ccf157a4d6ea29f7fd6e6 (patch) | |
tree | cdab28e78cc9e77c2d8bfa5688315ee8fec9013d | |
parent | a90d59b4d726c54dfaca5fc3f9909473a8b5ce43 (diff) | |
download | android_packages_services_Telecomm-fd053f46a6c4323f521ccf157a4d6ea29f7fd6e6.tar.gz android_packages_services_Telecomm-fd053f46a6c4323f521ccf157a4d6ea29f7fd6e6.tar.bz2 android_packages_services_Telecomm-fd053f46a6c4323f521ccf157a4d6ea29f7fd6e6.zip |
Style quick responses to Dialer Material.
This is replicating some assets and styles (in part) from Telephony,
but unlike Telephony we don't compile PhoneCommon into Telecom at
this time.
Most of this is to style the action bar the same as the "Dialer"
Telephony settings.
Bug: 18300861
Change-Id: Ic9eed11c81bf9205c89a508bb9271b621a9dc688
-rw-r--r-- | AndroidManifest.xml | 3 | ||||
-rw-r--r-- | res/drawable-hdpi/ic_arrow_back_white_24dp.png | bin | 0 -> 287 bytes | |||
-rw-r--r-- | res/drawable-hdpi/ic_more_vert_white_24dp.png | bin | 0 -> 219 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_arrow_back_white_24dp.png | bin | 0 -> 240 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_more_vert_white_24dp.png | bin | 0 -> 202 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_arrow_back_white_24dp.png | bin | 0 -> 336 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_more_vert_white_24dp.png | bin | 0 -> 269 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/ic_arrow_back_white_24dp.png | bin | 0 -> 410 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/ic_more_vert_white_24dp.png | bin | 0 -> 313 bytes | |||
-rw-r--r-- | res/drawable-xxxhdpi/ic_arrow_back_white_24dp.png | bin | 0 -> 530 bytes | |||
-rw-r--r-- | res/drawable-xxxhdpi/ic_more_vert_white_24dp.png | bin | 0 -> 393 bytes | |||
-rw-r--r-- | res/drawable/ic_back_arrow.xml | 19 | ||||
-rw-r--r-- | res/values/colors.xml | 4 | ||||
-rw-r--r-- | res/values/dimens.xml | 2 | ||||
-rw-r--r-- | res/values/styles.xml | 26 |
15 files changed, 53 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 9a8d0cc0..d0ae09c6 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -191,7 +191,8 @@ <activity android:name=".RespondViaSmsSettings$Settings" android:label="@string/respond_via_sms_setting_title" - android:configChanges="orientation|screenSize|keyboardHidden"> + android:configChanges="orientation|screenSize|keyboardHidden" + android:theme="@style/Theme.Telecom.DialerSettings"> <intent-filter> <action android:name="android.intent.action.MAIN" /> </intent-filter> diff --git a/res/drawable-hdpi/ic_arrow_back_white_24dp.png b/res/drawable-hdpi/ic_arrow_back_white_24dp.png Binary files differnew file mode 100644 index 00000000..5fa49487 --- /dev/null +++ b/res/drawable-hdpi/ic_arrow_back_white_24dp.png diff --git a/res/drawable-hdpi/ic_more_vert_white_24dp.png b/res/drawable-hdpi/ic_more_vert_white_24dp.png Binary files differnew file mode 100644 index 00000000..675f3ee9 --- /dev/null +++ b/res/drawable-hdpi/ic_more_vert_white_24dp.png diff --git a/res/drawable-mdpi/ic_arrow_back_white_24dp.png b/res/drawable-mdpi/ic_arrow_back_white_24dp.png Binary files differnew file mode 100644 index 00000000..9e662f6d --- /dev/null +++ b/res/drawable-mdpi/ic_arrow_back_white_24dp.png diff --git a/res/drawable-mdpi/ic_more_vert_white_24dp.png b/res/drawable-mdpi/ic_more_vert_white_24dp.png Binary files differnew file mode 100644 index 00000000..1d8ad18a --- /dev/null +++ b/res/drawable-mdpi/ic_more_vert_white_24dp.png diff --git a/res/drawable-xhdpi/ic_arrow_back_white_24dp.png b/res/drawable-xhdpi/ic_arrow_back_white_24dp.png Binary files differnew file mode 100644 index 00000000..addbfc88 --- /dev/null +++ b/res/drawable-xhdpi/ic_arrow_back_white_24dp.png diff --git a/res/drawable-xhdpi/ic_more_vert_white_24dp.png b/res/drawable-xhdpi/ic_more_vert_white_24dp.png Binary files differnew file mode 100644 index 00000000..1b04eda0 --- /dev/null +++ b/res/drawable-xhdpi/ic_more_vert_white_24dp.png diff --git a/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png b/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png Binary files differnew file mode 100644 index 00000000..4057cc54 --- /dev/null +++ b/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png diff --git a/res/drawable-xxhdpi/ic_more_vert_white_24dp.png b/res/drawable-xxhdpi/ic_more_vert_white_24dp.png Binary files differnew file mode 100644 index 00000000..2955c02e --- /dev/null +++ b/res/drawable-xxhdpi/ic_more_vert_white_24dp.png diff --git a/res/drawable-xxxhdpi/ic_arrow_back_white_24dp.png b/res/drawable-xxxhdpi/ic_arrow_back_white_24dp.png Binary files differnew file mode 100644 index 00000000..02f2f6fe --- /dev/null +++ b/res/drawable-xxxhdpi/ic_arrow_back_white_24dp.png diff --git a/res/drawable-xxxhdpi/ic_more_vert_white_24dp.png b/res/drawable-xxxhdpi/ic_more_vert_white_24dp.png Binary files differnew file mode 100644 index 00000000..25b6f9f1 --- /dev/null +++ b/res/drawable-xxxhdpi/ic_more_vert_white_24dp.png diff --git a/res/drawable/ic_back_arrow.xml b/res/drawable/ic_back_arrow.xml new file mode 100644 index 00000000..cbb4c114 --- /dev/null +++ b/res/drawable/ic_back_arrow.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2014 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License + --> +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_arrow_back_white_24dp" + android:autoMirrored="true" /> diff --git a/res/values/colors.xml b/res/values/colors.xml index e93e855e..64db0852 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -16,4 +16,8 @@ <resources> <color name="theme_color">#0288d1</color> + + <color name="dialer_settings_actionbar_text_color">#ffffff</color> + <color name="dialer_settings_actionbar_background_color">@color/theme_color</color> + <color name="dialer_settings_color_dark">#0277bd</color> </resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 86d803db..f7ad0035 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -18,4 +18,6 @@ <!-- Dimension used to possibly down-scale high-res photo into what is suitable for notification's large icon. --> <dimen name="notification_icon_size">64dp</dimen> + + <dimen name="dialer_settings_actionbar_elevation">2dp</dimen> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 6b6c1bb4..f0739062 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -24,4 +24,30 @@ <item name="android:backgroundDimEnabled">true</item> <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item> </style> + + <style name="Theme.Telecom.DialerSettings" parent="@android:style/Theme.Material.Light"> + <item name="android:actionBarStyle">@style/TelecomDialerSettingsActionBarStyle</item> + <item name="android:actionOverflowButtonStyle">@style/TelecomDialerSettingsActionOverflowButtonStyle</item> + <item name="android:colorPrimaryDark">@color/dialer_settings_color_dark</item> + <item name="android:homeAsUpIndicator">@drawable/ic_back_arrow</item> + <item name="android:windowContentOverlay">@null</item> + </style> + + <style name="TelecomDialerSettingsActionBarStyle" parent="android:Widget.Material.ActionBar"> + <item name="android:background">@color/dialer_settings_actionbar_background_color</item> + <item name="android:titleTextStyle">@style/TelecomDialerSettingsActionBarTitleText</item> + <item name="android:elevation">@dimen/dialer_settings_actionbar_elevation</item> + <!-- Empty icon --> + <item name="android:icon">@android:color/transparent</item> + </style> + + <style name="TelecomDialerSettingsActionBarTitleText" + parent="@android:style/TextAppearance.Material.Widget.ActionBar.Title"> + <item name="android:textColor">@color/dialer_settings_actionbar_text_color</item> + </style> + + <style name="TelecomDialerSettingsActionOverflowButtonStyle" + parent="@android:style/Widget.Material.Light.ActionButton.Overflow"> + <item name="android:src">@drawable/ic_more_vert_white_24dp</item> + </style> </resources> |