diff options
author | Ian Pedowitz <ijpedowitz@google.com> | 2015-08-22 00:15:55 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-22 00:15:55 +0000 |
commit | cc6938f2cb15271830874595cbaf4f58fe4e08c5 (patch) | |
tree | 220e66b472e2028ab05081d36ba945ee4c75a3af /src/com/android/packageinstaller/permission/ui | |
parent | 9478120abc48a8934e5de14f7cf49342cef5485c (diff) | |
parent | 4a399b3249a39c66108f7bed37c95bc4d43a92b2 (diff) | |
download | android_packages_apps_PackageInstaller-cc6938f2cb15271830874595cbaf4f58fe4e08c5.tar.gz android_packages_apps_PackageInstaller-cc6938f2cb15271830874595cbaf4f58fe4e08c5.tar.bz2 android_packages_apps_PackageInstaller-cc6938f2cb15271830874595cbaf4f58fe4e08c5.zip |
am 4a399b32: am d7b72885: Revert "Show multi-permission UI in the requested order."
* commit '4a399b3249a39c66108f7bed37c95bc4d43a92b2':
Revert "Show multi-permission UI in the requested order."
Diffstat (limited to 'src/com/android/packageinstaller/permission/ui')
-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 c1597f16..e10932a7 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; @@ -189,8 +189,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( @@ -217,13 +217,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; @@ -363,8 +361,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); |