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

Commit b22473b2 authored by Keyvan Amiri's avatar Keyvan Amiri
Browse files

Reworked permission UI on TV into the new side-panel leanback style 

Reworked all the permission UIs on TV to mesh with the rest of the
settings rendered as leanback-styled side panels with title bars.
The permissions consist of the following components:
   * Each individual app permission listing
   ** Listing of all the permissions together with the apps using
   those permissions

Bug: 27344882
Bug: 22481180

Change-Id: I4ab05efd9a4ea6fab7971b89f13d65591a2be8ee
parent 68aee0af

res/layout-television/header.xml

0 → 100644
+47 −0
Original line number Diff line number Diff line 
<!--

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

-->



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

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:background="?attr/defaultBrandColor"

                android:elevation="@dimen/lb_preference_decor_title_container_elevation"

                android:orientation="vertical">



    <FrameLayout

            android:id="@+id/decor_title_container"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:background="?attr/defaultBrandColor"

            android:elevation="@dimen/lb_preference_decor_title_container_elevation"

            android:transitionGroup="false"

    >

        <TextView

                android:id="@+id/decor_title"

                android:layout_width="match_parent"

                android:layout_height="@dimen/lb_preference_decor_title_text_height"

                android:layout_marginTop="@dimen/lb_preference_decor_title_margin_top"

                android:layout_marginStart="@dimen/lb_preference_decor_title_margin_start"

                android:layout_marginEnd="@dimen/lb_preference_decor_title_margin_end"

                android:fontFamily="sans-serif-condensed"

                android:gravity="center_vertical"

                android:singleLine="true"

                android:textSize="@dimen/lb_preference_decor_title_text_size"

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

        />

    </FrameLayout>



</LinearLayout>

res/layout-television/permissions_frame.xml

+16 −82
Original line number Diff line number Diff line
@@ -15,17 +15,17 @@ 
  ~ limitations under the License

  -->



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

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

    xmlns:tools="http://schemas.android.com/tools"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:filterTouchesWhenObscured="true">



    <FrameLayout

        android:layout_width="@dimen/lb_action_section_width"

            android:layout_width="@dimen/lb_settings_pane_width"

            android:layout_height="match_parent"

        android:layout_alignParentEnd="true"

        android:background="@color/lb_action_fragment_background">

            android:background="@color/lb_preference_decor_list_background"

            android:layout_gravity="end">



        <FrameLayout

                android:id="@+id/prefs_container"
@@ -44,70 +44,4 @@ 
        </FrameLayout>



    </FrameLayout>



    <RelativeLayout

        android:layout_width="@dimen/lb_content_section_width"

        android:layout_height="match_parent"

        android:layout_alignParentStart="true"

        android:background="@color/lb_dialog_activity_background"

        android:paddingStart="@dimen/lb_content_fragment_start_padding"

        android:paddingEnd="@dimen/lb_content_fragment_delimiter_padding" >



        <ImageView

            android:id="@+id/lb_icon"

            android:layout_width="@dimen/lb_content_fragment_icon_width"

            android:layout_height="@dimen/lb_content_fragment_icon_width"

            android:layout_alignParentEnd="true"

            android:layout_centerVertical="true"

            android:layout_marginStart="@dimen/lb_content_fragment_delimiter_padding"

            android:maxHeight="@dimen/lb_content_fragment_max_icon_height"

            android:minHeight="@dimen/lb_content_fragment_icon_width"

            android:scaleType="fitCenter"

            tools:ignore="ContentDescription" />



        <TextView

            android:id="@+id/lb_title"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_alignWithParentIfMissing="true"

            android:layout_centerVertical="true"

            android:layout_toStartOf="@id/lb_icon"

            android:ellipsize="end"

            android:fontFamily="sans-serif-light"

            android:gravity="end"

            android:maxLines="2"

            android:paddingBottom="@dimen/lb_content_fragment_title_text_bottom_padding"

            android:paddingTop="@dimen/lb_content_fragment_title_text_top_padding"

            android:textColor="@color/lb_content_title_text_color"

            android:textSize="@dimen/lb_content_fragment_title_text_size"/>



        <TextView

            android:id="@+id/lb_breadcrumb"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_above="@id/lb_title"

            android:layout_alignWithParentIfMissing="true"

            android:layout_toStartOf="@id/lb_icon"

            android:ellipsize="end"

            android:fontFamily="sans-serif-condensed"

            android:singleLine="true"

            android:textColor="@color/lb_content_breadcrumb_text_color"

            android:textSize="@dimen/lb_content_fragment_breadcrumb_text_size" />



        <TextView

            android:id="@+id/lb_description"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_alignWithParentIfMissing="true"

            android:layout_below="@id/lb_title"

            android:layout_toStartOf="@id/lb_icon"

            android:ellipsize="end"

            android:fontFamily="sans-serif"

            android:gravity="end"

            android:maxLines="6"

            android:textColor="@color/lb_content_description_text_color"

            android:textSize="@dimen/lb_content_fragment_description_text_size"

            android:lineSpacingExtra="3dp"/>

    </RelativeLayout>



</RelativeLayout>
 
</FrameLayout>

res/values-television/colors.xml

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
    <color name="lb_action_fragment_background">#FF111111</color>

    <color name="lb_dialog_activity_background">#77000000</color>



    <color name="lb_header_banner_color">#1f292d</color>



    <color name="grant_permissions_background_color">#ff263238</color>

    <color name="grant_permissions_app_color">@color/grant_permissions_white_text_alpha_100</color>

    <color name="grant_permissions_progress_color">@color/grant_permissions_white_text_alpha_100</color>

res/values-television/strings.xml

+7 −0
Original line number Diff line number Diff line
@@ -28,4 +28,11 @@ 


    <!-- Preference row title for showing system apps. -->

    <string name="preference_show_system_apps">Show system apps</string>



    <!--decor title displayed as the page title for different TV permission screens-->

    <string name="app_permissions_decor_title">App permissions</string>

    <string name="manage_permissions_decor_title">App permissions</string>

    <string name="permission_apps_decor_title"><xliff:g id="permission" example="Camera">%1$s</xliff:g> permissions</string>

    <string name="additional_permissions_decor_title">Additional permissions</string>

    <string name="system_apps_decor_title"><xliff:g id="permission" example="Camera">%1$s</xliff:g> permissions</string>

</resources>

res/values-television/themes.xml

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


<resources>

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

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

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

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

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

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

        <item name="android:backgroundDimAmount">0.8</item>

    </style>



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