Merge "Remove the obsolete 'show legacy' option from permission screens" into mnc-dev (4bb2c78d) · Commits · e / os / android_packages_apps_PackageInstaller

res/menu/toggle_legacy_permissions.xml

deleted100644 → 0

+0 −24

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2015 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->

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

		<item
		android:id="@+id/toggle_legacy_permissions"
		android:title="@string/show_legacy_permissions">
		</item>

		</menu>

res/values/strings.xml

+0 −6

Original line number	Diff line number	Diff line
		@@ -221,12 +221,6 @@
		<!-- Warning for turning off permissions on older apps -->
		<string name="old_sdk_deny_warning">This app was designed for an older version of Android. Denying permission may cause it to no longer function as intended.</string>

		<!-- Label for the menu option to show legacy permissions [CHAR LIMIT=40] -->
		<string name="show_legacy_permissions">Show legacy</string>

		<!-- Label for the menu option to hide legacy permissions [CHAR LIMIT=40] -->
		<string name="hide_legacy_permissions">Hide legacy</string>

		<!-- The default description of a permission, i.e. what it does. [CHAR LIMIT=40] -->
		<string name="default_permission_description">perform an unknown action</string>

src/com/android/packageinstaller/permission/model/PermissionStatusReceiver.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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++;

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

+2 −27

Original line number	Diff line number	Diff line
		@@ -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) {

src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java

+10 −2

Original line number	Diff line number	Diff line
		@@ -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