Merge "Move user switcher to backgorund." into main (93bc3f16) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/systemui.aconfig

+11 −0

Original line number	Diff line number	Diff line
		@@ -429,3 +429,14 @@ flag {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "update_user_switcher_background"
		namespace: "systemui"
		description: "Decide whether to update user switcher in background thread."
		bug: "322745650"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

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

+17 −2

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import static android.app.StatusBarManager.DISABLE2_SYSTEM_ICONS;
		import static android.app.StatusBarManager.DISABLE_SYSTEM_INFO;

		import static com.android.systemui.statusbar.StatusBarState.KEYGUARD;
		import static com.android.systemui.Flags.updateUserSwitcherBackground;

		import android.content.res.Configuration;
		import android.content.res.Resources;
		@@ -43,6 +44,7 @@ import com.android.keyguard.KeyguardUpdateMonitor;
		import com.android.keyguard.KeyguardUpdateMonitorCallback;
		import com.android.keyguard.logging.KeyguardLogger;
		import com.android.systemui.battery.BatteryMeterViewController;
		import com.android.systemui.dagger.qualifiers.Background;
		import com.android.systemui.dagger.qualifiers.Main;
		import com.android.systemui.flags.FeatureFlags;
		import com.android.systemui.flags.Flags;
		@@ -122,6 +124,7 @@ public class KeyguardStatusBarViewController extends ViewController<KeyguardStat
		private final SecureSettings mSecureSettings;
		private final CommandQueue mCommandQueue;
		private final Executor mMainExecutor;
		private final Executor mBackgroundExecutor;
		private final Object mLock = new Object();
		private final KeyguardLogger mLogger;

		@@ -296,6 +299,7 @@ public class KeyguardStatusBarViewController extends ViewController<KeyguardStat
		SecureSettings secureSettings,
		CommandQueue commandQueue,
		@Main Executor mainExecutor,
		@Background Executor backgroundExecutor,
		KeyguardLogger logger,
		NotificationMediaManager notificationMediaManager,
		StatusOverlayHoverListenerFactory statusOverlayHoverListenerFactory
		@@ -323,6 +327,7 @@ public class KeyguardStatusBarViewController extends ViewController<KeyguardStat
		mSecureSettings = secureSettings;
		mCommandQueue = commandQueue;
		mMainExecutor = mainExecutor;
		mBackgroundExecutor = backgroundExecutor;
		mLogger = logger;

		mFirstBypassAttempt = mKeyguardBypassController.getBypassEnabled();
		@@ -607,8 +612,18 @@ public class KeyguardStatusBarViewController extends ViewController<KeyguardStat
		* Updates visibility of the user switcher button based on {@link android.os.UserManager} state.
		*/
		private void updateUserSwitcher() {
		mView.setUserSwitcherEnabled(mUserManager.isUserSwitcherEnabled(getResources().getBoolean(
		R.bool.qs_show_user_switcher_for_single_user)));
		if (updateUserSwitcherBackground()) {
		mBackgroundExecutor.execute(() -> {
		final boolean isUserSwitcherEnabled = mUserManager.isUserSwitcherEnabled(
		getResources().getBoolean(R.bool.qs_show_user_switcher_for_single_user));
		mMainExecutor.execute(() -> {
		mView.setUserSwitcherEnabled(isUserSwitcherEnabled);
		});
		});
		} else {
		mView.setUserSwitcherEnabled(mUserManager.isUserSwitcherEnabled(
		getResources().getBoolean(R.bool.qs_show_user_switcher_for_single_user)));
		}
		}

		@VisibleForTesting

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewControllerTest.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -147,6 +147,7 @@ public class KeyguardStatusBarViewControllerTest extends SysuiTestCase {
		private KeyguardStatusBarView mKeyguardStatusBarView;
		private KeyguardStatusBarViewController mController;
		private FakeExecutor mFakeExecutor = new FakeExecutor(new FakeSystemClock());
		private final FakeExecutor mBackgroundExecutor = new FakeExecutor(new FakeSystemClock());
		private final TestScope mTestScope = TestScopeProvider.getTestScope();
		private final FakeKeyguardRepository mKeyguardRepository = new FakeKeyguardRepository();
		private final KosmosJavaAdapter mKosmos = new KosmosJavaAdapter(this);
		@@ -214,6 +215,7 @@ public class KeyguardStatusBarViewControllerTest extends SysuiTestCase {
		mSecureSettings,
		mCommandQueue,
		mFakeExecutor,
		mBackgroundExecutor,
		mLogger,
		mNotificationMediaManager,
		mStatusOverlayHoverListenerFactory