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

Commit 580ef47f authored by Sergey Nikolaienkov's avatar Sergey Nikolaienkov Committed by Android (Google) Code Review
Browse files

Merge "Fix (leanback) preference theme on TVs" into rvc-dev

parents 676125d3 59f5124e

res/layout/preference_permissions.xml

+3 −3
Original line number Diff line number Diff line
@@ -37,10 +37,10 @@ 
        android:paddingEnd="20dp"

        android:paddingTop="4dp"

        android:paddingBottom="4dp">

        <com.android.permissioncontroller.permission.ui.PreferenceImageView

        <androidx.preference.internal.PreferenceImageView

            android:id="@android:id/icon"

            android:layout_width="24dp"

            android:layout_height="24dp"

            android:layout_width="@dimen/permission_icon_size"

            android:layout_height="@dimen/permission_icon_size"

            android:scaleType="fitCenter" />

    </LinearLayout>

res/layout/preference_permissions_switch.xml

+3 −3
Original line number Diff line number Diff line
@@ -37,10 +37,10 @@ 
        android:paddingEnd="20dp"

        android:paddingTop="4dp"

        android:paddingBottom="4dp">

        <com.android.permissioncontroller.permission.ui.PreferenceImageView

        <androidx.preference.internal.PreferenceImageView

            android:id="@android:id/icon"

            android:layout_width="36dp"

            android:layout_height="36dp"

            android:layout_width="@dimen/permission_icon_size"

            android:layout_height="@dimen/permission_icon_size"

            android:scaleType="fitCenter" />

    </LinearLayout>

res/values-television/styles.xml

+7 −7
Original line number Diff line number Diff line
@@ -16,21 +16,21 @@ 


<resources>



    <style name="PreferenceThemeOverlay.v14.Permissions">

        <item name="preferenceStyle">@style/Preference.Permissions</item>

        <item name="preferenceCategoryStyle">@style/Preference.Category.Permissions</item>

        <item name="switchPreferenceStyle">@style/Preference.SwitchPreference.Permissions</item>

    <style name="PreferenceThemeOverlayLeanback.Permissions">

        <item name="preferenceStyle">@style/LeanbackPreference.Permissions</item>

        <item name="preferenceCategoryStyle">@style/LeanbackPreference.Category.Permissions</item>

        <item name="switchPreferenceStyle">@style/LeanbackPreference.SwitchPreference.Permissions</item>

    </style>



    <style name="Preference.Permissions">

    <style name="LeanbackPreference.Permissions">

        <item name="layout">@layout/preference_permissions</item>

    </style>



    <style name="Preference.Category.Permissions">

    <style name="LeanbackPreference.Category.Permissions">

        <item name="layout">@layout/preference_category_material</item>

    </style>



    <style name="Preference.SwitchPreference.Permissions">

    <style name="LeanbackPreference.SwitchPreference.Permissions">

        <item name="layout">@layout/preference_permissions_switch</item>

    </style>

res/values-television/themes.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 


<resources>

    <style name="Settings" parent="Theme.Leanback">

        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Leanback</item>

        <item name="preferenceTheme">@style/PreferenceThemeOverlayLeanback.Permissions</item>

        <item name="android:windowBackground">@android:color/transparent</item>

        <item name="android:windowIsTranslucent">true</item>

        <item name="android:backgroundDimEnabled">true</item>