Merge "Fix to further ensure floating menu is refreshed on user change" into main (b4335a0f) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/AccessibilityFloatingMenuController.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -226,7 +226,11 @@ public class AccessibilityFloatingMenuController implements
		mBtnTargets =
		mAccessibilityButtonTargetsObserver.getCurrentAccessibilityButtonTargets();
		mHandler.post(
		() -> handleFloatingMenuVisibility(mIsKeyguardVisible, mBtnMode, mBtnTargets));
		() -> {
		// Force a refresh by destroying the menu if it exists.
		destroyFloatingMenu();
		handleFloatingMenuVisibility(mIsKeyguardVisible, mBtnMode, mBtnTargets);
		});
		}
		}
		}

+19 −0

Original line number	Diff line number	Diff line
		@@ -338,6 +338,25 @@ public class AccessibilityFloatingMenuControllerTest extends SysuiTestCase {
		assertThat(mController.mFloatingMenu).isInstanceOf(MenuViewLayerController.class);
		}

		@Test
		public void onUserInitializationComplete_destroysOldWidget() {
		enableAccessibilityFloatingMenuConfig();
		mController = setUpController();

		captureKeyguardUpdateMonitorCallback();
		mKeyguardCallback.onUserUnlocked();
		mKeyguardCallback.onKeyguardVisibilityChanged(false);

		IAccessibilityFloatingMenu floatingMenu = mController.mFloatingMenu;

		mController.mUserInitializationCompleteCallback
		.onUserInitializationComplete(mContext.getUserId());
		mTestableLooper.processAllMessages();

		assertThat(mController.mFloatingMenu).isNotNull();
		assertThat(mController.mFloatingMenu).isNotSameInstanceAs(floatingMenu);
		}

		private AccessibilityFloatingMenuController setUpController() {
		final WindowManager windowManager = mContext.getSystemService(WindowManager.class);
		final ViewCaptureAwareWindowManager viewCaptureAwareWindowManager =