Add info button that leads to app info

Bug: 20633669
Change-Id: I4fc761e17ceee735a2bb833febf0af931ae6321f

2 files changed, 11 insertions, 1 deletions

diff --git a/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java b/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java
index a74f08c8..6a87f9b0 100644
--- a/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java
+++ b/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java
@@ -24,11 +24,13 @@ import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.graphics.drawable.Drawable;
+import android.net.Uri;
 import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.PreferenceScreen;
 import android.preference.SwitchPreference;
+import android.provider.Settings;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
@@ -48,6 +50,8 @@ public final class AppPermissionsFragment extends SettingsWithHeader
         implements OnPreferenceChangeListener {
     private static final String LOG_TAG = "ManagePermsFragment";
 
+    private static final String EXTRA_HIDE_INFO_BUTTON = "hideInfoButton";
+
     private AppPermissions mAppPermissions;
 
     public static AppPermissionsFragment newInstance(String packageName) {
@@ -120,7 +124,12 @@ public final class AppPermissionsFragment extends SettingsWithHeader
         ApplicationInfo appInfo = packageInfo.applicationInfo;
         final Drawable icon = appInfo.loadIcon(pm);
         final CharSequence label = appInfo.loadLabel(pm);
-        setHeader(icon, label, null);
+        Intent infoIntent = null;
+        if (!getActivity().getIntent().getBooleanExtra(EXTRA_HIDE_INFO_BUTTON, false)) {
+            infoIntent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
+                    .setData(Uri.fromParts("package", packageName, null));
+        }
+        setHeader(icon, label, infoIntent);
 
         final ViewGroup rootView = (ViewGroup) getView();
         final ImageView iconView = (ImageView) rootView.findViewById(R.id.lb_icon);
diff --git a/src/com/android/packageinstaller/permission/ui/SettingsWithHeader.java b/src/com/android/packageinstaller/permission/ui/SettingsWithHeader.java
index e1e3abe2..c0285cd4 100644
--- a/src/com/android/packageinstaller/permission/ui/SettingsWithHeader.java
+++ b/src/com/android/packageinstaller/permission/ui/SettingsWithHeader.java
@@ -68,6 +68,7 @@ public abstract class SettingsWithHeader extends PreferenceFragment implements O
             if (mInfoIntent == null) {
                 info.setVisibility(View.GONE);
             } else {
+                info.setVisibility(View.VISIBLE);
                 info.setClickable(true);
                 info.setOnClickListener(this);
             }