Merge "fix toggling off current permissions in review" am: 367cb02850 (540dc91e) · Commits · e / os / android_packages_apps_PackageInstaller

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

+31 −22

Original line number	Diff line number	Diff line
		@@ -52,6 +52,7 @@ import com.android.packageinstaller.permission.utils.Utils;
		import com.android.packageinstaller.permission.ui.ConfirmActionDialogFragment.OnActionConfirmedListener;
		import com.android.packageinstaller.permission.ui.wear.ReviewPermissionsWearFragment;

		import java.util.ArrayList;
		import java.util.List;

		public final class ReviewPermissionsActivity extends Activity
		@@ -114,6 +115,7 @@ public final class ReviewPermissionsActivity extends Activity
		private Button mMoreInfoButton;

		private PreferenceCategory mNewPermissionsCategory;
		private PreferenceCategory mCurrentPermissionsCategory;

		private boolean mHasConfirmedRevoke;

		@@ -235,9 +237,15 @@ public final class ReviewPermissionsActivity extends Activity
		}

		private void confirmPermissionsReview() {
		PreferenceGroup preferenceGroup = mNewPermissionsCategory != null
		? mNewPermissionsCategory : getPreferenceScreen();
		final List<PreferenceGroup> preferenceGroups = new ArrayList<PreferenceGroup>();
		if (mNewPermissionsCategory != null) {
		preferenceGroups.add(mNewPermissionsCategory);
		preferenceGroups.add(mCurrentPermissionsCategory);
		} else {
		preferenceGroups.add(getPreferenceScreen());
		}

		for (PreferenceGroup preferenceGroup : preferenceGroups) {
		final int preferenceCount = preferenceGroup.getPreferenceCount();
		for (int i = 0; i < preferenceCount; i++) {
		Preference preference = preferenceGroup.getPreference(i);
		@@ -254,6 +262,7 @@ public final class ReviewPermissionsActivity extends Activity
		}
		}
		}
		}

		private void bindUi() {
		Activity activity = getActivity();
		@@ -307,7 +316,7 @@ public final class ReviewPermissionsActivity extends Activity
		screen.removeAll();
		}

		PreferenceGroup currentPermissionsCategory = null;
		mCurrentPermissionsCategory = null;
		PreferenceGroup oldNewPermissionsCategory = mNewPermissionsCategory;
		mNewPermissionsCategory = null;

		@@ -365,13 +374,13 @@ public final class ReviewPermissionsActivity extends Activity
		mNewPermissionsCategory.addPreference(preference);
		}
		} else {
		if (currentPermissionsCategory == null) {
		currentPermissionsCategory = new PreferenceCategory(activity);
		currentPermissionsCategory.setTitle(R.string.current_permissions_category);
		currentPermissionsCategory.setOrder(2);
		screen.addPreference(currentPermissionsCategory);
		if (mCurrentPermissionsCategory == null) {
		mCurrentPermissionsCategory = new PreferenceCategory(activity);
		mCurrentPermissionsCategory.setTitle(R.string.current_permissions_category);
		mCurrentPermissionsCategory.setOrder(2);
		screen.addPreference(mCurrentPermissionsCategory);
		}
		currentPermissionsCategory.addPreference(preference);
		mCurrentPermissionsCategory.addPreference(preference);
		}
		}
		}