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

Commit 6b0f8ab1 authored by Oleksandr Tolstykh's avatar Oleksandr Tolstykh Committed by Android (Google) Code Review
Browse files

Merge "Move device default AppError theme to themes_device_defaults.xml for TV... 

Merge "Move device default AppError theme to themes_device_defaults.xml for TV and watch UI modes. Minor addition to ag/4994335"
parents f9656d57 e1179b70

core/res/res/values-television/themes.xml

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
-->

<resources>

    <style name="Theme.Dialog.Alert" parent="Theme.Leanback.Light.Dialog.Alert" />

    <style name="Theme.DeviceDefault.Dialog.AppError" parent="Theme.Leanback.Dialog.AppError" />

    <style name="Theme.Holo.Dialog.Alert" parent="Theme.Leanback.Dialog.Alert" />

    <style name="Theme.Holo.Light.Dialog.Alert" parent="Theme.Leanback.Light.Dialog.Alert" />

    <style name="Theme.Material.Dialog.Alert" parent="Theme.Leanback.Dialog.Alert" />

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

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
-->

<resources>

    <style name="Theme.DeviceDefault.Dialog.Alert" parent="Theme.Leanback.Dialog.Alert" />

    <style name="Theme.DeviceDefault.Dialog.AppError" parent="Theme.Leanback.Dialog.AppError" />

    <style name="Theme.DeviceDefault.Light.Dialog.Alert" parent="Theme.Leanback.Light.Dialog.Alert" />



    <!-- TODO(b/116457731): remove colorBackground from colors_material.xml if not used anymore -->

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

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2016 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     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

     limitations under the License.

-->

<resources>

    <!-- 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="windowContentTransitions">false</item>

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

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

    </style>

</resources>

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

+7 −0
Original line number Diff line number Diff line
@@ -422,6 +422,13 @@ a similar way. 
        <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="windowContentTransitions">false</item>

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

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

    </style>



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

        <!-- Color palette Dark -->

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