Merge "AmbientIndication: Add tap again hint" into oc-dr1-dev (4317e457) · Commits · e / os / android_frameworks_base

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

+10 −2

Original line number	Original line	Diff line number	Diff line
	@@ -4651,6 +4651,11 @@ public class StatusBar extends SystemUI implements DemoMode,

	@Override		@Override
	public void onActivated(ActivatableNotificationView view) {		public void onActivated(ActivatableNotificationView view) {
			onActivated((View)view);
			mStackScroller.setActivatedChild(view);
			}

			public void onActivated(View view) {
	mLockscreenGestureLogger.write(		mLockscreenGestureLogger.write(
	MetricsEvent.ACTION_LS_NOTE,		MetricsEvent.ACTION_LS_NOTE,
	0 /* lengthDp - N/A /, 0 / velocityDp - N/A */);		0 /* lengthDp - N/A /, 0 / velocityDp - N/A */);
	@@ -4659,7 +4664,6 @@ public class StatusBar extends SystemUI implements DemoMode,
	if (previousView != null) {		if (previousView != null) {
	previousView.makeInactive(true /* animate */);		previousView.makeInactive(true /* animate */);
	}		}
	mStackScroller.setActivatedChild(view);
	}		}

	/**		/**
	@@ -4693,9 +4697,13 @@ public class StatusBar extends SystemUI implements DemoMode,
	@Override		@Override
	public void onActivationReset(ActivatableNotificationView view) {		public void onActivationReset(ActivatableNotificationView view) {
	if (view == mStackScroller.getActivatedChild()) {		if (view == mStackScroller.getActivatedChild()) {
	mKeyguardIndicationController.hideTransientIndication();
	mStackScroller.setActivatedChild(null);		mStackScroller.setActivatedChild(null);
			onActivationReset((View)view);
			}
	}		}

			public void onActivationReset(View view) {
			mKeyguardIndicationController.hideTransientIndication();
	}		}

	public void onTrackingStarted() {		public void onTrackingStarted() {