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

Commit c21cbe27 authored by Jacqueline Bronger's avatar Jacqueline Bronger Committed by Automerger Merge Worker
Browse files

Merge changes from topic "leanback_dialog_background" into sc-dev am: 2873f101 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13921459

Change-Id: If6ea070a9411d88164f60273f0fe1ff32a159c25
parents b2694d23 2873f101

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

+1 −5
Original line number Diff line number Diff line
@@ -16,15 +16,11 @@ 


<!-- Colors specific to Leanback themes. -->

<resources>

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

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

    <color name="background_leanback_dark">#FF1F232B</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/dimens_leanback.xml

+2 −0
Original line number Diff line number Diff line
@@ -89,4 +89,6 @@ 
    <dimen name="leanback_button_radius">55dp</dimen>

    <dimen name="leanback_button_padding_horizontal">22dp</dimen>

    <dimen name="leanback_button_padding_vertical">11dp</dimen>



    <dimen name="leanback_dialog_corner_radius">8dp</dimen>

</resources>

core/res/res/values/themes_leanback.xml

+28 −47
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
<resources>

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

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

        <item name="dialogCornerRadius">@dimen/leanback_dialog_corner_radius</item>

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

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

        <item name="alertDialogStyle">@style/AlertDialog.Leanback</item>
@@ -26,8 +27,9 @@ 
        <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="dialogCornerRadius">@dimen/leanback_dialog_corner_radius</item>

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

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

        <item name="alertDialogStyle">@style/AlertDialog.Leanback</item>
@@ -38,8 +40,9 @@ 
        <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="dialogCornerRadius">@dimen/leanback_dialog_corner_radius</item>

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

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

        <item name="alertDialogStyle">@style/AlertDialog.Leanback</item>
@@ -50,8 +53,10 @@ 
        <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="dialogCornerRadius">@dimen/leanback_dialog_corner_radius</item>

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

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

        <item name="alertDialogStyle">@style/AlertDialog.Leanback</item>
@@ -62,30 +67,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>