Merge "Defer theme flags when view isn't attached" (d9830db6) · Commits · e / os / android_frameworks_base

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -135,6 +135,7 @@ public class StatusBarWindowController implements Callback, Dumpable, Configurat
		mWindowManager.addView(mStatusBarView, mLp);
		mLpChanged = new WindowManager.LayoutParams();
		mLpChanged.copyFrom(mLp);
		onThemeChanged();
		}

		public void setDozeScreenBrightness(int value) {
		@@ -483,6 +484,10 @@ public class StatusBarWindowController implements Callback, Dumpable, Configurat

		@Override
		public void onThemeChanged() {
		if (mStatusBarView == null) {
		return;
		}

		StatusBarStateController state = Dependency.get(StatusBarStateController.class);
		int which;
		if (state.getState() == StatusBarState.KEYGUARD

+13 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package com.android.systemui.statusbar.phone;
		import static com.google.common.truth.Truth.assertThat;

		import static org.mockito.ArgumentMatchers.any;
		import static org.mockito.ArgumentMatchers.anyInt;
		import static org.mockito.Mockito.reset;
		import static org.mockito.Mockito.verify;
		import static org.mockito.Mockito.when;
		@@ -83,4 +84,16 @@ public class StatusBarWindowControllerTest extends SysuiTestCase {
		& WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
		assertThat(flag).isEqualTo(0);
		}

		@Test
		public void testOnThemeChanged_doesntCrash() {
		mStatusBarWindowController = new StatusBarWindowController(mContext, mWindowManager,
		mActivityManager, mDozeParameters);
		mStatusBarWindowController.onThemeChanged();
		}

		@Test
		public void testAdd_updatesVisibilityFlags() {
		verify(mStatusBarView).setSystemUiVisibility(anyInt());
		}
		}