Merge "SystemUI: Fix user profile activity overlapped by status bar panel issue" (9dd17852) · Commits · e / os / android_frameworks_base

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

+10 −1

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ public class MultiUserSwitch extends FrameLayout implements View.OnClickListener
		private KeyguardUserSwitcher mKeyguardUserSwitcher;
		private boolean mKeyguardMode;
		final UserManager mUserManager;
		private ActivityStarter mActivityStarter;

		public MultiUserSwitch(Context context, AttributeSet attrs) {
		super(context, attrs);
		@@ -65,6 +66,10 @@ public class MultiUserSwitch extends FrameLayout implements View.OnClickListener
		mKeyguardMode = keyguardShowing;
		}

		public void setActivityStarter(ActivityStarter activityStarter) {
		mActivityStarter = activityStarter;
		}

		@Override
		public void onClick(View v) {
		if (opensUserSwitcherWhenClicked()) {
		@@ -82,9 +87,13 @@ public class MultiUserSwitch extends FrameLayout implements View.OnClickListener
		Intent intent = ContactsContract.QuickContact.composeQuickContactsIntent(
		getContext(), v, ContactsContract.Profile.CONTENT_URI,
		ContactsContract.QuickContact.MODE_LARGE, null);
		if (mActivityStarter != null) {
		mActivityStarter.startActivity(intent, true /* dismissShade */);
		} else {
		getContext().startActivityAsUser(intent, new UserHandle(UserHandle.USER_CURRENT));
		}
		}
		}

		@Override
		public void onPopulateAccessibilityEvent(AccessibilityEvent event) {

+3 −0

Original line number	Diff line number	Diff line
		@@ -264,6 +264,9 @@ public class StatusBarHeaderView extends RelativeLayout implements View.OnClickL

		public void setActivityStarter(ActivityStarter activityStarter) {
		mActivityStarter = activityStarter;
		if (mMultiUserSwitch != null) {
		mMultiUserSwitch.setActivityStarter(activityStarter);
		}
		}

		public void setBatteryController(BatteryController batteryController) {