diff options
| -rw-r--r-- | core/res/res/values-watch/themes_device_defaults.xml | 9 | ||||
| -rw-r--r-- | core/res/res/values-watch/themes_material.xml | 3 |
2 files changed, 11 insertions, 1 deletions
diff --git a/core/res/res/values-watch/themes_device_defaults.xml b/core/res/res/values-watch/themes_device_defaults.xml index f6752c2942fe..a7736e7c3e82 100644 --- a/core/res/res/values-watch/themes_device_defaults.xml +++ b/core/res/res/values-watch/themes_device_defaults.xml @@ -10,7 +10,7 @@ Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and + See the License for the specific language gning permissions and limitations under the License. --> @@ -147,6 +147,7 @@ a similar way. 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="windowTitleStyle">@style/DialogWindowTitle.DeviceDefault</item> <item name="windowAnimationStyle">@style/Animation.DeviceDefault.Dialog</item> @@ -183,6 +184,7 @@ a similar way. <style name="Theme.DeviceDefault.Settings.Dialog.Alert" parent="Theme.Material.Dialog.Alert"> <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> @@ -200,6 +202,7 @@ a similar way. <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> @@ -219,6 +222,7 @@ a similar way. regular dialog. --> <style name="Theme.DeviceDefault.Dialog.MinWidth" parent="Theme.Material.Dialog.MinWidth"> <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> @@ -237,6 +241,7 @@ 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> <!-- Color palette Dark --> <item name="colorPrimary">@color/primary_device_default_dark</item> <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item> @@ -256,6 +261,7 @@ a similar way. 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> <!-- Color palette Dark --> <item name="colorPrimary">@color/primary_device_default_dark</item> <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item> @@ -434,6 +440,7 @@ a similar way. <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 0cf398b11085..40a249ab5ed9 100644 --- a/core/res/res/values-watch/themes_material.xml +++ b/core/res/res/values-watch/themes_material.xml @@ -43,6 +43,7 @@ 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> </style> <!-- Force the background and floating colours to be the default colours. --> @@ -51,6 +52,7 @@ please see styles_device_defaults.xml. <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. --> @@ -59,6 +61,7 @@ please see styles_device_defaults.xml. <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. --> |