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

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

Merge "Update the leanback dialog button style." into sc-dev am: 3c4e7116 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06f00f3eade28a62574f45805acb026618dec48a
parents 76b80c62 3c4e7116

core/res/res/color/btn_leanback_color.xml

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

<!--

  ~ Copyright (C) 2021 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.

  -->

<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:state_focused="true"

        android:color="@color/btn_leanback_focused" />

    <item android:state_enabled="false"

        android:color="@android:color/transparent" />

    <item android:color="@color/btn_leanback_unfocused" />

</selector>
 
 No newline at end of file

core/res/res/color/btn_leanback_text_color.xml

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

<!-- Copyright (C) 2021 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.

-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:color="@color/btn_text_leanback_focused" android:state_focused="true"/>

    <item android:color="@color/btn_text_leanback_unfocused"/>

</selector>

core/res/res/drawable/btn_leanback.xml

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

<!--

  ~ Copyright (C) 2021 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.

  -->

<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">

    <solid android:color="@color/btn_leanback_color"/>

    <corners android:radius="@dimen/leanback_button_radius"/>

</shape>

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

0 → 100644
+21 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!--

  ~ Copyright (C) 2021 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>

    <style name="Widget.DeviceDefault.Button.ButtonBar.AlertDialog"

           parent="Widget.Leanback.Button.ButtonBar" />

</resources>

core/res/res/values/colors_leanback.xml

+5 −0
Original line number Original line Diff line number Diff line
@@ -26,4 +26,9 @@ 
    <color name="secondary_text_leanback_light">#99222222</color>

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





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

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



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

    <color name="btn_leanback_unfocused">#1AFFFFFF</color>

    <color name="btn_text_leanback_focused">#0E0E0E</color>

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

</resources>
 
</resources>