Merge "Remove the obsolete 'show legacy' option from permission screens" into mnc-dev

6 files changed, 21 insertions, 75 deletions

diff --git a/src/com/android/packageinstaller/permission/model/PermissionStatusReceiver.java b/src/com/android/packageinstaller/permission/model/PermissionStatusReceiver.java
index 83cecc60..52fb874e 100644
--- a/src/com/android/packageinstaller/permission/model/PermissionStatusReceiver.java
+++ b/src/com/android/packageinstaller/permission/model/PermissionStatusReceiver.java
@@ -75,7 +75,7 @@ public class PermissionStatusReceiver extends BroadcastReceiver {
             int additionalCount = 0;
 
             for (AppPermissionGroup group : appPermissions.getPermissionGroups()) {
-                if (Utils.shouldShowPermission(group, false)) {
+                if (Utils.shouldShowPermission(group)) {
                     totalCount++;
                     if (group.areRuntimePermissionsGranted()) {
                         grantedCount++;
diff --git a/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java b/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java
index eed23f94..d78883a4 100644
--- a/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java
+++ b/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java
@@ -71,7 +71,6 @@ public final class AppPermissionsFragment extends SettingsWithHeader
     private PreferenceScreen mExtraScreen;
 
     private boolean mHasConfirmedRevoke;
-    private boolean mShowLegacyPermissions;
 
     public static AppPermissionsFragment newInstance(String packageName) {
         return setPackageName(new AppPermissionsFragment(), packageName);
@@ -127,12 +126,6 @@ public final class AppPermissionsFragment extends SettingsWithHeader
                 return true;
             }
 
-            case R.id.toggle_legacy_permissions: {
-                mShowLegacyPermissions = !mShowLegacyPermissions;
-                loadPreferences();
-                return true;
-            }
-
             case MENU_ALL_PERMS: {
                 Fragment frag = AllAppPermissionsFragment.newInstance(
                         getArguments().getString(Intent.EXTRA_PACKAGE_NAME));
@@ -157,20 +150,9 @@ public final class AppPermissionsFragment extends SettingsWithHeader
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
-        inflater.inflate(R.menu.toggle_legacy_permissions, menu);
         menu.add(Menu.NONE, MENU_ALL_PERMS, Menu.NONE, R.string.all_permissions);
     }
 
-    @Override
-    public void onPrepareOptionsMenu(Menu menu) {
-        MenuItem item = menu.findItem(R.id.toggle_legacy_permissions);
-        if (!mShowLegacyPermissions) {
-            item.setTitle(R.string.show_legacy_permissions);
-        } else {
-            item.setTitle(R.string.hide_legacy_permissions);
-        }
-    }
-
     private static void bindUi(SettingsWithHeader fragment, PackageInfo packageInfo) {
         Activity activity = fragment.getActivity();
         PackageManager pm = activity.getPackageManager();
@@ -223,18 +205,11 @@ public final class AppPermissionsFragment extends SettingsWithHeader
         extraPerms.setTitle(R.string.additional_permissions);
 
         for (AppPermissionGroup group : mAppPermissions.getPermissionGroups()) {
-            if (!Utils.shouldShowPermission(group, true /* showLegacy */)) {
+            if (!Utils.shouldShowPermission(group)) {
                 continue;
             }
 
             boolean isPlatform = group.getDeclaringPackage().equals(Utils.OS_PKG);
-            boolean isLegacy = isPlatform && !Utils.isModernPermissionGroup(group.getName());
-            boolean isTelevision = Utils.isTelevision(context);
-
-            if (isLegacy && !mShowLegacyPermissions && !isTelevision) {
-                // Television shows legacy on the extra screen
-                continue;
-            }
 
             SwitchPreference preference = new SwitchPreference(context);
             preference.setOnPreferenceChangeListener(this);
@@ -251,7 +226,7 @@ public final class AppPermissionsFragment extends SettingsWithHeader
             preference.setEnabled(!group.isPolicyFixed());
             preference.setChecked(group.areRuntimePermissionsGranted());
 
-            if (isPlatform && (!isLegacy || !isTelevision)) {
+            if (isPlatform) {
                 screen.addPreference(preference);
             } else {
                 if (mExtraScreen == null) {
diff --git a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java
index cc96bec9..4755e9bf 100644
--- a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java
+++ b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java
@@ -34,6 +34,7 @@ import android.text.SpannableString;
 import android.text.style.ForegroundColorSpan;
 import android.util.ArrayMap;
 import android.util.Log;
+import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.Window;
@@ -246,8 +247,15 @@ public class GrantPermissionsActivity extends Activity
     }
 
     @Override
-    public void onBackPressed() {
-        mViewHandler.onBackPressed();
+    public boolean onKeyDown(int keyCode, KeyEvent event)  {
+        // We do not allow backing out.
+        return keyCode == KeyEvent.KEYCODE_BACK;
+    }
+
+    @Override
+    public boolean onKeyUp(int keyCode, KeyEvent event)  {
+        // We do not allow backing out.
+        return keyCode == KeyEvent.KEYCODE_BACK;
     }
 
     @Override
diff --git a/src/com/android/packageinstaller/permission/ui/ManagePermissionsFragment.java b/src/com/android/packageinstaller/permission/ui/ManagePermissionsFragment.java
index 60d8a678..69891da6 100644
--- a/src/com/android/packageinstaller/permission/ui/ManagePermissionsFragment.java
+++ b/src/com/android/packageinstaller/permission/ui/ManagePermissionsFragment.java
@@ -28,8 +28,6 @@ import android.support.v7.preference.Preference.OnPreferenceClickListener;
 import android.support.v7.preference.PreferenceScreen;
 import android.util.ArraySet;
 import android.util.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.ImageView;
@@ -58,8 +56,6 @@ public final class ManagePermissionsFragment extends PermissionsFrameFragment
 
     private PreferenceScreen mExtraScreen;
 
-    private boolean mShowLegacyPermissions;
-
     public static ManagePermissionsFragment newInstance() {
         return new ManagePermissionsFragment();
     }
@@ -85,34 +81,10 @@ public final class ManagePermissionsFragment extends PermissionsFrameFragment
     }
 
     @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        super.onCreateOptionsMenu(menu, inflater);
-        inflater.inflate(R.menu.toggle_legacy_permissions, menu);
-    }
-
-    @Override
-    public void onPrepareOptionsMenu(Menu menu) {
-        MenuItem item = menu.findItem(R.id.toggle_legacy_permissions);
-        if (!mShowLegacyPermissions) {
-            item.setTitle(R.string.show_legacy_permissions);
-        } else {
-            item.setTitle(R.string.hide_legacy_permissions);
-        }
-    }
-
-    @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home: {
-                getActivity().finish();
-                return true;
-            }
-
-            case R.id.toggle_legacy_permissions: {
-                mShowLegacyPermissions = !mShowLegacyPermissions;
-                updatePermissionsUi();
-                return true;
-            }
+        if (item.getItemId() == android.R.id.home) {
+            getActivity().finish();
+            return true;
         }
         return super.onOptionsItemSelected(item);
     }
@@ -179,21 +151,13 @@ public final class ManagePermissionsFragment extends PermissionsFrameFragment
 
         List<PermissionGroup> groups = mPermissions.getGroups();
         PreferenceScreen screen = getPreferenceScreen();
-        boolean isTelevision = Utils.isTelevision(context);
 
         // Use this to speed up getting the info for all of the PermissionApps below.
         // Create a new one for each refresh to make sure it has fresh data.
         PmCache cache = new PmCache(getContext().getPackageManager());
         for (PermissionGroup group : groups) {
-            boolean isModernGroup = Utils.isModernPermissionGroup(group.getName());
             boolean isSystemPermission = group.getDeclaringPackage().equals(OS_PKG);
 
-            // Show legacy permissions only if the user chose that, except
-            // on TV, where they get grouped into the extra screen.
-            if (!mShowLegacyPermissions && !isTelevision && isSystemPermission && !isModernGroup) {
-                continue;
-            }
-
             Preference preference = findPreference(group.getName());
             if (preference == null && mExtraScreen != null) {
                 preference = mExtraScreen.findPreference(group.getName());
@@ -208,7 +172,7 @@ public final class ManagePermissionsFragment extends PermissionsFrameFragment
                 // Set blank summary so that no resizing/jumping happens when the summary is loaded.
                 preference.setSummary(" ");
                 preference.setPersistent(false);
-                if (isSystemPermission && (isModernGroup || !isTelevision)) {
+                if (isSystemPermission) {
                     screen.addPreference(preference);
                 } else {
                     if (mExtraScreen == null) {
diff --git a/src/com/android/packageinstaller/permission/ui/PermissionAppsFragment.java b/src/com/android/packageinstaller/permission/ui/PermissionAppsFragment.java
index 54ddde3d..a1ef3ca3 100644
--- a/src/com/android/packageinstaller/permission/ui/PermissionAppsFragment.java
+++ b/src/com/android/packageinstaller/permission/ui/PermissionAppsFragment.java
@@ -15,7 +15,6 @@
  */
 package com.android.packageinstaller.permission.ui;
 
-import android.annotation.Nullable;
 import android.app.ActionBar;
 import android.app.AlertDialog;
 import android.app.Fragment;
@@ -144,7 +143,7 @@ public final class PermissionAppsFragment extends PermissionsFrameFragment imple
     }
 
     @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+    public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         bindUi(this, mPermissionApps);
     }
@@ -394,7 +393,7 @@ public final class PermissionAppsFragment extends PermissionsFrameFragment imple
         }
 
         @Override
-        public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        public void onViewCreated(View view, Bundle savedInstanceState) {
             super.onViewCreated(view, savedInstanceState);
             String groupName = getArguments().getString(Intent.EXTRA_PERMISSION_NAME);
             PermissionApps permissionApps = new PermissionApps(getActivity(), groupName, null);
diff --git a/src/com/android/packageinstaller/permission/utils/Utils.java b/src/com/android/packageinstaller/permission/utils/Utils.java
index 422fdae1..552d4ad4 100644
--- a/src/com/android/packageinstaller/permission/utils/Utils.java
+++ b/src/com/android/packageinstaller/permission/utils/Utils.java
@@ -76,7 +76,7 @@ public class Utils {
         return false;
     }
 
-    public static boolean shouldShowPermission(AppPermissionGroup group, boolean showLegacy) {
+    public static boolean shouldShowPermission(AppPermissionGroup group) {
         // We currently will not show permissions fixed by the system.
         // which is what the system does for system components.
         if (group.isSystemFixed()) {
@@ -92,7 +92,7 @@ public class Utils {
 
         final boolean isPlatformPermission = group.getDeclaringPackage().equals(OS_PKG);
         // Show legacy permissions only if the user chose that.
-        if (isPlatformPermission && !showLegacy
+        if (isPlatformPermission
                 && !Utils.isModernPermissionGroup(group.getName())) {
             return false;
         }