Merge "Use navController for back navigation" into rvc-dev (ff7d5470) · Commits · e / os / android_packages_apps_PackageInstaller

src/com/android/permissioncontroller/permission/ui/handheld/AllAppPermissionsFragment.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package com.android.permissioncontroller.permission.ui.handheld;

		import static com.android.permissioncontroller.permission.ui.handheld.UtilsKt.pressBack;

		import android.app.ActionBar;
		import android.app.AlertDialog;
		import android.content.Context;
		@@ -117,7 +119,7 @@ public final class AllAppPermissionsFragment extends SettingsWithLargeHeader {
		if (mPackageName == null \|\| mUser == null) {
		Log.e(LOG_TAG, "Missing required argument EXTRA_PACKAGE_NAME or "
		+ "EXTRA_USER");
		getActivity().onBackPressed();
		pressBack(this);
		}

		AllAppPermissionsViewModelFactory factory = new AllAppPermissionsViewModelFactory(
		@@ -153,7 +155,7 @@ public final class AllAppPermissionsFragment extends SettingsWithLargeHeader {
		public boolean onOptionsItemSelected(MenuItem item) {
		switch (item.getItemId()) {
		case android.R.id.home: {
		getActivity().onBackPressed();
		pressBack(this);
		return true;
		}
		}
		@@ -165,7 +167,7 @@ public final class AllAppPermissionsFragment extends SettingsWithLargeHeader {
		Toast.makeText(
		getActivity(), R.string.app_not_found_dlg_title, Toast.LENGTH_LONG).show();
		Log.w(LOG_TAG, "invalid package " + mPackageName);
		getActivity().onBackPressed();
		pressBack(this);
		return;
		}

+3 −2

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ import static com.android.permissioncontroller.permission.ui.GrantPermissionsVie
		import static com.android.permissioncontroller.permission.ui.ManagePermissionsActivity.EXTRA_CALLER_NAME;
		import static com.android.permissioncontroller.permission.ui.ManagePermissionsActivity.EXTRA_RESULT_PERMISSION_INTERACTED;
		import static com.android.permissioncontroller.permission.ui.ManagePermissionsActivity.EXTRA_RESULT_PERMISSION_RESULT;
		import static com.android.permissioncontroller.permission.ui.handheld.UtilsKt.pressBack;

		import android.app.ActionBar;
		import android.app.Activity;
		@@ -308,7 +309,7 @@ public class AppPermissionFragment extends SettingsWithLargeHeader
		@Override
		public boolean onOptionsItemSelected(MenuItem item) {
		if (item.getItemId() == android.R.id.home) {
		getActivity().onBackPressed();
		pressBack(this);
		return true;
		}
		return super.onOptionsItemSelected(item);
		@@ -316,7 +317,7 @@ public class AppPermissionFragment extends SettingsWithLargeHeader

		private void setRadioButtonsState(Map<ButtonType, ButtonState> states) {
		if (states == null && mViewModel.getButtonStateLiveData().isInitialized()) {
		getActivity().onBackPressed();
		pressBack(this);
		Log.w(LOG_TAG, "invalid package " + mPackageName + " or perm group "
		+ mPermGroupName);
		Toast.makeText(

+5 −2

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import static com.android.permissioncontroller.PermissionControllerStatsLog.APP_
		import static com.android.permissioncontroller.PermissionControllerStatsLog.APP_PERMISSIONS_FRAGMENT_VIEWED__CATEGORY__ALLOWED;
		import static com.android.permissioncontroller.PermissionControllerStatsLog.APP_PERMISSIONS_FRAGMENT_VIEWED__CATEGORY__ALLOWED_FOREGROUND;
		import static com.android.permissioncontroller.PermissionControllerStatsLog.APP_PERMISSIONS_FRAGMENT_VIEWED__CATEGORY__DENIED;
		import static com.android.permissioncontroller.permission.ui.handheld.UtilsKt.pressBack;

		import android.app.ActionBar;
		import android.app.Activity;
		@@ -189,7 +190,7 @@ public final class AppPermissionGroupsFragment extends SettingsWithLargeHeader {
		public boolean onOptionsItemSelected(MenuItem item) {
		switch (item.getItemId()) {
		case android.R.id.home: {
		getActivity().onBackPressed();
		pressBack(this);
		return true;
		}

		@@ -248,7 +249,9 @@ public final class AppPermissionGroupsFragment extends SettingsWithLargeHeader {
		Toast.makeText(
		getActivity(), R.string.app_not_found_dlg_title, Toast.LENGTH_LONG).show();
		Log.w(LOG_TAG, "invalid package " + mPackageName);
		getActivity().onBackPressed();

		pressBack(this);

		return;
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -107,7 +107,7 @@ class AutoRevokeFragment : PermissionsFrameFragment() {

		override fun onOptionsItemSelected(item: MenuItem): Boolean {
		if (item.itemId == android.R.id.home) {
		activity!!.onBackPressed()
		this.pressBack()
		return true
		}
		return super.onOptionsItemSelected(item)

+2 −1

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package com.android.permissioncontroller.permission.ui.handheld;

		import static com.android.permissioncontroller.Constants.EXTRA_SESSION_ID;
		import static com.android.permissioncontroller.permission.ui.handheld.UtilsKt.pressBack;

		import android.os.Bundle;
		import android.view.MenuItem;
		@@ -93,7 +94,7 @@ public class ManageCustomPermissionsFragment extends ManagePermissionsFragment {
		public boolean onOptionsItemSelected(MenuItem item) {
		switch (item.getItemId()) {
		case android.R.id.home:
		getActivity().onBackPressed();
		pressBack(this);
		return true;
		}
		return super.onOptionsItemSelected(item);