diff options
| author | Vinod Krishnan <vinodkrishnan@google.com> | 2015-03-19 09:48:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-19 09:48:03 +0000 |
| commit | ed7cfb67e7e697e544ac1220170af741e9e117d6 (patch) | |
| tree | 600d2238f97f83bb67c1f5986c1a091eca046415 | |
| parent | 1599a4a0dc066646e06a63cddb9cb28211a1160d (diff) | |
| parent | 7a2df74b1124746fa5400d3ed5e6e3680c8f3601 (diff) | |
| download | frameworks_base-ed7cfb67e7e697e544ac1220170af741e9e117d6.zip frameworks_base-ed7cfb67e7e697e544ac1220170af741e9e117d6.tar.gz frameworks_base-ed7cfb67e7e697e544ac1220170af741e9e117d6.tar.bz2 | |
am 7a2df74b: am 3f782ad1: Merge "Make Theme.Micro point to Theme.Material" into lmp-mr1-modular-dev
* commit '7a2df74b1124746fa5400d3ed5e6e3680c8f3601':
Make Theme.Micro point to Theme.Material
| -rw-r--r-- | core/res/res/values/styles_micro.xml | 10 | ||||
| -rw-r--r-- | core/res/res/values/themes_micro.xml | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/core/res/res/values/styles_micro.xml b/core/res/res/values/styles_micro.xml index cf90b39..c6052ff 100644 --- a/core/res/res/values/styles_micro.xml +++ b/core/res/res/values/styles_micro.xml @@ -16,7 +16,7 @@ <resources> <style name="Animation.Micro"/> - <style name="Animation.Micro.Activity" parent="Animation.Holo.Activity"> + <style name="Animation.Micro.Activity" parent="Animation.Material.Activity"> <item name="activityOpenEnterAnimation">@anim/slide_in_micro</item> <item name="activityOpenExitAnimation">@null</item> <item name="activityCloseEnterAnimation">@null</item> @@ -35,7 +35,7 @@ <item name="wallpaperIntraCloseExitAnimation">@null</item> </style> - <style name="AlertDialog.Micro" parent="AlertDialog.Holo.Light"> + <style name="AlertDialog.Micro" parent="AlertDialog.Material.Light"> <item name="fullDark">@null</item> <item name="topDark">@null</item> <item name="centerDark">@null</item> @@ -55,19 +55,19 @@ <item name="textAppearance">@style/TextAppearance.Micro.DialogWindowTitle</item> </style> - <style name="TextAppearance.Micro" parent="TextAppearance.Holo"> + <style name="TextAppearance.Micro" parent="TextAppearance.Material"> <item name="textSize">20sp</item> <item name="fontFamily">sans-serif-condensed-light</item> <item name="textColor">@color/micro_text_light</item> </style> - <style name="TextAppearance.Micro.DialogWindowTitle" parent="TextAppearance.Holo.DialogWindowTitle"> + <style name="TextAppearance.Micro.DialogWindowTitle" parent="TextAppearance.Material.DialogWindowTitle"> <item name="textSize">20sp</item> <item name="fontFamily">sans-serif-condensed-light</item> <item name="textColor">@color/micro_text_light</item> </style> - <style name="Widget.Micro" parent="Widget.Holo" /> + <style name="Widget.Micro" parent="Widget.Material" /> <style name="Widget.Micro.TextView"> <item name="fontFamily">sans-serif-condensed</item> diff --git a/core/res/res/values/themes_micro.xml b/core/res/res/values/themes_micro.xml index e730dff..112afa6 100644 --- a/core/res/res/values/themes_micro.xml +++ b/core/res/res/values/themes_micro.xml @@ -14,7 +14,7 @@ limitations under the License. --> <resources> - <style name="Theme.Micro" parent="Theme.Holo.NoActionBar"> + <style name="Theme.Micro" parent="Theme.Material.NoActionBar"> <item name="alertDialogTheme">@style/Theme.Micro.Dialog.Alert</item> <item name="alertDialogStyle">@style/AlertDialog.Micro</item> <item name="dialogTheme">@style/Theme.Micro.Dialog</item> @@ -29,7 +29,7 @@ <item name="windowOverscan">true</item> </style> - <style name="Theme.Micro.Light" parent="Theme.Holo.Light.NoActionBar"> + <style name="Theme.Micro.Light" parent="Theme.Material.Light.NoActionBar"> <item name="alertDialogTheme">@style/Theme.Micro.Dialog.Alert</item> <item name="alertDialogStyle">@style/AlertDialog.Micro</item> <item name="dialogTheme">@style/Theme.Micro.Dialog</item> @@ -44,7 +44,7 @@ <item name="windowOverscan">true</item> </style> - <style name="Theme.Micro.Dialog" parent="Theme.Holo.Light.Dialog"> + <style name="Theme.Micro.Dialog" parent="Theme.Material.Light.Dialog"> <item name="windowTitleStyle">@android:style/DialogWindowTitle.Micro</item> <item name="windowIsFloating">false</item> <item name="windowFullscreen">true</item> |