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/Keyguard | |
| 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/Keyguard')
| -rw-r--r-- | packages/Keyguard/res/values/styles.xml | 2 | ||||
| -rw-r--r-- | packages/Keyguard/test/AndroidManifest.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/Keyguard/res/values/styles.xml b/packages/Keyguard/res/values/styles.xml index d4f98af..80fcf75 100644 --- a/packages/Keyguard/res/values/styles.xml +++ b/packages/Keyguard/res/values/styles.xml @@ -68,7 +68,7 @@ <item name="android:textSize">@dimen/widget_big_font_size</item> </style> - <style name="Widget.TransportControl.SeekBar" parent="@android:style/Widget.Holo.SeekBar"> + <style name="Widget.TransportControl.SeekBar" parent="@android:style/Widget.DeviceDefault.Light.SeekBar"> <item name="android:indeterminateOnly">false</item> <item name="android:progressDrawable">@drawable/scrubber_progress_horizontal_holo_light</item> <item name="android:indeterminateDrawable">@drawable/scrubber_progress_horizontal_holo_light</item> diff --git a/packages/Keyguard/test/AndroidManifest.xml b/packages/Keyguard/test/AndroidManifest.xml index b801e4b..1638127 100644 --- a/packages/Keyguard/test/AndroidManifest.xml +++ b/packages/Keyguard/test/AndroidManifest.xml @@ -23,7 +23,7 @@ <application android:label="@string/app_name" android:icon="@drawable/app_icon"> <activity android:name=".KeyguardTestActivity" android:label="@string/app_name" - android:theme="@android:style/Theme.Holo"> + android:theme="@android:style/Theme.DeviceDefault.Light"> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.LAUNCHER" /> |