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

Commit 228e2035 authored by Sergey Nikolaienkov's avatar Sergey Nikolaienkov
Browse files

Adapt multi-state permission model in 'Apps permissions' 

Bug: 159524612
Test: manually on TV
Change-Id: I7b6c30d1e564d9d8f671d4cd8bf949fe216ea80d
parent 07940ef1

res/layout-television/preference_permissions_category.xml

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

<!--

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

  -->



<!-- Layout used for PreferenceCategory in a PreferenceActivity. -->

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

          android:id="@+android:id/title"

          android:layout_width="match_parent"

          android:layout_height="wrap_content"

          android:textColor="@color/settings_category_text_color"

          android:textSize="@dimen/settings_category_text_size"

          android:textStyle="bold"

          android:paddingStart="?android:attr/listPreferredItemPaddingStart"

          android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

          android:paddingTop="16dp"

          android:paddingBottom="16dp" />

res/layout-television/preference_permissions_no_apps.xml

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

<!--

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

  -->



<!-- Layout used for PreferenceCategory in a PreferenceActivity. -->

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

          android:id="@+android:id/title"

          android:layout_width="match_parent"

          android:layout_height="wrap_content"

          android:gravity="center"

          android:singleLine="true"

          android:textAppearance="?android:attr/textAppearanceListItem"

          android:textColor="?android:attr/textColorPrimaryNoDisable"

          android:ellipsize="marquee"

          android:paddingStart="?android:attr/listPreferredItemPaddingStart"

          android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

          android:paddingBottom="16dp"/>

res/values-television/colors.xml

+2 −0
Original line number Diff line number Diff line
@@ -38,4 +38,6 @@ 
    <color name="grant_permissions_white_text_alpha_70">#b2eeeeee</color>



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



    <color name="settings_category_text_color">#FF51AAFF</color>

</resources>

res/values-television/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -44,4 +44,6 @@ 
    <dimen name="action_dialog_button_padding_top">14dp</dimen>

    <dimen name="action_dialog_button_padding_bottom">15dp</dimen>

    <dimen name="action_dialog_button_min_height">48dp</dimen>



    <dimen name="settings_category_text_size">12dp</dimen>

</resources>

res/values-television/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
    </style>



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

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

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

    </style>



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