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

Commit 0eab37f2 authored by Joel Galenson's avatar Joel Galenson
Browse files

Ensure the permission filter dialog title is always shown. 

Move the title out of the scroll view so that it is always visible and
add a shadow (when it's not at the top) to emphasize it.

Bug: 129289903
Test: View and scroll dialog.
Change-Id: Ie518f19746df79bec261ac8ed380e3ae9abeac20
parent 41434b75

res/layout/permission_filter_dialog.xml

+12 −5
Original line number Diff line number Diff line
@@ -15,16 +15,23 @@ 
     limitations under the License.

-->



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

            style="@style/PermissionFilterDialogScrollView">

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

    style="@style/PermissionFilterDialogContainer">



    <LinearLayout

        style="@style/PermissionFilterDialogContainer">

        android:id="@+id/title_container"

        style="@style/PermissionFilterDialogTitleContainer">



        <TextView

            android:id="@+id/title"

            style="@style/PermissionFilterDialogTitle"/>



    </LinearLayout>



    <ScrollView

        android:id="@+id/scroll_view"

        style="@style/PermissionFilterDialogScrollView">



        <LinearLayout

            style="@style/PermissionFilterDialogInnerContainer">
@@ -42,6 +49,6 @@ 


        </LinearLayout>



    </LinearLayout>



    </ScrollView>



</LinearLayout>

res/values/overlayable.xml

+2 −1
Original line number Diff line number Diff line
@@ -79,9 +79,10 @@ 
            <!-- END APP PERMISSION SCREEN -->



            <!-- START PERMISSION FILTER SCREEN -->

            <item type="style" name="PermissionFilterDialogScrollView" />

            <item type="style" name="PermissionFilterDialogContainer" />

            <item type="style" name="PermissionFilterDialogTitleContainer" />

            <item type="style" name="PermissionFilterDialogTitle" />

            <item type="style" name="PermissionFilterDialogScrollView" />

            <item type="style" name="PermissionFilterDialogInnerContainer" />

            <item type="style" name="PermissionFilterDialogItemsContainer" />

            <item type="style" name="PermissionFilterDialogItemContainer" />

res/values/styles.xml

+12 −6
Original line number Diff line number Diff line
@@ -295,18 +295,16 @@ 


    <!-- BEGIN PERMISSION FILTER SCREEN -->



    <style name="PermissionFilterDialogScrollView">

    <style name="PermissionFilterDialogContainer">

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">match_parent</item>

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

        <item name="android:orientation">vertical</item>

        <item name="android:fadeScrollbars">false</item>

    </style>



    <style name="PermissionFilterDialogContainer">

    <style name="PermissionFilterDialogTitleContainer">

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">match_parent</item>

        <item name="android:orientation">vertical</item>

        <item name="android:layout_height">wrap_content</item>

        <item name="android:background">?android:colorBackgroundFloating</item>

    </style>



    <style name="PermissionFilterDialogTitle"
@@ -320,6 +318,14 @@ 
        <item name="android:layout_marginEnd">24dp</item>

    </style>



    <style name="PermissionFilterDialogScrollView">

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">match_parent</item>

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

        <item name="android:orientation">vertical</item>

        <item name="android:fadeScrollbars">false</item>

    </style>



    <style name="PermissionFilterDialogInnerContainer">

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">wrap_content</item>

src/com/android/packageinstaller/permission/ui/handheld/PermissionUsageFragment.java

+4 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import com.android.packageinstaller.permission.model.PermissionUsages; 
import com.android.packageinstaller.permission.utils.Utils;

import com.android.permissioncontroller.R;

import com.android.settingslib.HelpUtils;

import com.android.settingslib.widget.ActionBarShadowController;



import java.lang.annotation.Retention;

import java.text.Collator;
@@ -817,6 +818,9 @@ public class PermissionUsageFragment extends SettingsWithLargeHeader implements 
            ((TextView) view.requireViewById(R.id.title)).setText(

                    getArguments().getCharSequence(TITLE));



            ActionBarShadowController.attachToView(view.requireViewById(R.id.title_container),

                    getLifecycle(), view.requireViewById(R.id.scroll_view));



            for (int i = 0; i < elems.length; i++) {

                String groupName = groups[i];

                View itemView = layoutInflater.inflate(R.layout.permission_filter_dialog_item,