Merge "Use KeyguardVisibilityHelper for CommunalHostView." (7fcb2e99) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -80,7 +80,7 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV
	mKeyguardStateController = keyguardStateController;		mKeyguardStateController = keyguardStateController;
	mKeyguardVisibilityHelper = new KeyguardVisibilityHelper(mView, communalStateController,		mKeyguardVisibilityHelper = new KeyguardVisibilityHelper(mView, communalStateController,
	keyguardStateController, dozeParameters, unlockedScreenOffAnimationController,		keyguardStateController, dozeParameters, unlockedScreenOffAnimationController,
	/* animateYPos= */ true);		/* animateYPos= / true, / visibleOnCommunal= */ false);
	mKeyguardUnlockAnimationController = keyguardUnlockAnimationController;		mKeyguardUnlockAnimationController = keyguardUnlockAnimationController;
	mSmartspaceTransitionController = smartspaceTransitionController;		mSmartspaceTransitionController = smartspaceTransitionController;
	}		}

packages/SystemUI/src/com/android/keyguard/KeyguardVisibilityHelper.java

+5 −2

Original line number	Original line	Diff line number	Diff line
	@@ -43,6 +43,7 @@ public class KeyguardVisibilityHelper {
	private final KeyguardStateController mKeyguardStateController;		private final KeyguardStateController mKeyguardStateController;
	private final DozeParameters mDozeParameters;		private final DozeParameters mDozeParameters;
	private final UnlockedScreenOffAnimationController mUnlockedScreenOffAnimationController;		private final UnlockedScreenOffAnimationController mUnlockedScreenOffAnimationController;
			private final boolean mVisibleOnCommunal;
	private boolean mAnimateYPos;		private boolean mAnimateYPos;
	private boolean mKeyguardViewVisibilityAnimating;		private boolean mKeyguardViewVisibilityAnimating;
	private boolean mLastOccludedState = false;		private boolean mLastOccludedState = false;
	@@ -53,13 +54,15 @@ public class KeyguardVisibilityHelper {
	KeyguardStateController keyguardStateController,		KeyguardStateController keyguardStateController,
	DozeParameters dozeParameters,		DozeParameters dozeParameters,
	UnlockedScreenOffAnimationController unlockedScreenOffAnimationController,		UnlockedScreenOffAnimationController unlockedScreenOffAnimationController,
	boolean animateYPos) {		boolean animateYPos,
			boolean visibleOnCommunal) {
	mView = view;		mView = view;
	mCommunalStateController = communalStateController;		mCommunalStateController = communalStateController;
	mKeyguardStateController = keyguardStateController;		mKeyguardStateController = keyguardStateController;
	mDozeParameters = dozeParameters;		mDozeParameters = dozeParameters;
	mUnlockedScreenOffAnimationController = unlockedScreenOffAnimationController;		mUnlockedScreenOffAnimationController = unlockedScreenOffAnimationController;
	mAnimateYPos = animateYPos;		mAnimateYPos = animateYPos;
			mVisibleOnCommunal = visibleOnCommunal;
	}		}

	public boolean isVisibilityAnimating() {		public boolean isVisibilityAnimating() {
	@@ -79,7 +82,7 @@ public class KeyguardVisibilityHelper {
	mKeyguardViewVisibilityAnimating = false;		mKeyguardViewVisibilityAnimating = false;

	// If the communal view is showing, hide immediately		// If the communal view is showing, hide immediately
	if (mCommunalStateController.getCommunalViewShowing()) {		if (!mVisibleOnCommunal && mCommunalStateController.getCommunalViewShowing()) {
	mView.setVisibility(View.GONE);		mView.setVisibility(View.GONE);
	mView.setAlpha(1f);		mView.setAlpha(1f);
	return;		return;

packages/SystemUI/src/com/android/systemui/communal/CommunalHostViewController.java

+22 −0

Original line number	Original line	Diff line number	Diff line
	@@ -24,8 +24,11 @@ import android.view.ViewGroup;

	import com.android.keyguard.KeyguardUpdateMonitor;		import com.android.keyguard.KeyguardUpdateMonitor;
	import com.android.keyguard.KeyguardUpdateMonitorCallback;		import com.android.keyguard.KeyguardUpdateMonitorCallback;
			import com.android.keyguard.KeyguardVisibilityHelper;
	import com.android.systemui.dagger.qualifiers.Main;		import com.android.systemui.dagger.qualifiers.Main;
	import com.android.systemui.plugins.statusbar.StatusBarStateController;		import com.android.systemui.plugins.statusbar.StatusBarStateController;
			import com.android.systemui.statusbar.phone.DozeParameters;
			import com.android.systemui.statusbar.phone.UnlockedScreenOffAnimationController;
	import com.android.systemui.statusbar.policy.KeyguardStateController;		import com.android.systemui.statusbar.policy.KeyguardStateController;
	import com.android.systemui.util.ViewController;		import com.android.systemui.util.ViewController;

	@@ -70,6 +73,8 @@ public class CommunalHostViewController extends ViewController<CommunalHostView>
	private static final int SHOW_COMMUNAL_VIEW_INVALID_STATES =		private static final int SHOW_COMMUNAL_VIEW_INVALID_STATES =
	STATE_DOZING \| STATE_BOUNCER_SHOWING \| STATE_KEYGUARD_OCCLUDED;		STATE_DOZING \| STATE_BOUNCER_SHOWING \| STATE_KEYGUARD_OCCLUDED;

			private final KeyguardVisibilityHelper mKeyguardVisibilityHelper;

	private ViewController<? extends View> mCommunalViewController;		private ViewController<? extends View> mCommunalViewController;

	private KeyguardUpdateMonitorCallback mKeyguardUpdateCallback =		private KeyguardUpdateMonitorCallback mKeyguardUpdateCallback =
	@@ -123,6 +128,8 @@ public class CommunalHostViewController extends ViewController<CommunalHostView>
	CommunalStateController communalStateController,		CommunalStateController communalStateController,
	KeyguardUpdateMonitor keyguardUpdateMonitor,		KeyguardUpdateMonitor keyguardUpdateMonitor,
	KeyguardStateController keyguardStateController,		KeyguardStateController keyguardStateController,
			DozeParameters dozeParameters,
			UnlockedScreenOffAnimationController unlockedScreenOffAnimationController,
	StatusBarStateController statusBarStateController, CommunalHostView view) {		StatusBarStateController statusBarStateController, CommunalHostView view) {
	super(view);		super(view);
	mCommunalStateController = communalStateController;		mCommunalStateController = communalStateController;
	@@ -130,6 +137,21 @@ public class CommunalHostViewController extends ViewController<CommunalHostView>
	mMainExecutor = mainExecutor;		mMainExecutor = mainExecutor;
	mKeyguardStateController = keyguardStateController;		mKeyguardStateController = keyguardStateController;
	mStatusBarStateController = statusBarStateController;		mStatusBarStateController = statusBarStateController;
			mKeyguardVisibilityHelper = new KeyguardVisibilityHelper(mView, communalStateController,
			keyguardStateController, dozeParameters, unlockedScreenOffAnimationController,
			/* animateYPos= / false, / visibleOnCommunal= */ true);
			}

			/**
			* Set the visibility of the keyguard status view based on some new state.
			*/
			public void setKeyguardStatusViewVisibility(
			int statusBarState,
			boolean keyguardFadingAway,
			boolean goingToFullShade,
			int oldStatusBarState) {
			mKeyguardVisibilityHelper.setViewVisibility(
			statusBarState, keyguardFadingAway, goingToFullShade, oldStatusBarState);
	}		}

	@Override		@Override

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

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -4567,6 +4567,15 @@ public class NotificationPanelViewController extends PanelViewController {
	keyguardFadingAway,		keyguardFadingAway,
	goingToFullShade,		goingToFullShade,
	mBarState);		mBarState);

			if (mCommunalViewController != null) {
			mCommunalViewController.setKeyguardStatusViewVisibility(
			statusBarState,
			keyguardFadingAway,
			goingToFullShade,
			mBarState);
			}

	setKeyguardBottomAreaVisibility(statusBarState, goingToFullShade);		setKeyguardBottomAreaVisibility(statusBarState, goingToFullShade);

	mBarState = statusBarState;		mBarState = statusBarState;

packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardQsUserSwitchController.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -137,7 +137,8 @@ public class KeyguardQsUserSwitchController extends ViewController<UserAvatarVie
	mStatusBarStateController = statusBarStateController;		mStatusBarStateController = statusBarStateController;
	mKeyguardVisibilityHelper = new KeyguardVisibilityHelper(mView, communalStateController,		mKeyguardVisibilityHelper = new KeyguardVisibilityHelper(mView, communalStateController,
	keyguardStateController, dozeParameters,		keyguardStateController, dozeParameters,
	unlockedScreenOffAnimationController, /* animateYPos= */ false);		unlockedScreenOffAnimationController, /* animateYPos= */ false,
			/* visibleOnCommunal= */ false);
	mUserDetailAdapter = new KeyguardUserDetailAdapter(context, userDetailViewAdapterProvider);		mUserDetailAdapter = new KeyguardUserDetailAdapter(context, userDetailViewAdapterProvider);
	}		}