diff options
| author | 2015-05-28 20:07:57 +0000 | |
|---|---|---|
| committer | 2015-05-28 20:07:57 +0000 | |
| commit | 3aeb5f848eee2c6de9bb49c9dcc7ca5127ef7c1e (patch) | |
| tree | 6a7bb6d8103557193a63d1ca93cb6189396a1fe7 | |
| parent | 8a179cab7971782900f5b4a872f4f432c7d17987 (diff) | |
| parent | 2836b863fb2aa593d19ffdcaacb8e9fd84dabb12 (diff) | |
am 2836b863: am f33da518: Merge "Introduce indirection for base micro themes." into cw-d-mr1-dev
* commit '2836b863fb2aa593d19ffdcaacb8e9fd84dabb12':
Introduce indirection for base micro themes.
| -rw-r--r-- | core/res/res/values/themes_micro.xml | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/core/res/res/values/themes_micro.xml b/core/res/res/values/themes_micro.xml index 112afa647850..8bf635e68cf9 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.Material.NoActionBar"> + <style name="Theme.MicroBase" 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,10 @@ <item name="windowOverscan">true</item> </style> - <style name="Theme.Micro.Light" parent="Theme.Material.Light.NoActionBar"> + <style name="Theme.Micro" parent="Theme.MicroBase"> + </style> + + <style name="Theme.Micro.LightBase" 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 +47,11 @@ <item name="windowOverscan">true</item> </style> - <style name="Theme.Micro.Dialog" parent="Theme.Material.Light.Dialog"> + <!-- Indirection needed for overlays to make sure there is a common base parent --> + <style name="Theme.Micro.Light" parent="Theme.Micro.LightBase"> + </style> + + <style name="Theme.Micro.DialogBase" parent="Theme.Material.Light.Dialog"> <item name="windowTitleStyle">@android:style/DialogWindowTitle.Micro</item> <item name="windowIsFloating">false</item> <item name="windowFullscreen">true</item> @@ -54,6 +61,10 @@ <item name="windowOverscan">true</item> </style> + <!-- Indirection needed for overlays to make sure there is a common base parent --> + <style name="Theme.Micro.Dialog" parent="Theme.Micro.DialogBase"> + </style> + <style name="Theme.Micro.Dialog.Alert"> <item name="windowTitleStyle">@style/DialogWindowTitle.Micro</item> <item name="alertDialogStyle">@style/AlertDialog.Micro</item> |