Merge "[View Controllers] Move more KeyguardStatusBarView methods out of... (4cc60160) · Commits · e / os / android_frameworks_base

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

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -205,6 +205,14 @@ public class KeyguardStatusBarViewController extends ViewController<KeyguardStat
	mView.setTopClipping(notificationPanelTop - mView.getTop());		mView.setTopClipping(notificationPanelTop - mView.getTop());
	}		}

			/**
			* Updates the {@link KeyguardStatusBarView} state based on the provided values.
			*/
			public void updateViewState(float alpha, int visibility) {
			mView.setAlpha(alpha);
			mView.setVisibility(visibility);
			}

	/** */		/** */
	public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {		public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
	pw.println("KeyguardStatusBarView:");		pw.println("KeyguardStatusBarView:");

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -4497,8 +4497,9 @@ public class NotificationPanelViewController extends PanelViewController {
	}		}
	}		}
	} else {		} else {
	mKeyguardStatusBar.setAlpha(1f);		mKeyguardStatusBarViewController.updateViewState(
	mKeyguardStatusBar.setVisibility(keyguardShowing ? View.VISIBLE : View.INVISIBLE);		/* alpha= */ 1f,
			keyguardShowing ? View.VISIBLE : View.INVISIBLE);
	if (keyguardShowing && oldState != mBarState) {		if (keyguardShowing && oldState != mBarState) {
	if (mQs != null) {		if (mQs != null) {
	mQs.hideImmediately();		mQs.hideImmediately();

+15 −0

Original line number	Original line	Diff line number	Diff line
	@@ -25,6 +25,7 @@ import static org.mockito.Mockito.verify;
	import android.testing.AndroidTestingRunner;		import android.testing.AndroidTestingRunner;
	import android.testing.TestableLooper;		import android.testing.TestableLooper;
	import android.view.LayoutInflater;		import android.view.LayoutInflater;
			import android.view.View;

	import androidx.test.filters.SmallTest;		import androidx.test.filters.SmallTest;

	@@ -162,4 +163,18 @@ public class KeyguardStatusBarViewControllerTest extends SysuiTestCase {

	assertThat(mKeyguardStatusBarView.getClipBounds().top).isEqualTo(0);		assertThat(mKeyguardStatusBarView.getClipBounds().top).isEqualTo(0);
	}		}

			@Test
			public void updateViewState_alphaAndVisibilityGiven_viewUpdated() {
			// Verify the initial values so we know the method triggers changes.
			assertThat(mKeyguardStatusBarView.getAlpha()).isEqualTo(1f);
			assertThat(mKeyguardStatusBarView.getVisibility()).isEqualTo(View.VISIBLE);

			float newAlpha = 0.5f;
			int newVisibility = View.INVISIBLE;
			mController.updateViewState(newAlpha, newVisibility);

			assertThat(mKeyguardStatusBarView.getAlpha()).isEqualTo(newAlpha);
			assertThat(mKeyguardStatusBarView.getVisibility()).isEqualTo(newVisibility);
			}
	}		}