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

Commit 5ed12fc3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use new header for filtering permissions Hub by permission."

parents 2c78490d a8aef3ac

res/layout/button_header.xml

+9 −1
Original line number Diff line number Diff line
@@ -21,7 +21,15 @@ 
    android:orientation="vertical"

    android:gravity="center" >



    <include layout="@layout/settings_entity_header" />X

    <include layout="@layout/settings_entity_header" />



    <TextView

        android:id="@+id/header_link"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginBottom="16dp"

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

        android:clickable="true"/>



    <View

        android:layout_width="match_parent"

res/values/strings.xml

+5 −2
Original line number Diff line number Diff line
@@ -324,8 +324,11 @@ 
    <!-- Label for the bars on the chart that shows how many apps have used various permissions [CHAR LIMIT=10] -->

    <string name="app_permission_usage_bar_label">Apps</string>



    <!-- Label for the text at the bottom of the permission bar chart that allows viewing usage of all permissions [CHAR LIMIT=none] -->

    <string name="app_permission_usage_detail_label">See all usage</string>

    <!-- Label for filtered view that shows permission usages of a single permission [CHAR LIMIT=40] -->

    <string name="app_permission_usage_filter_label">Filtered by: <xliff:g id="perm" example="Location">%1$s</xliff:g> </string>



    <!-- Label for the text that removes the filter by permission to view all usages [CHAR LIMIT=none] -->

    <string name="app_permission_usage_remove_filter">Remove filter</string>



    <!-- Label for the title of the dialog allowing filtering by permissions [CHAR LIMIT=none] -->

    <string name="filter_by_title">Filter by</string>

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

+2 −2
Original line number Diff line number Diff line
@@ -178,8 +178,8 @@ public class AppPermissionFragment extends SettingsWithButtonHeader { 
        }



        String appLabel = Utils.getFullAppLabel(mGroup.getApp().applicationInfo, context);

        setHeader(getAppIcon(), appLabel);

        updateHeader(root.requireViewById(R.id.button_header));

        setHeader(getAppIcon(), appLabel, true);

        updateHeader(root.requireViewById(R.id.button_header), true);



        ((TextView) root.requireViewById(R.id.permission_message)).setText(

                context.getString(R.string.app_permission_header, mGroup.getLabel(), appLabel));

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

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ public class AppPermissionUsageFragment extends SettingsWithButtonHeader { 
    public void onViewCreated(View view, Bundle savedInstanceState) {

        super.onViewCreated(view, savedInstanceState);

        Drawable icon = Utils.getBadgedIcon(getActivity(), mAppInfo);

        setHeader(icon, Utils.getFullAppLabel(mAppInfo, getContext()));

        setHeader(icon, Utils.getFullAppLabel(mAppInfo, getContext()), true);

    }



    @Override

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

+2 −2
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ public final class AppPermissionsFragment extends SettingsWithButtonHeader { 
        ApplicationInfo appInfo = packageInfo.applicationInfo;



        Drawable icon = Utils.getBadgedIcon(activity, appInfo);

        fragment.setHeader(icon, Utils.getFullAppLabel(appInfo, activity));

        fragment.setHeader(icon, Utils.getFullAppLabel(appInfo, activity), true);



        ActionBar ab = activity.getActionBar();

        if (ab != null) {
@@ -306,7 +306,7 @@ public final class AppPermissionsFragment extends SettingsWithButtonHeader { 
        public void onCreate(Bundle savedInstanceState) {

            mOuterFragment = (AppPermissionsFragment) getTargetFragment();

            super.onCreate(savedInstanceState);

            setHeader(mOuterFragment.mIcon, mOuterFragment.mLabel);

            setHeader(mOuterFragment.mIcon, mOuterFragment.mLabel, true);

            setHasOptionsMenu(true);

            setPreferenceScreen(mOuterFragment.mExtraScreen);

        }