diff options
| -rw-r--r-- | core/res/res/values-watch/dimens_material.xml | 3 | ||||
| -rw-r--r-- | core/res/res/values-watch/themes_device_defaults.xml | 69 | ||||
| -rw-r--r-- | core/res/res/values-watch/themes_material.xml | 17 |
3 files changed, 50 insertions, 39 deletions
diff --git a/core/res/res/values-watch/dimens_material.xml b/core/res/res/values-watch/dimens_material.xml index 40673c1aa584..2ab2d91058e2 100644 --- a/core/res/res/values-watch/dimens_material.xml +++ b/core/res/res/values-watch/dimens_material.xml @@ -58,4 +58,7 @@ <dimen name="screen_percentage_10">0dp</dimen> <dimen name="screen_percentage_12">0dp</dimen> <dimen name="screen_percentage_15">0dp</dimen> + + <!-- dialog elevation [overrides 18dp] --> + <dimen name="floating_window_z">2dp</dimen> </resources> diff --git a/core/res/res/values-watch/themes_device_defaults.xml b/core/res/res/values-watch/themes_device_defaults.xml index c4c1ed9b9998..df8158dbb6c8 100644 --- a/core/res/res/values-watch/themes_device_defaults.xml +++ b/core/res/res/values-watch/themes_device_defaults.xml @@ -52,6 +52,7 @@ a similar way. <!-- Variant of {@link #Theme_DeviceDefault} with no action bar --> <style name="Theme.DeviceDefault.NoActionBar" parent="Theme.Material.NoActionBar"> + <item name="android:windowActionBar">false</item> <!-- Color palette Dark --> <item name="colorPrimary">@color/primary_device_default_dark</item> <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item> @@ -70,6 +71,8 @@ a similar way. <!-- Variant of {@link #Theme_DeviceDefault} with no action bar and no status bar. This theme sets {@link android.R.attr#windowFullscreen} to true. --> <style name="Theme.DeviceDefault.NoActionBar.Fullscreen" parent="Theme.Material.NoActionBar.Fullscreen"> + <item name="android:windowFullscreen">true</item> + <item name="android:windowActionBar">false</item> <!-- Color palette Dark --> <item name="colorPrimary">@color/primary_device_default_dark</item> <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item> @@ -90,6 +93,7 @@ a similar way. sets {@link android.R.attr#windowFullscreen} and {@link android.R.attr#windowOverscan} to true. --> <style name="Theme.DeviceDefault.NoActionBar.Overscan" parent="Theme.Material.NoActionBar.Overscan"> + <item name="android:windowActionBar">false</item> <!-- Color palette Dark --> <item name="colorPrimary">@color/primary_device_default_dark</item> <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item> @@ -149,8 +153,8 @@ a similar way. watch theme is not floating. You can set this theme on an activity if you would like to make an activity that looks like a Dialog.--> <style name="Theme.DeviceDefault.Dialog" parent="Theme.Material.Dialog" > - <item name="windowIsFloating">false</item> - <item name="windowElevation">0dp</item> + <item name="android:windowFullscreen">true</item> + <item name="windowTitleStyle">@style/DialogWindowTitle.DeviceDefault</item> <item name="windowAnimationStyle">@style/Animation.DeviceDefault.Dialog</item> @@ -175,6 +179,23 @@ a similar way. <item name="secondaryContentAlpha">@dimen/secondary_content_alpha_device_default</item> </style> + <style name="Theme.DeviceDefault.Dialog.Alert" parent="Theme.Material.Dialog.Alert"> + <item name="android:windowFullscreen">true</item> + <!-- Color palette Dark --> + <item name="colorPrimary">@color/primary_device_default_dark</item> + <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item> + <item name="colorForeground">@color/foreground_device_default_dark</item> + <item name="colorAccent">@color/accent_device_default_dark</item> + <item name="colorBackground">@color/background_device_default_dark</item> + <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item> + <item name="colorBackgroundCacheHint">@color/background_cache_hint_selector_device_default</item> + <item name="colorButtonNormal">@color/button_normal_device_default_dark</item> + <item name="colorError">@color/error_color_device_default_dark</item> + <item name="disabledAlpha">@dimen/disabled_alpha_device_default</item> + <item name="primaryContentAlpha">@dimen/primary_content_alpha_device_default</item> + <item name="secondaryContentAlpha">@dimen/secondary_content_alpha_device_default</item> + </style> + <!-- DeviceDefault theme for a window that should look like the Settings app. --> <style name="Theme.DeviceDefault.Settings" parent="Theme.DeviceDefault"/> <style name="Theme.DeviceDefault.Settings.NoActionBar" parent="Theme.DeviceDefault"/> @@ -185,9 +206,9 @@ a similar way. <style name="Theme.DeviceDefault.Settings.Dialog.Presentation" parent="Theme.DeviceDefault.Dialog.Presentation"/> <style name="Theme.DeviceDefault.Settings.SearchBar" parent="Theme.DeviceDefault.SearchBar"/> - <style name="Theme.DeviceDefault.Settings.Dialog.Alert" parent="Theme.Material.Dialog.Alert"> - <item name="windowIsFloating">false</item> - <item name="windowElevation">0dp</item> + <style name="Theme.DeviceDefault.Settings.Dialog.Alert" parent="Theme.DeviceDefault.Dialog.Alert"> + <item name="android:windowFullscreen">true</item> + <item name="windowTitleStyle">@style/DialogWindowTitle.DeviceDefault</item> <!-- Color palette Dark --> <item name="colorPrimary">@color/primary_device_default_dark</item> <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item> @@ -204,8 +225,6 @@ a similar way. </style> <style name="Theme.DeviceDefault.Settings.CompactMenu" parent="Theme.Material.CompactMenu"> - <item name="windowIsFloating">false</item> - <item name="windowElevation">0dp</item> <!-- Color palette Dark --> <item name="colorPrimary">@color/primary_device_default_dark</item> <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item> @@ -224,8 +243,7 @@ a similar way. <!-- Variant of {@link #Theme_DeviceDefault_Dialog} that has a nice minimum width for a regular dialog. --> <style name="Theme.DeviceDefault.Dialog.MinWidth" parent="Theme.Material.Dialog.MinWidth"> - <item name="windowIsFloating">false</item> - <item name="windowElevation">0dp</item> + <item name="android:windowFullscreen">true</item> <!-- Color palette Dark --> <item name="colorPrimary">@color/primary_device_default_dark</item> <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item> @@ -243,8 +261,8 @@ a similar way. <!-- Variant of {@link #Theme_DeviceDefault_Dialog} without an action bar --> <style name="Theme.DeviceDefault.Dialog.NoActionBar" parent="Theme.Material.Dialog.NoActionBar"> - <item name="windowIsFloating">false</item> - <item name="windowElevation">0dp</item> + <item name="android:windowFullscreen">true</item> + <item name="android:windowActionBar">false</item> <!-- Color palette Dark --> <item name="colorPrimary">@color/primary_device_default_dark</item> <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item> @@ -263,8 +281,8 @@ a similar way. <!-- Variant of {@link #Theme_DeviceDefault_Dialog_NoActionBar} that has a nice minimum width for a regular dialog. --> <style name="Theme.DeviceDefault.Dialog.NoActionBar.MinWidth" parent="Theme.Material.Dialog.NoActionBar.MinWidth"> - <item name="windowIsFloating">false</item> - <item name="windowElevation">0dp</item> + <item name="android:windowFullscreen">true</item> + <item name="android:windowActionBar">false</item> <!-- Color palette Dark --> <item name="colorPrimary">@color/primary_device_default_dark</item> <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item> @@ -302,6 +320,8 @@ a similar way. full-screen on smaller screens (small, normal) or as a dialog on larger screens (large, xlarge). --> <style name="Theme.DeviceDefault.DialogWhenLarge.NoActionBar" parent="Theme.Material.DialogWhenLarge.NoActionBar"> + <item name="android:windowFullscreen">true</item> + <item name="android:windowActionBar">false</item> <!-- Color palette Dark --> <item name="colorPrimary">@color/primary_device_default_dark</item> <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item> @@ -319,6 +339,7 @@ a similar way. <!-- DeviceDefault theme for a presentation window on a secondary display. --> <style name="Theme.DeviceDefault.Dialog.Presentation" parent="Theme.Material.Dialog.Presentation"> + <item name="android:windowFullscreen">true</item> <!-- Color palette Dark --> <item name="colorPrimary">@color/primary_device_default_dark</item> <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item> @@ -338,6 +359,8 @@ a similar way. decorations, so you basically have an empty rectangle in which to place your content. It makes the window floating, with a transparent background, and turns off dimming behind the window. --> <style name="Theme.DeviceDefault.Panel" parent="Theme.Material.Panel"> + <item name="android:windowFullscreen">true</item> + <item name="android:windowActionBar">false</item> <!-- Color palette Dark --> <item name="colorPrimary">@color/primary_device_default_dark</item> <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item> @@ -407,24 +430,6 @@ a similar way. <item name="secondaryContentAlpha">@dimen/secondary_content_alpha_device_default</item> </style> - <style name="Theme.DeviceDefault.Dialog.Alert" parent="Theme.Material.Dialog.Alert"> - <item name="windowTitleStyle">@style/DialogWindowTitle.DeviceDefault</item> - - <!-- Color palette Dialog --> - <item name="colorPrimary">@color/primary_device_default_dark</item> - <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item> - <item name="colorForeground">@color/foreground_device_default_dark</item> - <item name="colorAccent">@color/accent_device_default_dark</item> - <item name="colorBackground">@color/background_device_default_dark</item> - <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item> - <item name="colorBackgroundCacheHint">@color/background_cache_hint_selector_device_default</item> - <item name="colorButtonNormal">@color/button_normal_device_default_dark</item> - <item name="colorError">@color/error_color_device_default_dark</item> - <item name="disabledAlpha">@dimen/disabled_alpha_device_default</item> - <item name="primaryContentAlpha">@dimen/primary_content_alpha_device_default</item> - <item name="secondaryContentAlpha">@dimen/secondary_content_alpha_device_default</item> - </style> - <!-- Theme for the dialog shown when an app crashes or ANRs. Override to make it dark. --> <style name="Theme.DeviceDefault.Dialog.AppError" parent="Theme.DeviceDefault.Dialog.Alert"> <item name="alertDialogStyle">@style/BaseErrorDialog.DeviceDefault</item> @@ -451,8 +456,6 @@ a similar way. </style> <style name="Theme.DeviceDefault.Dialog.NoFrame" parent="Theme.Material.Dialog.NoFrame"> - <item name="windowIsFloating">false</item> - <item name="windowElevation">0dp</item> <!-- Color palette Dialog --> <item name="colorPrimary">@color/primary_device_default_dark</item> <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item> diff --git a/core/res/res/values-watch/themes_material.xml b/core/res/res/values-watch/themes_material.xml index 40a249ab5ed9..674b3bcc8c5d 100644 --- a/core/res/res/values-watch/themes_material.xml +++ b/core/res/res/values-watch/themes_material.xml @@ -42,26 +42,31 @@ please see styles_device_defaults.xml. <!-- Override behaviour to set the theme colours for dialogs, keep them the same. --> <style name="ThemeOverlay.Material.Dialog" parent="ThemeOverlay.Material.BaseDialog"> - <item name="windowIsFloating">false</item> - <item name="windowElevation">0dp</item> + <item name="android:windowFullscreen">true</item> </style> <!-- Force the background and floating colours to be the default colours. --> <style name="Theme.Material.Dialog" parent="Theme.Material.BaseDialog"> + <item name="android:windowFullscreen">true</item> + <item name="colorBackground">@color/background_material_dark</item> + <item name="colorBackgroundFloating">@color/background_floating_material_dark</item> + <item name="colorBackgroundCacheHint">@color/background_cache_hint_selector_material_dark</item> + </style> + + <!-- Force the background and floating colours to be the default colours. --> + <style name="Theme.Material.Dialog.Alert" parent="Theme.Material.Dialog.BaseAlert"> + <item name="android:windowFullscreen">true</item> <item name="colorBackground">@color/background_material_dark</item> <item name="colorBackgroundFloating">@color/background_floating_material_dark</item> <item name="colorBackgroundCacheHint">@color/background_cache_hint_selector_material_dark</item> - <item name="windowIsFloating">false</item> - <item name="windowElevation">0dp</item> </style> <!-- Force the background and floating colours to be the default colours. --> <style name="Theme.Material.Light.Dialog" parent="Theme.Material.Light.BaseDialog"> + <item name="android:windowFullscreen">true</item> <item name="colorBackground">@color/background_material_light</item> <item name="colorBackgroundFloating">@color/background_floating_material_light</item> <item name="colorBackgroundCacheHint">@color/background_cache_hint_selector_material_light</item> - <item name="windowIsFloating">false</item> - <item name="windowElevation">0dp</item> </style> <!-- Force all settings themes to use normal Material theme. --> |