Merge "Revert "Only keep user switcher bitmaps if needed"" into lmp-mr1-dev (8a924242) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -872,10 +872,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		mKeyguardUserSwitcher = new KeyguardUserSwitcher(mContext,
		(ViewStub) mStatusBarWindow.findViewById(R.id.keyguard_user_switcher),
		mKeyguardStatusBar, mNotificationPanel, mUserSwitcherController);
		if (mUserSwitcherController != null) {
		mUserSwitcherController.setKeyguardUserSwitcherAvailable(
		mKeyguardUserSwitcher.isEnabled());
		}


		// Set up the quick settings tile panel
		@@ -2142,9 +2138,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,

		public void setQsExpanded(boolean expanded) {
		mStatusBarWindowManager.setQsExpanded(expanded);
		if (mUserSwitcherController != null) {
		mUserSwitcherController.setQsExpanded(expanded);
		}
		}

		public boolean isGoingToNotificationShade() {

packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardUserSwitcher.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -227,10 +227,6 @@ public class KeyguardUserSwitcher {
		}
		};

		public boolean isEnabled() {
		return mUserSwitcherContainer != null;
		}

		public static class Adapter extends UserSwitcherController.BaseUserAdapter implements
		View.OnClickListener {

packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java

+14 −46

Original line number	Diff line number	Diff line
		@@ -78,9 +78,6 @@ public class UserSwitcherController {
		private boolean mSimpleUserSwitcher;
		private boolean mAddUsersWhenLocked;

		private boolean mKeyguardUserSwitcherAvailable;
		private boolean mQsExpanded;

		public UserSwitcherController(Context context, KeyguardMonitor keyguardMonitor) {
		mContext = context;
		mGuestResumeSessionReceiver.register(context);
		@@ -119,9 +116,8 @@ public class UserSwitcherController {
		*/
		@SuppressWarnings("unchecked")
		private void refreshUsers(int forcePictureLoadForId) {
		SparseArray<Bitmap> bitmaps = null;
		if (allowCachingOfBitmaps()) {
		bitmaps = new SparseArray<>(mUsers.size());

		SparseArray<Bitmap> bitmaps = new SparseArray<>(mUsers.size());
		final int N = mUsers.size();
		for (int i = 0; i < N; i++) {
		UserRecord r = mUsers.get(i);
		@@ -131,7 +127,6 @@ public class UserSwitcherController {
		}
		bitmaps.put(r.info.id, r.picture);
		}
		}

		final boolean addUsersWhenLocked = mAddUsersWhenLocked;
		new AsyncTask<SparseArray<Bitmap>, Void, ArrayList<UserRecord>>() {
		@@ -156,14 +151,13 @@ public class UserSwitcherController {
		true /* isGuest /, isCurrent, false / isAddUser */,
		false /* isRestricted */);
		} else if (info.supportsSwitchTo()) {
		Bitmap picture = bitmaps != null ? bitmaps.get(info.id) : null;
		if (picture == null && allowCachingOfBitmaps()) {
		Bitmap loadedPicture = mUserManager.getUserIcon(info.id);
		Bitmap picture = bitmaps.get(info.id);
		if (picture == null) {
		picture = mUserManager.getUserIcon(info.id);

		if (loadedPicture != null) {
		if (picture != null) {
		picture = BitmapHelper.createCircularClip(
		loadedPicture, avatarSize, avatarSize);
		loadedPicture.recycle();
		picture, avatarSize, avatarSize);
		}
		}
		int index = isCurrent ? 0 : records.size();
		@@ -559,32 +553,6 @@ public class UserSwitcherController {
		}
		}

		/**
		* Notify if the keyguard user switcher is available.
		*/
		public void setKeyguardUserSwitcherAvailable(boolean available) {
		boolean oldShouldCacheBitmaps = allowCachingOfBitmaps();
		mKeyguardUserSwitcherAvailable = available;
		if (allowCachingOfBitmaps() != oldShouldCacheBitmaps) {
		refreshUsers(UserHandle.USER_NULL);
		}
		}

		/**
		* Notify if the quick settings are expanded.
		*/
		public void setQsExpanded(boolean qsExpanded) {
		boolean oldShouldCacheBitmaps = allowCachingOfBitmaps();
		mQsExpanded = qsExpanded;
		if (allowCachingOfBitmaps() != oldShouldCacheBitmaps) {
		refreshUsers(UserHandle.USER_NULL);
		}
		}

		private boolean allowCachingOfBitmaps() {
		return mQsExpanded \|\| mKeyguardUserSwitcherAvailable;
		}

		private final class AddUserDialog extends SystemUIDialog implements
		DialogInterface.OnClickListener {