diff options
author | Danny Baumann <dannybaumann@web.de> | 2014-11-12 17:01:47 -0800 |
---|---|---|
committer | Matt Garnes <matt@cyngn.com> | 2014-11-13 17:48:12 -0800 |
commit | 95077fee0039b5833f0e5ab7066f4d03c7694abd (patch) | |
tree | a79bbb2cbdbcc44eb1047620be0200b02ced3408 /res | |
parent | 5acc180074556da9885c8282901f4331afd27348 (diff) | |
download | android_packages_apps_Dialer-95077fee0039b5833f0e5ab7066f4d03c7694abd.tar.gz android_packages_apps_Dialer-95077fee0039b5833f0e5ab7066f4d03c7694abd.tar.bz2 android_packages_apps_Dialer-95077fee0039b5833f0e5ab7066f4d03c7694abd.zip |
Dialer: Make the call stats spinner match the other actionbar theming
Conflicts:
res/values/styles.xml
Change-Id: I9bb5a1e344aa33c4651a20f37875bbed8f3bd9e3
Diffstat (limited to 'res')
20 files changed, 72 insertions, 1 deletions
diff --git a/res/drawable-hdpi/spinner_default_holo_dark.9.png b/res/drawable-hdpi/spinner_default_holo_dark.9.png Binary files differnew file mode 100644 index 000000000..78e583ce2 --- /dev/null +++ b/res/drawable-hdpi/spinner_default_holo_dark.9.png diff --git a/res/drawable-hdpi/spinner_disabled_holo_dark.9.png b/res/drawable-hdpi/spinner_disabled_holo_dark.9.png Binary files differnew file mode 100644 index 000000000..210832cd3 --- /dev/null +++ b/res/drawable-hdpi/spinner_disabled_holo_dark.9.png diff --git a/res/drawable-hdpi/spinner_focused_holo_dark.9.png b/res/drawable-hdpi/spinner_focused_holo_dark.9.png Binary files differnew file mode 100644 index 000000000..5135f2ba6 --- /dev/null +++ b/res/drawable-hdpi/spinner_focused_holo_dark.9.png diff --git a/res/drawable-hdpi/spinner_pressed_holo_dark.9.png b/res/drawable-hdpi/spinner_pressed_holo_dark.9.png Binary files differnew file mode 100644 index 000000000..aca943565 --- /dev/null +++ b/res/drawable-hdpi/spinner_pressed_holo_dark.9.png diff --git a/res/drawable-mdpi/spinner_default_holo_dark.9.png b/res/drawable-mdpi/spinner_default_holo_dark.9.png Binary files differnew file mode 100644 index 000000000..5ac84dd14 --- /dev/null +++ b/res/drawable-mdpi/spinner_default_holo_dark.9.png diff --git a/res/drawable-mdpi/spinner_disabled_holo_dark.9.png b/res/drawable-mdpi/spinner_disabled_holo_dark.9.png Binary files differnew file mode 100644 index 000000000..2734f20bf --- /dev/null +++ b/res/drawable-mdpi/spinner_disabled_holo_dark.9.png diff --git a/res/drawable-mdpi/spinner_focused_holo_dark.9.png b/res/drawable-mdpi/spinner_focused_holo_dark.9.png Binary files differnew file mode 100644 index 000000000..392c72ff8 --- /dev/null +++ b/res/drawable-mdpi/spinner_focused_holo_dark.9.png diff --git a/res/drawable-mdpi/spinner_pressed_holo_dark.9.png b/res/drawable-mdpi/spinner_pressed_holo_dark.9.png Binary files differnew file mode 100644 index 000000000..75fb81e3a --- /dev/null +++ b/res/drawable-mdpi/spinner_pressed_holo_dark.9.png diff --git a/res/drawable-xhdpi/spinner_default_holo_dark.9.png b/res/drawable-xhdpi/spinner_default_holo_dark.9.png Binary files differnew file mode 100644 index 000000000..fadfb5d01 --- /dev/null +++ b/res/drawable-xhdpi/spinner_default_holo_dark.9.png diff --git a/res/drawable-xhdpi/spinner_disabled_holo_dark.9.png b/res/drawable-xhdpi/spinner_disabled_holo_dark.9.png Binary files differnew file mode 100644 index 000000000..7c3c49baf --- /dev/null +++ b/res/drawable-xhdpi/spinner_disabled_holo_dark.9.png diff --git a/res/drawable-xhdpi/spinner_focused_holo_dark.9.png b/res/drawable-xhdpi/spinner_focused_holo_dark.9.png Binary files differnew file mode 100644 index 000000000..fdb0d5daa --- /dev/null +++ b/res/drawable-xhdpi/spinner_focused_holo_dark.9.png diff --git a/res/drawable-xhdpi/spinner_pressed_holo_dark.9.png b/res/drawable-xhdpi/spinner_pressed_holo_dark.9.png Binary files differnew file mode 100644 index 000000000..2023a9d1b --- /dev/null +++ b/res/drawable-xhdpi/spinner_pressed_holo_dark.9.png diff --git a/res/drawable-xxhdpi/spinner_default_holo_dark.9.png b/res/drawable-xxhdpi/spinner_default_holo_dark.9.png Binary files differnew file mode 100644 index 000000000..b0020f25f --- /dev/null +++ b/res/drawable-xxhdpi/spinner_default_holo_dark.9.png diff --git a/res/drawable-xxhdpi/spinner_disabled_holo_dark.9.png b/res/drawable-xxhdpi/spinner_disabled_holo_dark.9.png Binary files differnew file mode 100644 index 000000000..7c1209687 --- /dev/null +++ b/res/drawable-xxhdpi/spinner_disabled_holo_dark.9.png diff --git a/res/drawable-xxhdpi/spinner_focused_holo_dark.9.png b/res/drawable-xxhdpi/spinner_focused_holo_dark.9.png Binary files differnew file mode 100644 index 000000000..41bb295fc --- /dev/null +++ b/res/drawable-xxhdpi/spinner_focused_holo_dark.9.png diff --git a/res/drawable-xxhdpi/spinner_pressed_holo_dark.9.png b/res/drawable-xxhdpi/spinner_pressed_holo_dark.9.png Binary files differnew file mode 100644 index 000000000..e2212a5e6 --- /dev/null +++ b/res/drawable-xxhdpi/spinner_pressed_holo_dark.9.png diff --git a/res/drawable/spinner_ab_holo_dark.xml b/res/drawable/spinner_ab_holo_dark.xml new file mode 100644 index 000000000..a8baaa115 --- /dev/null +++ b/res/drawable/spinner_ab_holo_dark.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2014 The CyanogenMod 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. +--> +<selector xmlns:android="http://schemas.android.com/apk/res/android" + android:autoMirrored="true"> + + <item android:state_enabled="false" + android:drawable="@drawable/spinner_disabled_holo_dark" /> + + <item android:state_pressed="true" + android:drawable="@drawable/spinner_pressed_holo_dark" /> + + <item android:state_pressed="false" + android:state_focused="true" + android:drawable="@drawable/spinner_focused_holo_dark" /> + + <item android:drawable="@drawable/spinner_default_holo_dark" /> +</selector> diff --git a/res/layout/call_stats_filter_spinner.xml b/res/layout/call_stats_filter_spinner.xml new file mode 100644 index 000000000..b2054e7ad --- /dev/null +++ b/res/layout/call_stats_filter_spinner.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2014 The CyanogenMod 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. +--> +<Spinner xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + style="@style/DialtactsActionBarSpinner" /> diff --git a/res/menu/call_stats_options.xml b/res/menu/call_stats_options.xml index 6cc9ec0d0..3c683750e 100644 --- a/res/menu/call_stats_options.xml +++ b/res/menu/call_stats_options.xml @@ -18,7 +18,7 @@ <item android:id="@+id/filter" android:showAsAction="always" - android:actionViewClass="android.widget.Spinner" /> + android:actionLayout="@layout/call_stats_filter_spinner" /> <item android:id="@+id/date_filter" diff --git a/res/values/styles.xml b/res/values/styles.xml index eb55c534d..fccf3dd2a 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -104,6 +104,26 @@ <style name="DialtactsActivityTheme" parent="DialtactsTheme"> <item name="android:actionBarStyle">@style/DialtactsActionBarWithoutTitleStyle</item> <item name="android:fastScrollThumbDrawable">@drawable/fastscroll_thumb</item> + + </style> + <!-- A theme for inflation of spinners in the dialtacts action bar --> + <style name="DialtactsSpinnerTheme" parent="DialtactsTheme"> + <item name="android:textAppearanceListItemSmall">@android:style/TextAppearance.Holo.Medium.Inverse</item> + </style> + + <style name="DialtactsActionBarSpinner" + parent="@*android:style/Widget.Holo.Light.Spinner.DropDown.ActionBar"> + + <item name="android:background">@drawable/spinner_ab_holo_dark</item> + </style> + + <style name="CallDetailActivityTheme1" parent="android:Theme.Holo.Light"> + <item name="android:windowBackground">@color/background_dialer_list_items</item> + <item name="android:gravity">top</item> + <item name="android:listViewStyle">@style/ListViewStyle</item> + <item name="android:actionBarStyle">@style/DialtactsActionBarStyle</item> + <item name="android:actionOverflowButtonStyle">@style/DialtactsActionBarOverflow</item> + <item name="android:homeAsUpIndicator">@drawable/ic_back_arrow</item> </style> <style name="CallDetailActivityTheme" parent="DialtactsThemeWithoutActionBarOverlay"> |