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

Commit a476e841 authored by Jacqueline Bronger's avatar Jacqueline Bronger
Browse files

Remove light leanback dialog themes. 

Bug: 182958205
Test: manual
Change-Id: I046b406c5ae67ad273c10f57aced5fe2b09d7e12
parent 4f576188

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

+4 −4
Original line number Diff line number Diff line
@@ -14,14 +14,14 @@ 
     limitations under the License.

-->

<resources>

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

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

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

    <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.Holo.Light.Dialog.Alert" parent="Theme.Leanback.Dialog.Alert" />

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

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

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

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

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

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

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

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

</resources>

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

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,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" />

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



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

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

core/res/res/values/colors_leanback.xml

+0 −4
Original line number Diff line number Diff line
@@ -17,14 +17,10 @@ 
<!-- Colors specific to Leanback themes. -->

<resources>

    <color name="background_leanback_dark">#ff324248</color>

    <color name="background_leanback_light">#ffeeeeee</color>



    <color name="primary_text_leanback_dark">#cceeeeee</color>

    <color name="secondary_text_leanback_dark">#99eeeeee</color>



    <color name="primary_text_leanback_light">#cc222222</color>

    <color name="secondary_text_leanback_light">#99222222</color>



    <color name="primary_text_leanback_formwizard_default_dark">#ffeeeeee</color>



    <color name="btn_leanback_focused">#E8EAED</color>

core/res/res/values/themes_leanback.xml

+24 −47
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
        <item name="buttonBarStyle">@style/Widget.Leanback.ButtonBar</item>

    </style>



    <style name="Theme.Leanback.Light.Dialog" parent="Theme.Material.Light.BaseDialog">

    <style name="Theme.Leanback.Settings.Dialog" parent="Theme.Material.Settings.BaseDialog">

        <item name="colorBackground">@color/background_leanback_dark</item>

        <item name="textColorPrimary">@color/primary_text_leanback_dark</item>

        <item name="textColorSecondary">@color/secondary_text_leanback_dark</item>
@@ -38,7 +38,7 @@ 
        <item name="buttonBarStyle">@style/Widget.Leanback.ButtonBar</item>

    </style>



    <style name="Theme.Leanback.Settings.Dialog" parent="Theme.Material.Settings.BaseDialog">

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

        <item name="colorBackground">@color/background_leanback_dark</item>

        <item name="textColorPrimary">@color/primary_text_leanback_dark</item>

        <item name="textColorSecondary">@color/secondary_text_leanback_dark</item>
@@ -50,7 +50,8 @@ 
        <item name="buttonBarStyle">@style/Widget.Leanback.ButtonBar</item>

    </style>



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

    <style name="Theme.Leanback.Settings.Dialog.Alert"

           parent="Theme.Material.Settings.Dialog.BaseAlert">

        <item name="colorBackground">@color/background_leanback_dark</item>

        <item name="textColorPrimary">@color/primary_text_leanback_dark</item>

        <item name="textColorSecondary">@color/secondary_text_leanback_dark</item>
@@ -62,30 +63,6 @@ 
        <item name="buttonBarStyle">@style/Widget.Leanback.ButtonBar</item>

    </style>



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

      <item name="colorBackground">@color/background_leanback_light</item>

      <item name="textColorPrimary">@color/primary_text_leanback_light</item>

      <item name="textColorSecondary">@color/secondary_text_leanback_light</item>

      <item name="alertDialogStyle">@style/AlertDialog.Leanback.Light</item>

      <item name="timePickerStyle">@style/Widget.Leanback.TimePicker</item>

      <item name="datePickerStyle">@style/Widget.Leanback.DatePicker</item>

      <item name="numberPickerStyle">@style/Widget.Leanback.NumberPicker</item>

        <item name="buttonBarButtonStyle">@style/Widget.Leanback.Button.ButtonBarGravityStart</item>

      <item name="buttonBarStyle">@style/Widget.Leanback.ButtonBar</item>

    </style>



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

        <item name="colorBackground">@color/background_leanback_light</item>

        <item name="textColorPrimary">@color/primary_text_leanback_light</item>

        <item name="textColorSecondary">@color/secondary_text_leanback_light</item>

        <item name="alertDialogStyle">@style/AlertDialog.Leanback.Light</item>

        <item name="timePickerStyle">@style/Widget.Leanback.TimePicker</item>

        <item name="datePickerStyle">@style/Widget.Leanback.DatePicker</item>

        <item name="numberPickerStyle">@style/Widget.Leanback.NumberPicker</item>

        <item name="buttonBarButtonStyle">@style/Widget.Leanback.Button.ButtonBarGravityStart</item>

        <item name="buttonBarStyle">@style/Widget.Leanback.ButtonBar</item>

    </style>



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

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

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