am b1c204fe: Hint for phone and camera. (1b002210) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/values/dimens.xml

+8 −1

Original line number	Diff line number	Diff line
		@@ -322,6 +322,13 @@
		<!-- Distance between notifications and header when they are considered to be colliding. -->
		<dimen name="header_notifications_collide_distance">24dp</dimen>

		<!-- Move distance for the hint animations on the lockscreen (unlock, phone, camera)-->
		<!-- Move distance for the unlock hint animation on the lockscreen -->
		<dimen name="hint_move_distance">75dp</dimen>

		<!-- Move distance for the other hint animations on the lockscreen (phone, camera)-->
		<dimen name="hint_move_distance_sideways">60dp</dimen>

		<!-- The width of the region on the left/right edge of the screen for performing the camera/
		phone hints. -->
		<dimen name="edge_tap_area_width">48dp</dimen>
		</resources>

packages/SystemUI/res/values/strings.xml

+6 −0

Original line number	Diff line number	Diff line
		@@ -572,6 +572,12 @@
		<!-- Shows when people have pressed the unlock icon to explain how to unlock. [CHAR LIMIT=60] -->
		<string name="keyguard_unlock">Swipe up to unlock</string>

		<!-- Shows when people have clicked at the left edge of the screen to explain how to open the phone. In right-to-left languages, this is the opposite direction. [CHAR LIMIT=60] -->
		<string name="phone_hint">Swipe right for phone</string>

		<!-- Shows when people have clicked at the right edge of the screen to explain how to open the phone. In right-to-left languages, this is the opposite direction. [CHAR LIMIT=60] -->
		<string name="camera_hint">Swipe left for camera</string>

		<string name="bugreport_tile_extended" translatable="false">%s\n%s (%s)</string>

		<!-- Zen mode condition: no exit criteria. [CHAR LIMIT=NONE] -->

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ public class BounceInterpolator implements Interpolator {

		@Override
		public float getInterpolation(float t) {
		t *= 11f / 10f;
		if (t < 4f / 11f) {
		return SCALE_FACTOR * t * t;
		} else if (t < 8f / 11f) {
		@@ -36,8 +37,7 @@ public class BounceInterpolator implements Interpolator {
		float t2 = t - 9f / 11f;
		return SCALE_FACTOR * t2 * t2 + 15f / 16f;
		} else {
		float t2 = t - 21f / 22f;
		return SCALE_FACTOR * t2 * t2 + 63f / 64f;
		return 1;
		}
		}
		}

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

+94 −2

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ import android.view.ViewConfiguration;
		import android.view.ViewPropertyAnimator;
		import android.view.animation.AnimationUtils;
		import android.view.animation.Interpolator;

		import com.android.systemui.R;
		import com.android.systemui.statusbar.FlingAnimationUtils;

		@@ -40,6 +41,9 @@ public class KeyguardPageSwipeHelper {

		private static final float SWIPE_MAX_ICON_SCALE_AMOUNT = 2.0f;
		private static final float SWIPE_RESTING_ALPHA_AMOUNT = 0.7f;
		private static final long HINT_PHASE1_DURATION = 250;
		private static final long HINT_PHASE2_DURATION = 450;

		private final Context mContext;

		private FlingAnimationUtils mFlingAnimationUtils;
		@@ -54,11 +58,13 @@ public class KeyguardPageSwipeHelper {
		private int mTouchSlop;
		private int mMinTranslationAmount;
		private int mMinFlingVelocity;
		private int mHintDistance;
		private PowerManager mPowerManager;
		private final View mLeftIcon;
		private final View mCenterIcon;
		private final View mRightIcon;
		private Interpolator mFastOutSlowIn;
		private Interpolator mBounceInterpolator;
		private Animator mSwipeAnimator;
		private boolean mCallbackCalled;

		@@ -81,9 +87,12 @@ public class KeyguardPageSwipeHelper {
		mMinFlingVelocity = configuration.getScaledMinimumFlingVelocity();
		mMinTranslationAmount = mContext.getResources().getDimensionPixelSize(
		R.dimen.keyguard_min_swipe_amount);
		mHintDistance =
		mContext.getResources().getDimensionPixelSize(R.dimen.hint_move_distance_sideways);
		mFlingAnimationUtils = new FlingAnimationUtils(mContext, 0.4f);
		mFastOutSlowIn = AnimationUtils.loadInterpolator(mContext,
		android.R.interpolator.fast_out_slow_in);
		mBounceInterpolator = new BounceInterpolator();
		}

		public boolean onTouchEvent(MotionEvent event) {
		@@ -168,6 +177,83 @@ public class KeyguardPageSwipeHelper {
		return false;
		}

		public void startHintAnimation(boolean right, Runnable onFinishedListener) {
		startHintAnimationPhase1(right, onFinishedListener);
		}

		/**
		* Phase 1: Move everything sidewards.
		*/
		private void startHintAnimationPhase1(boolean right, final Runnable onFinishedListener) {
		float target = right ? -mHintDistance : mHintDistance;
		startHintTranslationAnimations(target, HINT_PHASE1_DURATION, mFastOutSlowIn);
		ValueAnimator animator = ValueAnimator.ofFloat(mTranslation, target);
		animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
		@Override
		public void onAnimationUpdate(ValueAnimator animation) {
		mTranslation = (float) animation.getAnimatedValue();
		}
		});
		animator.addListener(new AnimatorListenerAdapter() {
		private boolean mCancelled;

		@Override
		public void onAnimationCancel(Animator animation) {
		mCancelled = true;
		}

		@Override
		public void onAnimationEnd(Animator animation) {
		if (mCancelled) {
		mSwipeAnimator = null;
		onFinishedListener.run();
		} else {
		startUnlockHintAnimationPhase2(onFinishedListener);
		}
		}
		});
		animator.setInterpolator(mFastOutSlowIn);
		animator.setDuration(HINT_PHASE1_DURATION);
		animator.start();
		mSwipeAnimator = animator;
		}

		/**
		* Phase 2: Move back.
		*/
		private void startUnlockHintAnimationPhase2(final Runnable onFinishedListener) {
		startHintTranslationAnimations(0f /* target */, HINT_PHASE2_DURATION, mBounceInterpolator);
		ValueAnimator animator = ValueAnimator.ofFloat(mTranslation, 0f);
		animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
		@Override
		public void onAnimationUpdate(ValueAnimator animation) {
		mTranslation = (float) animation.getAnimatedValue();
		}
		});
		animator.addListener(new AnimatorListenerAdapter() {
		@Override
		public void onAnimationEnd(Animator animation) {
		mSwipeAnimator = null;
		onFinishedListener.run();
		}
		});
		animator.setInterpolator(mBounceInterpolator);
		animator.setDuration(HINT_PHASE2_DURATION);
		animator.start();
		mSwipeAnimator = animator;
		}

		private void startHintTranslationAnimations(float target, long duration,
		Interpolator interpolator) {
		ArrayList<View> targetViews = mCallback.getTranslationViews();
		for (View targetView : targetViews) {
		targetView.animate()
		.setDuration(duration)
		.setInterpolator(interpolator)
		.translationX(target);
		}
		}

		private void onUserActivity(long when) {
		mPowerManager.userActivity(when, false);
		}
		@@ -180,7 +266,6 @@ public class KeyguardPageSwipeHelper {
		View targetView = mTranslation > 0 ? mLeftIcon : mRightIcon;
		targetView.animate().cancel();
		if (mSwipeAnimator != null) {
		mSwipeAnimator.removeAllListeners();
		mSwipeAnimator.cancel();
		hideInactiveIcons(true);
		}
		@@ -218,11 +303,18 @@ public class KeyguardPageSwipeHelper {
		}
		});
		animator.addListener(new AnimatorListenerAdapter() {
		private boolean mCancelled;

		@Override
		public void onAnimationCancel(Animator animation) {
		mCancelled = true;
		}

		@Override
		public void onAnimationEnd(Animator animation) {
		mSwipeAnimator = null;
		mSwipingInProgress = false;
		if (!snapBack && !mCallbackCalled) {
		if (!snapBack && !mCallbackCalled && !mCancelled) {

		// ensure that the callback is called eventually
		mCallback.onAnimationToSideStarted(mTranslation < 0);

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

+35 −8

Original line number	Diff line number	Diff line
		@@ -422,7 +422,9 @@ public class NotificationPanelView extends PanelView implements
		}
		// TODO: Handle doublefinger swipe to notifications again. Look at history for a reference
		// implementation.
		if (!mIsExpanding && !mQsExpanded && mStatusBar.getBarState() != StatusBarState.SHADE) {
		if ((!mIsExpanding \|\| mHintAnimationRunning)
		&& !mQsExpanded
		&& mStatusBar.getBarState() != StatusBarState.SHADE) {
		mPageSwiper.onTouchEvent(event);
		if (mPageSwiper.isSwipingInProgress()) {
		return true;
		@@ -796,8 +798,7 @@ public class NotificationPanelView extends PanelView implements
		protected void onTrackingStopped(boolean expand) {
		super.onTrackingStopped(expand);
		mOverExpansion = 0.0f;
		mNotificationStackScroller.setOverScrolledPixels(0.0f, true /* onTop */,
		true /* animate */);
		mNotificationStackScroller.setOverScrolledPixels(0.0f, true /* onTop /, true / animate */);
		if (expand && (mStatusBar.getBarState() == StatusBarState.KEYGUARD
		\|\| mStatusBar.getBarState() == StatusBarState.SHADE_LOCKED)) {
		mPageSwiper.showAllIcons(true);
		@@ -837,14 +838,36 @@ public class NotificationPanelView extends PanelView implements

		@Override
		public void onAnimationToSideStarted(boolean rightPage) {
		if (rightPage) {
		mKeyguardBottomArea.launchCamera();
		} else {
		boolean start = getLayoutDirection() == LAYOUT_DIRECTION_RTL ? rightPage : !rightPage;
		if (start) {
		mKeyguardBottomArea.launchPhone();
		} else {
		mKeyguardBottomArea.launchCamera();
		}
		mBlockTouches = true;
		}

		@Override
		protected void onEdgeClicked(boolean right) {
		if ((right && getRightIcon().getVisibility() != View.VISIBLE)
		\|\| (!right && getLeftIcon().getVisibility() != View.VISIBLE)) {
		return;
		}
		mHintAnimationRunning = true;
		mPageSwiper.startHintAnimation(right, new Runnable() {
		@Override
		public void run() {
		mHintAnimationRunning = false;
		mStatusBar.onHintFinished();
		}
		});
		boolean start = getLayoutDirection() == LAYOUT_DIRECTION_RTL ? right : !right;
		if (start) {
		mStatusBar.onPhoneHintStarted();
		} else {
		mStatusBar.onCameraHintStarted();
		}
		}

		@Override
		public float getPageWidth() {
		@@ -858,7 +881,9 @@ public class NotificationPanelView extends PanelView implements

		@Override
		public View getLeftIcon() {
		return mKeyguardBottomArea.getPhoneImageView();
		return getLayoutDirection() == LAYOUT_DIRECTION_RTL
		? mKeyguardBottomArea.getCameraImageView()
		: mKeyguardBottomArea.getPhoneImageView();
		}

		@Override
		@@ -868,6 +893,8 @@ public class NotificationPanelView extends PanelView implements

		@Override
		public View getRightIcon() {
		return mKeyguardBottomArea.getCameraImageView();
		return getLayoutDirection() == LAYOUT_DIRECTION_RTL
		? mKeyguardBottomArea.getPhoneImageView()
		: mKeyguardBottomArea.getCameraImageView();
		}
		}