am fe7f9118: am 1340fcbf: Implement timings for go-to-full-shade transition. (eda837c5) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/values/dimens.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -395,4 +395,8 @@

		<!-- Margin on the left side of the battery % when on Keyguard. -->
		<dimen name="header_battery_margin_keyguard">6dp</dimen>

		<!-- Additional translation (downwards) for appearing notifications when going to the full shade
		from Keyguard. -->
		<dimen name="go_to_full_shade_appearing_translation">200dp</dimen>
		</resources>

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

+8 −9

Original line number	Diff line number	Diff line
		@@ -43,7 +43,6 @@ import android.view.animation.LinearInterpolator;
		import android.view.animation.PathInterpolator;

		import com.android.systemui.R;
		import com.android.systemui.statusbar.stack.StackStateAnimator;

		/**
		* Base class for both {@link ExpandableNotificationRow} and {@link NotificationOverflowContainer}
		@@ -449,19 +448,20 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView
		}

		@Override
		public void performRemoveAnimation(float translationDirection, Runnable onFinishedRunnable) {
		public void performRemoveAnimation(long duration, float translationDirection,
		Runnable onFinishedRunnable) {
		enableAppearDrawing(true);
		if (mDrawingAppearAnimation) {
		startAppearAnimation(false /* isAppearing */, translationDirection,
		0, onFinishedRunnable);
		0, duration, onFinishedRunnable);
		}
		}

		@Override
		public void performAddAnimation(long delay) {
		public void performAddAnimation(long delay, long duration) {
		enableAppearDrawing(true);
		if (mDrawingAppearAnimation) {
		startAppearAnimation(true /* isAppearing */, -1.0f, delay, null);
		startAppearAnimation(true /* isAppearing */, -1.0f, delay, duration, null);
		}
		}

		@@ -470,8 +470,8 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView
		mScrimView.setAlpha(scrimAmount);
		}

		private void startAppearAnimation(boolean isAppearing,
		float translationDirection, long delay, final Runnable onFinishedRunnable) {
		private void startAppearAnimation(boolean isAppearing, float translationDirection, long delay,
		long duration, final Runnable onFinishedRunnable) {
		if (mAppearAnimator != null) {
		mAppearAnimator.cancel();
		}
		@@ -501,8 +501,7 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView
		targetValue);
		mAppearAnimator.setInterpolator(mLinearInterpolator);
		mAppearAnimator.setDuration(
		(long) (StackStateAnimator.ANIMATION_DURATION_APPEAR_DISAPPEAR
		* Math.abs(mAppearAnimationFraction - targetValue)));
		(long) (duration * Math.abs(mAppearAnimationFraction - targetValue)));
		mAppearAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
		@Override
		public void onAnimationUpdate(ValueAnimator animation) {

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

+5 −2

Original line number	Diff line number	Diff line
		@@ -116,12 +116,15 @@ public class DismissView extends ExpandableView {
		}

		@Override
		public void performRemoveAnimation(float translationDirection, Runnable onFinishedRunnable) {
		public void performRemoveAnimation(long duration, float translationDirection,
		Runnable onFinishedRunnable) {
		// TODO: Use duration
		performVisibilityAnimation(false);
		}

		@Override
		public void performAddAnimation(long delay) {
		public void performAddAnimation(long delay, long duration) {
		// TODO: use delay and duration
		performVisibilityAnimation(true);
		}

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -220,6 +220,7 @@ public abstract class ExpandableView extends FrameLayout {
		/**
		* Perform a remove animation on this view.
		*
		* @param duration The duration of the remove animation.
		* @param translationDirection The direction value from [-1 ... 1] indicating in which the
		* animation should be performed. A value of -1 means that The
		* remove animation should be performed upwards,
		@@ -227,10 +228,10 @@ public abstract class ExpandableView extends FrameLayout {
		* Should mean the opposite.
		* @param onFinishedRunnable A runnable which should be run when the animation is finished.
		*/
		public abstract void performRemoveAnimation(float translationDirection,
		public abstract void performRemoveAnimation(long duration, float translationDirection,
		Runnable onFinishedRunnable);

		public abstract void performAddAnimation(long delay);
		public abstract void performAddAnimation(long delay, long duration);

		public abstract void setScrimAmount(float scrimAmount);

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

+5 −2

Original line number	Diff line number	Diff line
		@@ -113,12 +113,15 @@ public class SpeedBumpView extends ExpandableView {
		}

		@Override
		public void performRemoveAnimation(float translationDirection, Runnable onFinishedRunnable) {
		public void performRemoveAnimation(long duration, float translationDirection,
		Runnable onFinishedRunnable) {
		// TODO: Use duration
		performVisibilityAnimation(false);
		}

		@Override
		public void performAddAnimation(long delay) {
		public void performAddAnimation(long delay, long duration) {
		// TODO: Use delay and duration
		performVisibilityAnimation(true);
		}