am a396c6f4: am dc2a7210: Handle go to full shade motion for redacted case (fd8629d8) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/DragDownHelper.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -127,9 +127,7 @@ public class DragDownHelper implements Gefingerpoken {
		return true;
		case MotionEvent.ACTION_UP:
		if (mDraggedFarEnough && mDragDownCallback.onDraggedDown(mStartingChild)) {
		if (mStartingChild != null) {
		mCallback.setUserLockedChild(mStartingChild, false);
		} else {
		if (mStartingChild == null) {
		mDragDownCallback.setEmptyDragAmount(0f);
		}
		mDraggingDown = false;

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -47,7 +47,6 @@ public class KeyguardBouncer {
		private StatusBarWindowManager mWindowManager;
		private KeyguardViewBase mKeyguardView;
		private ViewGroup mRoot;
		private Interpolator mFadeOutInterpolator = new LinearInterpolator();
		private boolean mFadingOut;

		public KeyguardBouncer(Context context, ViewMediatorCallback callback,
		@@ -101,7 +100,7 @@ public class KeyguardBouncer {

		// Make it disappear faster, as the focus should be on the activity behind.
		.setDuration(duration / 2)
		.setInterpolator(mFadeOutInterpolator)
		.setInterpolator(PhoneStatusBar.ALPHA_OUT)
		.setStartDelay(delay)
		.withEndAction(new Runnable() {
		@Override
		@@ -109,7 +108,8 @@ public class KeyguardBouncer {
		mFadingOut = false;
		hide(true /* destroyView */);
		}
		});
		})
		.start();
		} else {
		hide(true /* destroyView */);
		}

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

+146 −11

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package com.android.systemui.statusbar.phone;
		import android.animation.Animator;
		import android.animation.AnimatorListenerAdapter;
		import android.animation.ObjectAnimator;
		import android.animation.PropertyValuesHolder;
		import android.animation.ValueAnimator;
		import android.content.Context;
		import android.content.res.Configuration;
		@@ -115,6 +116,7 @@ public class NotificationPanelView extends PanelView implements

		private Interpolator mFastOutSlowInInterpolator;
		private Interpolator mFastOutLinearInterpolator;
		private Interpolator mLinearOutSlowInInterpolator;
		private ObjectAnimator mClockAnimator;
		private int mClockAnimationTarget = -1;
		private int mTopPaddingAdjustment;
		@@ -140,6 +142,8 @@ public class NotificationPanelView extends PanelView implements
		private Runnable mLaunchAnimationEndRunnable;
		private boolean mOnlyAffordanceInThisMotion;
		private boolean mKeyguardStatusViewAnimating;
		private boolean mHeaderAnimatingIn;
		private ObjectAnimator mQsContainerAnimator;

		public NotificationPanelView(Context context, AttributeSet attrs) {
		super(context, attrs);
		@@ -172,6 +176,8 @@ public class NotificationPanelView extends PanelView implements
		android.R.interpolator.fast_out_slow_in);
		mFastOutLinearInterpolator = AnimationUtils.loadInterpolator(getContext(),
		android.R.interpolator.fast_out_linear_in);
		mLinearOutSlowInInterpolator = AnimationUtils.loadInterpolator(getContext(),
		android.R.interpolator.linear_out_slow_in);
		mKeyguardBottomArea = (KeyguardBottomAreaView) findViewById(R.id.keyguard_bottom_area);
		mAfforanceHelper = new KeyguardAffordanceHelper(this, getContext());
		}
		@@ -292,9 +298,9 @@ public class NotificationPanelView extends PanelView implements
		mKeyguardStatusView.setScaleY(scale);
		}

		public void animateToFullShade() {
		public void animateToFullShade(long delay) {
		mAnimateNextTopPaddingChange = true;
		mNotificationStackScroller.goToFullShade();
		mNotificationStackScroller.goToFullShade(delay);
		requestLayout();
		}

		@@ -673,19 +679,28 @@ public class NotificationPanelView extends PanelView implements
		}
		}

		public void setBarState(int statusBarState, boolean keyguardFadingAway) {
		public void setBarState(int statusBarState, boolean keyguardFadingAway,
		boolean goingToFullShade) {
		boolean keyguardShowing = statusBarState == StatusBarState.KEYGUARD
		\|\| statusBarState == StatusBarState.SHADE_LOCKED;
		mKeyguardStatusBar.setAlpha(1f);
		mKeyguardStatusBar.setVisibility(keyguardShowing ? View.VISIBLE : View.INVISIBLE);
		if (!mKeyguardShowing && keyguardShowing) {
		setQsTranslation(mQsExpansionHeight);
		mHeader.setTranslationY(0f);
		}
		setKeyguardStatusViewVisibility(statusBarState, keyguardFadingAway);
		setKeyguardStatusViewVisibility(statusBarState, keyguardFadingAway, goingToFullShade);
		setKeyguardBottomAreaVisibility(statusBarState, goingToFullShade);
		if (goingToFullShade) {
		animateKeyguardStatusBarOut();
		} else {
		mKeyguardStatusBar.setAlpha(1f);
		mKeyguardStatusBar.setVisibility(keyguardShowing ? View.VISIBLE : View.INVISIBLE);
		}
		mStatusBarState = statusBarState;
		mKeyguardShowing = keyguardShowing;
		updateQsState();
		if (goingToFullShade) {
		animateHeaderSlidingIn();
		}
		}

		private final Runnable mAnimateKeyguardStatusViewInvisibleEndRunnable = new Runnable() {
		@@ -703,16 +718,131 @@ public class NotificationPanelView extends PanelView implements
		}
		};

		private void setKeyguardStatusViewVisibility(int statusBarState, boolean keyguardFadingAway) {
		if (!keyguardFadingAway && mStatusBarState == StatusBarState.KEYGUARD
		&& statusBarState != StatusBarState.KEYGUARD) {
		private final Animator.AnimatorListener mAnimateHeaderSlidingInListener
		= new AnimatorListenerAdapter() {
		@Override
		public void onAnimationEnd(Animator animation) {
		mHeaderAnimatingIn = false;
		mQsContainerAnimator = null;
		mQsContainer.removeOnLayoutChangeListener(mQsContainerAnimatorUpdater);
		}
		};

		private final OnLayoutChangeListener mQsContainerAnimatorUpdater
		= new OnLayoutChangeListener() {
		@Override
		public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft,
		int oldTop, int oldRight, int oldBottom) {
		int oldHeight = oldBottom - oldTop;
		int height = bottom - top;
		if (height != oldHeight && mQsContainerAnimator != null) {
		PropertyValuesHolder[] values = mQsContainerAnimator.getValues();
		float newEndValue = mHeader.getCollapsedHeight() + mQsPeekHeight - height - top;
		float newStartValue = -height - top;
		values[0].setFloatValues(newStartValue, newEndValue);
		mQsContainerAnimator.setCurrentPlayTime(mQsContainerAnimator.getCurrentPlayTime());
		}
		}
		};

		private final ViewTreeObserver.OnPreDrawListener mStartHeaderSlidingIn
		= new ViewTreeObserver.OnPreDrawListener() {
		@Override
		public boolean onPreDraw() {
		getViewTreeObserver().removeOnPreDrawListener(this);
		mHeader.setTranslationY(-mHeader.getCollapsedHeight() - mQsPeekHeight);
		mHeader.animate()
		.translationY(0f)
		.setStartDelay(mStatusBar.calculateGoingToFullShadeDelay())
		.setDuration(StackStateAnimator.ANIMATION_DURATION_GO_TO_FULL_SHADE)
		.setInterpolator(mFastOutSlowInInterpolator)
		.start();
		mQsContainer.setY(-mQsContainer.getHeight());
		mQsContainerAnimator = ObjectAnimator.ofFloat(mQsContainer, View.TRANSLATION_Y,
		mQsContainer.getTranslationY(),
		mHeader.getCollapsedHeight() + mQsPeekHeight - mQsContainer.getHeight()
		- mQsContainer.getTop());
		mQsContainerAnimator.setStartDelay(mStatusBar.calculateGoingToFullShadeDelay());
		mQsContainerAnimator.setDuration(StackStateAnimator.ANIMATION_DURATION_GO_TO_FULL_SHADE);
		mQsContainerAnimator.setInterpolator(mFastOutSlowInInterpolator);
		mQsContainerAnimator.addListener(mAnimateHeaderSlidingInListener);
		mQsContainerAnimator.start();
		mQsContainer.addOnLayoutChangeListener(mQsContainerAnimatorUpdater);
		return true;
		}
		};

		private void animateHeaderSlidingIn() {
		mHeaderAnimatingIn = true;
		getViewTreeObserver().addOnPreDrawListener(mStartHeaderSlidingIn);

		}

		private final Runnable mAnimateKeyguardStatusBarInvisibleEndRunnable = new Runnable() {
		@Override
		public void run() {
		mKeyguardStatusBar.setVisibility(View.INVISIBLE);
		}
		};

		private void animateKeyguardStatusBarOut() {
		mKeyguardStatusBar.animate()
		.alpha(0f)
		.setStartDelay(mStatusBar.getKeyguardFadingAwayDelay())
		.setDuration(mStatusBar.getKeyguardFadingAwayDuration()/2)
		.setInterpolator(PhoneStatusBar.ALPHA_OUT)
		.withEndAction(mAnimateKeyguardStatusBarInvisibleEndRunnable)
		.start();
		}

		private final Runnable mAnimateKeyguardBottomAreaInvisibleEndRunnable = new Runnable() {
		@Override
		public void run() {
		mKeyguardBottomArea.setVisibility(View.GONE);
		}
		};

		private void setKeyguardBottomAreaVisibility(int statusBarState,
		boolean goingToFullShade) {
		if (goingToFullShade) {
		mKeyguardBottomArea.animate().cancel();
		mKeyguardBottomArea.animate()
		.alpha(0f)
		.setStartDelay(mStatusBar.getKeyguardFadingAwayDelay())
		.setDuration(mStatusBar.getKeyguardFadingAwayDuration()/2)
		.setInterpolator(PhoneStatusBar.ALPHA_OUT)
		.withEndAction(mAnimateKeyguardBottomAreaInvisibleEndRunnable)
		.start();
		} else if (statusBarState == StatusBarState.KEYGUARD
		\|\| statusBarState == StatusBarState.SHADE_LOCKED) {
		mKeyguardBottomArea.animate().cancel();
		mKeyguardBottomArea.setVisibility(View.VISIBLE);
		mKeyguardBottomArea.setAlpha(1f);
		} else {
		mKeyguardBottomArea.animate().cancel();
		mKeyguardBottomArea.setVisibility(View.GONE);
		mKeyguardBottomArea.setAlpha(1f);
		}
		}

		private void setKeyguardStatusViewVisibility(int statusBarState, boolean keyguardFadingAway,
		boolean goingToFullShade) {
		if ((!keyguardFadingAway && mStatusBarState == StatusBarState.KEYGUARD
		&& statusBarState != StatusBarState.KEYGUARD) \|\| goingToFullShade) {
		mKeyguardStatusView.animate().cancel();
		mKeyguardStatusViewAnimating = true;
		mKeyguardStatusView.animate()
		.alpha(0f)
		.setStartDelay(0)
		.setDuration(160)
		.setInterpolator(PhoneStatusBar.ALPHA_OUT)
		.withEndAction(mAnimateKeyguardStatusViewInvisibleEndRunnable);
		if (keyguardFadingAway) {
		mKeyguardStatusView.animate()
		.setStartDelay(mStatusBar.getKeyguardFadingAwayDelay())
		.setDuration(mStatusBar.getKeyguardFadingAwayDuration()/2)
		.start();
		}
		} else if (mStatusBarState == StatusBarState.SHADE_LOCKED
		&& statusBarState == StatusBarState.KEYGUARD) {
		mKeyguardStatusView.animate().cancel();
		@@ -721,6 +851,7 @@ public class NotificationPanelView extends PanelView implements
		mKeyguardStatusView.setAlpha(0f);
		mKeyguardStatusView.animate()
		.alpha(1f)
		.setStartDelay(0)
		.setDuration(320)
		.setInterpolator(PhoneStatusBar.ALPHA_IN)
		.withEndAction(mAnimateKeyguardStatusViewVisibleEndRunnable);
		@@ -791,7 +922,9 @@ public class NotificationPanelView extends PanelView implements
		}

		private void setQsTranslation(float height) {
		if (!mHeaderAnimatingIn) {
		mQsContainer.setY(height - mQsContainer.getHeight() + getHeaderTranslation());
		}
		if (mKeyguardShowing) {
		mHeader.setY(interpolate(getQsExpansionFraction(), -mHeader.getHeight(), 0));
		}
		@@ -1089,7 +1222,9 @@ public class NotificationPanelView extends PanelView implements
		}

		private void updateHeaderShade() {
		if (!mHeaderAnimatingIn) {
		mHeader.setTranslationY(getHeaderTranslation());
		}
		setQsTranslation(mQsExpansionHeight);
		}

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

+42 −12

Original line number	Diff line number	Diff line
		@@ -455,6 +455,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		private int mDrawCount;
		private Runnable mLaunchTransitionEndRunnable;
		private boolean mLaunchTransitionFadingAway;
		private ExpandableNotificationRow mDraggedDownRow;

		private static final int VISIBLE_LOCATIONS = ViewState.LOCATION_FIRST_CARD
		\| ViewState.LOCATION_TOP_STACK_PEEKING
		@@ -3290,9 +3291,14 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,

		public void showKeyguard() {
		setBarState(StatusBarState.KEYGUARD);
		updateKeyguardState();
		updateKeyguardState(false /* goingToFullShade */);
		instantExpandNotificationsPanel();
		mLeaveOpenOnKeyguardHide = false;
		if (mDraggedDownRow != null) {
		mDraggedDownRow.setUserLocked(false);
		mDraggedDownRow.notifyHeightChanged();
		mDraggedDownRow = null;
		}
		}

		public boolean isInLaunchTransition() {
		@@ -3341,15 +3347,28 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		}
		}

		public void hideKeyguard() {
		/**
		* @return true if we would like to stay in the shade, false if it should go away entirely
		*/
		public boolean hideKeyguard() {
		boolean staying = mLeaveOpenOnKeyguardHide;
		setBarState(StatusBarState.SHADE);
		if (mLeaveOpenOnKeyguardHide) {
		mLeaveOpenOnKeyguardHide = false;
		mNotificationPanel.animateToFullShade();
		mNotificationPanel.animateToFullShade(calculateGoingToFullShadeDelay());
		if (mDraggedDownRow != null) {
		mDraggedDownRow.setUserLocked(false);
		mDraggedDownRow = null;
		}
		} else {
		instantCollapseNotificationPanel();
		}
		updateKeyguardState();
		updateKeyguardState(staying);
		return staying;
		}

		public long calculateGoingToFullShadeDelay() {
		return mKeyguardFadingAwayDelay + mKeyguardFadingAwayDuration;
		}

		/**
		@@ -3380,7 +3399,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		&& mStatusBarKeyguardViewManager.isSecure());
		}

		private void updateKeyguardState() {
		private void updateKeyguardState(boolean goingToFullShade) {
		if (mState == StatusBarState.KEYGUARD) {
		mKeyguardIndicationController.setVisible(true);
		mNotificationPanel.resetViews();
		@@ -3390,13 +3409,11 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		mKeyguardUserSwitcher.setKeyguard(false);
		}
		if (mState == StatusBarState.KEYGUARD \|\| mState == StatusBarState.SHADE_LOCKED) {
		mKeyguardBottomArea.setVisibility(View.VISIBLE);
		mScrimController.setKeyguardShowing(true);
		} else {
		mKeyguardBottomArea.setVisibility(View.GONE);
		mScrimController.setKeyguardShowing(false);
		}
		mNotificationPanel.setBarState(mState, mKeyguardFadingAway);
		mNotificationPanel.setBarState(mState, mKeyguardFadingAway, goingToFullShade);
		updateDozingState();
		updateStackScrollerState();
		updatePublicMode();
		@@ -3609,17 +3626,22 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		* @param expandView The view to expand after going to the shade.
		*/
		public void goToLockedShade(View expandView) {
		ExpandableNotificationRow row = null;
		if (expandView instanceof ExpandableNotificationRow) {
		ExpandableNotificationRow row = (ExpandableNotificationRow) expandView;
		row = (ExpandableNotificationRow) expandView;
		row.setUserExpanded(true);
		}
		if (isLockscreenPublicMode() && !userAllowsPrivateNotificationsInPublic(mCurrentUserId)) {
		mLeaveOpenOnKeyguardHide = true;
		showBouncer();
		mDraggedDownRow = row;
		} else {
		mNotificationPanel.animateToFullShade();
		mNotificationPanel.animateToFullShade(0 /* delay */);
		setBarState(StatusBarState.SHADE_LOCKED);
		updateKeyguardState();
		updateKeyguardState(false /* goingToFullShade */);
		if (row != null) {
		row.setUserLocked(false);
		}
		}
		}

		@@ -3629,7 +3651,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		public void goToKeyguard() {
		if (mState == StatusBarState.SHADE_LOCKED) {
		setBarState(StatusBarState.KEYGUARD);
		updateKeyguardState();
		updateKeyguardState(false /* goingToFullShade */);
		}
		}

		@@ -3640,6 +3662,14 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		return mNotificationPanel;
		}

		public long getKeyguardFadingAwayDelay() {
		return mKeyguardFadingAwayDelay;
		}

		public long getKeyguardFadingAwayDuration() {
		return mKeyguardFadingAwayDuration;
		}

		public LinearLayout getSystemIcons() {
		return mSystemIcons;
		}

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -115,6 +115,13 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener {
		scheduleUpdate();
		}

		public void animateGoingToFullShade(long delay, long duration) {
		mDurationOverride = duration;
		mAnimationDelay = delay;
		mAnimateChange = true;
		scheduleUpdate();
		}

		public void setDozing(boolean dozing) {
		if (mDozing == dozing) return;
		mDozing = dozing;