diff options
| author | Will Haldean Brown <haldean@google.com> | 2014-03-25 21:51:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-25 21:51:55 +0000 |
| commit | 7e98cee6c2e9770dab9133d7aad6e5affd4a7c40 (patch) | |
| tree | 626e41ecffa26f78c142d1b9ed73f0ac441b5ccf | |
| parent | d89929db3e010eaa68d8f7c8227f95cdd4fb5179 (diff) | |
| parent | f3f1c7a3346aa82ab045d037c2ec6e45c5fc2678 (diff) | |
| download | frameworks_base-7e98cee6c2e9770dab9133d7aad6e5affd4a7c40.zip frameworks_base-7e98cee6c2e9770dab9133d7aad6e5affd4a7c40.tar.gz frameworks_base-7e98cee6c2e9770dab9133d7aad6e5affd4a7c40.tar.bz2 | |
am f3f1c7a3: am 63d161e4: Merge "Remove all but two micro themes, light and dark." into klp-modular-dev
* commit 'f3f1c7a3346aa82ab045d037c2ec6e45c5fc2678':
Remove all but two micro themes, light and dark.
| -rw-r--r-- | core/res/res/values/themes_micro.xml | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/core/res/res/values/themes_micro.xml b/core/res/res/values/themes_micro.xml index 7c0b7bc..f51b8df 100644 --- a/core/res/res/values/themes_micro.xml +++ b/core/res/res/values/themes_micro.xml @@ -23,7 +23,7 @@ <item name="windowSwipeToDismiss">true</item> </style> - <style name="Theme.Micro.NoActionBar" parent="Theme.Holo.NoActionBar"> + <style name="Theme.Micro.Light" parent="Theme.Holo.Light.NoActionBar"> <item name="textViewStyle">@android:style/Widget.Micro.TextView</item> <item name="numberPickerStyle">@android:style/Widget.Micro.NumberPicker</item> <item name="windowAnimationStyle">@android:style/Animation.SwipeDismiss</item> @@ -31,28 +31,4 @@ <item name="windowIsTranslucent">true</item> <item name="windowSwipeToDismiss">true</item> </style> - <style name="Theme.Micro.Light" parent="Theme.Holo.Light"> - <item name="numberPickerStyle">@android:style/Widget.Micro.NumberPicker</item> - <item name="windowAnimationStyle">@android:style/Animation.SwipeDismiss</item> - <item name="windowIsFloating">false</item> - <item name="windowIsTranslucent">true</item> - <item name="windowSwipeToDismiss">true</item> - </style> - <style name="Theme.Micro.Light.NoActionBar" parent="Theme.Holo.Light.NoActionBar"> - <item name="textViewStyle">@android:style/Widget.Micro.TextView</item> - <item name="numberPickerStyle">@android:style/Widget.Micro.NumberPicker</item> - <item name="windowAnimationStyle">@android:style/Animation.SwipeDismiss</item> - <item name="windowIsFloating">false</item> - <item name="windowIsTranslucent">true</item> - <item name="windowSwipeToDismiss">true</item> - </style> - <style name="Theme.Micro.Light.DarkActionBar" parent="Theme.Holo.Light.DarkActionBar"> - <item name="textViewStyle">@android:style/Widget.Micro.TextView</item> - <item name="numberPickerStyle">@android:style/Widget.Micro.NumberPicker</item> - <item name="windowAnimationStyle">@android:style/Animation.SwipeDismiss</item> - <item name="windowIsFloating">false</item> - <item name="windowIsTranslucent">true</item> - <item name="windowSwipeToDismiss">true</item> - </style> - </resources> |