diff options
author | Ian Pedowitz <ijpedowitz@google.com> | 2015-08-21 17:33:02 +0000 |
---|---|---|
committer | Ian Pedowitz <ijpedowitz@google.com> | 2015-08-21 17:33:02 +0000 |
commit | d7b72885e4a9a18d1477b7e68942ae1b2ca67a4f (patch) | |
tree | 3322ac32863fdf14f83cd5bab6c4a2b3263c2d59 /src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java | |
parent | dda78230999da573318594c7cfcdbc738bab864e (diff) | |
download | android_packages_apps_PackageInstaller-d7b72885e4a9a18d1477b7e68942ae1b2ca67a4f.tar.gz android_packages_apps_PackageInstaller-d7b72885e4a9a18d1477b7e68942ae1b2ca67a4f.tar.bz2 android_packages_apps_PackageInstaller-d7b72885e4a9a18d1477b7e68942ae1b2ca67a4f.zip |
Revert "Show multi-permission UI in the requested order."
This reverts commit dda78230999da573318594c7cfcdbc738bab864e.
Bug: 23314383
Bug: 23397858
Change-Id: I8d06936ad8a51299148f0a311da81d8868840e78
Diffstat (limited to 'src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java')
-rw-r--r-- | src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java index 0c087350..a61432e3 100644 --- a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java +++ b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java @@ -31,6 +31,7 @@ import android.hardware.camera2.utils.ArrayUtils; import android.os.Bundle; 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; @@ -46,7 +47,6 @@ import com.android.packageinstaller.permission.utils.SafetyNetLogger; import com.android.packageinstaller.permission.utils.Utils; import java.util.ArrayList; -import java.util.LinkedHashMap; import java.util.List; public class GrantPermissionsActivity extends OverlayTouchActivity @@ -57,7 +57,7 @@ public class GrantPermissionsActivity extends OverlayTouchActivity private String[] mRequestedPermissions; private int[] mGrantResults; - private LinkedHashMap<String, GroupState> mRequestGrantPermissionGroups = new LinkedHashMap<>(); + private ArrayMap<String, GroupState> mRequestGrantPermissionGroups = new ArrayMap<>(); private GrantPermissionsViewHandler mViewHandler; private AppPermissions mAppPermissions; @@ -187,8 +187,8 @@ public class GrantPermissionsActivity extends OverlayTouchActivity private boolean showNextPermissionGroupGrantRequest() { final int groupCount = mRequestGrantPermissionGroups.size(); - int currentIndex = 0; - for (GroupState groupState : mRequestGrantPermissionGroups.values()) { + for (int i = 0; i < groupCount; i++) { + GroupState groupState = mRequestGrantPermissionGroups.valueAt(i); if (groupState.mState == GroupState.STATE_UNKNOWN) { CharSequence appLabel = mAppPermissions.getAppLabel(); SpannableString message = new SpannableString(getString( @@ -215,13 +215,11 @@ public class GrantPermissionsActivity extends OverlayTouchActivity } int icon = groupState.mGroup.getIconResId(); - mViewHandler.updateUi(groupState.mGroup.getName(), groupCount, currentIndex, + mViewHandler.updateUi(groupState.mGroup.getName(), groupCount, i, Icon.createWithResource(resources, icon), message, groupState.mGroup.isUserSet()); - return true; + return true; } - - currentIndex++; } return false; @@ -361,8 +359,8 @@ public class GrantPermissionsActivity extends OverlayTouchActivity final int groupCount = mRequestGrantPermissionGroups.size(); List<AppPermissionGroup> groups = new ArrayList<>(groupCount); - for (GroupState groupState : mRequestGrantPermissionGroups.values()) { - groups.add(groupState.mGroup); + for (int i = 0; i < groupCount; i++) { + groups.add(mRequestGrantPermissionGroups.valueAt(i).mGroup); } SafetyNetLogger.logPermissionsRequested(mAppPermissions.getPackageInfo(), groups); |