Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5961fad0 authored by Andrew Zeng's avatar Andrew Zeng Committed by Android (Google) Code Review
Browse files

Merge "Set windowElevation to 0 on watch dialogs."

parents 1e9044f1 873aaf6f

core/res/res/values-watch/themes_device_defaults.xml

+8 −1
Original line number Original line Diff line number Diff line
@@ -10,7 +10,7 @@ 
     Unless required by applicable law or agreed to in writing, software

     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     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.

     limitations under the License.

-->

-->
@@ -147,6 +147,7 @@ a similar way. 
    an activity that looks like a Dialog.-->

    an activity that looks like a Dialog.-->

    <style name="Theme.DeviceDefault.Dialog" parent="Theme.Material.Dialog" >

    <style name="Theme.DeviceDefault.Dialog" parent="Theme.Material.Dialog" >

        <item name="windowIsFloating">false</item>

        <item name="windowIsFloating">false</item>

        <item name="windowElevation">0dp</item>

        <item name="windowTitleStyle">@style/DialogWindowTitle.DeviceDefault</item>

        <item name="windowTitleStyle">@style/DialogWindowTitle.DeviceDefault</item>

        <item name="windowAnimationStyle">@style/Animation.DeviceDefault.Dialog</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">

    <style name="Theme.DeviceDefault.Settings.Dialog.Alert" parent="Theme.Material.Dialog.Alert">

        <item name="windowIsFloating">false</item>

        <item name="windowIsFloating">false</item>

        <item name="windowElevation">0dp</item>

        <!-- Color palette Dark -->

        <!-- Color palette Dark -->

        <item name="colorPrimary">@color/primary_device_default_dark</item>

        <item name="colorPrimary">@color/primary_device_default_dark</item>

        <item name="colorPrimaryDark">@color/primary_dark_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">

    <style name="Theme.DeviceDefault.Settings.CompactMenu" parent="Theme.Material.CompactMenu">

        <item name="windowIsFloating">false</item>

        <item name="windowIsFloating">false</item>

        <item name="windowElevation">0dp</item>

        <!-- Color palette Dark -->

        <!-- Color palette Dark -->

        <item name="colorPrimary">@color/primary_device_default_dark</item>

        <item name="colorPrimary">@color/primary_device_default_dark</item>

        <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>

        <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>
@@ -219,6 +222,7 @@ a similar way. 
    regular dialog. -->

    regular dialog. -->

    <style name="Theme.DeviceDefault.Dialog.MinWidth" parent="Theme.Material.Dialog.MinWidth">

    <style name="Theme.DeviceDefault.Dialog.MinWidth" parent="Theme.Material.Dialog.MinWidth">

        <item name="windowIsFloating">false</item>

        <item name="windowIsFloating">false</item>

        <item name="windowElevation">0dp</item>

        <!-- Color palette Dark -->

        <!-- Color palette Dark -->

        <item name="colorPrimary">@color/primary_device_default_dark</item>

        <item name="colorPrimary">@color/primary_device_default_dark</item>

        <item name="colorPrimaryDark">@color/primary_dark_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 -->

    <!-- Variant of {@link #Theme_DeviceDefault_Dialog} without an action bar -->

    <style name="Theme.DeviceDefault.Dialog.NoActionBar" parent="Theme.Material.Dialog.NoActionBar">

    <style name="Theme.DeviceDefault.Dialog.NoActionBar" parent="Theme.Material.Dialog.NoActionBar">

        <item name="windowIsFloating">false</item>

        <item name="windowIsFloating">false</item>

        <item name="windowElevation">0dp</item>

        <!-- Color palette Dark -->

        <!-- Color palette Dark -->

        <item name="colorPrimary">@color/primary_device_default_dark</item>

        <item name="colorPrimary">@color/primary_device_default_dark</item>

        <item name="colorPrimaryDark">@color/primary_dark_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. -->

    for a regular dialog. -->

    <style name="Theme.DeviceDefault.Dialog.NoActionBar.MinWidth" parent="Theme.Material.Dialog.NoActionBar.MinWidth">

    <style name="Theme.DeviceDefault.Dialog.NoActionBar.MinWidth" parent="Theme.Material.Dialog.NoActionBar.MinWidth">

        <item name="windowIsFloating">false</item>

        <item name="windowIsFloating">false</item>

        <item name="windowElevation">0dp</item>

        <!-- Color palette Dark -->

        <!-- Color palette Dark -->

        <item name="colorPrimary">@color/primary_device_default_dark</item>

        <item name="colorPrimary">@color/primary_device_default_dark</item>

        <item name="colorPrimaryDark">@color/primary_dark_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">

    <style name="Theme.DeviceDefault.Dialog.NoFrame" parent="Theme.Material.Dialog.NoFrame">

        <item name="windowIsFloating">false</item>

        <item name="windowIsFloating">false</item>

        <item name="windowElevation">0dp</item>

        <!-- Color palette Dialog -->

        <!-- Color palette Dialog -->

        <item name="colorPrimary">@color/primary_device_default_dark</item>

        <item name="colorPrimary">@color/primary_device_default_dark</item>

        <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>

        <item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>

core/res/res/values-watch/themes_material.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -43,6 +43,7 @@ please see styles_device_defaults.xml. 
    <!-- Override behaviour to set the theme colours for dialogs, keep them the same. -->

    <!-- Override behaviour to set the theme colours for dialogs, keep them the same. -->

    <style name="ThemeOverlay.Material.Dialog" parent="ThemeOverlay.Material.BaseDialog">

    <style name="ThemeOverlay.Material.Dialog" parent="ThemeOverlay.Material.BaseDialog">

        <item name="windowIsFloating">false</item>

        <item name="windowIsFloating">false</item>

        <item name="windowElevation">0dp</item>

    </style>

    </style>





    <!-- Force the background and floating colours to be the default colours. -->

    <!-- 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="colorBackgroundFloating">@color/background_floating_material_dark</item>

        <item name="colorBackgroundCacheHint">@color/background_cache_hint_selector_material_dark</item>

        <item name="colorBackgroundCacheHint">@color/background_cache_hint_selector_material_dark</item>

        <item name="windowIsFloating">false</item>

        <item name="windowIsFloating">false</item>

        <item name="windowElevation">0dp</item>

    </style>

    </style>





    <!-- Force the background and floating colours to be the default colours. -->

    <!-- 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="colorBackgroundFloating">@color/background_floating_material_light</item>

        <item name="colorBackgroundCacheHint">@color/background_cache_hint_selector_material_light</item>

        <item name="colorBackgroundCacheHint">@color/background_cache_hint_selector_material_light</item>

        <item name="windowIsFloating">false</item>

        <item name="windowIsFloating">false</item>

        <item name="windowElevation">0dp</item>

    </style>

    </style>





    <!-- Force all settings themes to use normal Material theme. -->

    <!-- Force all settings themes to use normal Material theme. -->