diff options
| author | Alan Viverette <alanv@google.com> | 2014-04-02 22:23:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-02 22:23:17 +0000 |
| commit | 01cefbc5b35485d4295744aec360a143faf63df4 (patch) | |
| tree | 36ba5e21c5131a823dade40b23ca362c057d6a04 /packages/PrintSpooler | |
| parent | ed3f28ad0dc301605b6eb894a883408b2f9f51cf (diff) | |
| parent | b325345ef0adf2849350d339de1ec5f92b67b7ae (diff) | |
| download | frameworks_base-01cefbc5b35485d4295744aec360a143faf63df4.zip frameworks_base-01cefbc5b35485d4295744aec360a143faf63df4.tar.gz frameworks_base-01cefbc5b35485d4295744aec360a143faf63df4.tar.bz2 | |
am b325345e: Merge "Switch framework Holo references to Quantum.Light"
* commit 'b325345ef0adf2849350d339de1ec5f92b67b7ae':
Switch framework Holo references to Quantum.Light
Diffstat (limited to 'packages/PrintSpooler')
| -rw-r--r-- | packages/PrintSpooler/res/layout/select_printer_activity.xml | 2 | ||||
| -rw-r--r-- | packages/PrintSpooler/res/values/themes.xml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/packages/PrintSpooler/res/layout/select_printer_activity.xml b/packages/PrintSpooler/res/layout/select_printer_activity.xml index 6fc77df..4488b6a 100644 --- a/packages/PrintSpooler/res/layout/select_printer_activity.xml +++ b/packages/PrintSpooler/res/layout/select_printer_activity.xml @@ -61,7 +61,7 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:indeterminate="true" - style="@android:style/Widget.Holo.ProgressBar.Horizontal"> + style="@android:style/Widget.DeviceDefault.Light.ProgressBar.Horizontal"> </ProgressBar> </LinearLayout> diff --git a/packages/PrintSpooler/res/values/themes.xml b/packages/PrintSpooler/res/values/themes.xml index 86f4a37..94ab895 100644 --- a/packages/PrintSpooler/res/values/themes.xml +++ b/packages/PrintSpooler/res/values/themes.xml @@ -16,7 +16,7 @@ <resources> - <style name="PrintJobConfigActivityTheme" parent="@android:style/Theme.Holo.Light.NoActionBar"> + <style name="PrintJobConfigActivityTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar"> <item name="android:windowBackground">@android:color/transparent</item> <item name="android:windowSoftInputMode">stateAlwaysHidden|adjustResize</item> <item name="android:windowIsTranslucent">true</item> @@ -25,11 +25,11 @@ <item name="android:windowIsFloating">true</item> </style> - <style name="SelectPrinterActivityTheme" parent="@android:style/Theme.Holo.Light"> + <style name="SelectPrinterActivityTheme" parent="@android:style/Theme.DeviceDefault.Light"> <item name="android:actionBarStyle">@style/SelectPrinterActivityActionBarStyle</item> </style> - <style name="SelectPrinterActivityActionBarStyle" parent="@android:style/Widget.Holo.ActionBar"> + <style name="SelectPrinterActivityActionBarStyle" parent="@android:style/Widget.DeviceDefault.Light.ActionBar"> <item name="android:displayOptions">showTitle</item> </style> |