Add a header showing the permission name, icon, and description to PermissionAppsFragment.

Fixes: 124677177
Test: Open screen and see description.
Change-Id: Idbc2bc041bf4792a99d7d34fe0eaf3bf866f6f62

1 files changed, 14 insertions, 5 deletions

diff --git a/src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java b/src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java
index 050cdb15..0b667163 100644
--- a/src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java
+++ b/src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java
@@ -26,6 +26,7 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 
+import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
@@ -51,7 +52,7 @@ import java.util.Map;
  *
  * <p>Shows a list of apps which request at least on permission of this group.
  */
-public final class PermissionAppsFragment extends PermissionsFrameFragment implements Callback {
+public final class PermissionAppsFragment extends SettingsWithLargeHeader implements Callback {
 
     private static final String KEY_SHOW_SYSTEM_PREFS = "_showSystem";
 
@@ -162,12 +163,19 @@ public final class PermissionAppsFragment extends PermissionsFrameFragment imple
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        bindUi(this, mPermissionApps);
+        bindUi(this, mPermissionApps,
+                getArguments().getString(Intent.EXTRA_PERMISSION_NAME));
     }
 
-    private static void bindUi(Fragment fragment, PermissionApps permissionApps) {
+    private static void bindUi(SettingsWithLargeHeader fragment, PermissionApps permissionApps,
+            @NonNull String groupName) {
         final Drawable icon = permissionApps.getIcon();
         final CharSequence label = permissionApps.getLabel();
+
+        fragment.setHeader(icon, label, null);
+        fragment.setSummary(Utils.getPermissionGroupDescriptionString(fragment.getActivity(),
+                groupName, permissionApps.getDescription()), null);
+
         final ActionBar ab = fragment.getActivity().getActionBar();
         if (ab != null) {
             ab.setTitle(label);
@@ -373,7 +381,7 @@ public final class PermissionAppsFragment extends PermissionsFrameFragment imple
         }
     }
 
-    public static class SystemAppsFragment extends PermissionsFrameFragment implements Callback {
+    public static class SystemAppsFragment extends SettingsWithLargeHeader implements Callback {
         PermissionAppsFragment mOuterFragment;
 
         @Override
@@ -381,6 +389,7 @@ public final class PermissionAppsFragment extends PermissionsFrameFragment imple
             mOuterFragment = (PermissionAppsFragment) getTargetFragment();
             setLoading(true /* loading */, false /* animate */);
             super.onCreate(savedInstanceState);
+            setHeader(mOuterFragment.mIcon, mOuterFragment.mLabel, null);
             if (mOuterFragment.mExtraScreen != null) {
                 setPreferenceScreen();
             } else {
@@ -394,7 +403,7 @@ public final class PermissionAppsFragment extends PermissionsFrameFragment imple
             String groupName = getArguments().getString(Intent.EXTRA_PERMISSION_NAME);
             PermissionApps permissionApps = new PermissionApps(getActivity(),
                     groupName, (Callback) null);
-            bindUi(this, permissionApps);
+            bindUi(this, permissionApps, groupName);
         }
 
         @Override