am c74a43bb: am 4fb3e9b3: am 50ff3afb: Start pulse fading exactly when screen is turned on (05b9dc9f) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/values/config.xml

+0 −6

Original line number	Diff line number	Diff line
		@@ -260,12 +260,6 @@
		<!-- Doze: pulse parameter - how long does it take to fade in after a pickup? -->
		<integer name="doze_pulse_duration_in_pickup">300</integer>

		<!-- Doze: pulse parameter - delay to wait for the screen to wake up -->
		<integer name="doze_pulse_delay_in">200</integer>

		<!-- Doze: pulse parameter - delay to wait for the screen to wake up after a pickup -->
		<integer name="doze_pulse_delay_in_pickup">200</integer>

		<!-- Doze: pulse parameter - once faded in, how long does it stay visible? -->
		<integer name="doze_pulse_duration_visible">3000</integer>

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

+2 −8

Original line number	Diff line number	Diff line
		@@ -167,13 +167,7 @@ public abstract class BaseStatusBar extends SystemUI implements
		// on-screen navigation buttons
		protected NavigationBarView mNavigationBarView = null;

		protected Boolean mScreenOn;

		// The second field is a bit different from the first one because it only listens to screen on/
		// screen of events from Keyguard. We need this so we don't have a race condition with the
		// broadcast. In the future, we should remove the first field altogether and rename the second
		// field.
		protected boolean mScreenOnFromKeyguard;
		protected boolean mDeviceInteractive;

		protected boolean mVisible;

		@@ -1619,7 +1613,7 @@ public abstract class BaseStatusBar extends SystemUI implements

		protected void updateVisibleToUser() {
		boolean oldVisibleToUser = mVisibleToUser;
		mVisibleToUser = mVisible && mScreenOnFromKeyguard;
		mVisibleToUser = mVisible && mDeviceInteractive;

		if (oldVisibleToUser != mVisibleToUser) {
		handleVisibleToUserChanged(mVisibleToUser);

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

+0 −8

Original line number	Diff line number	Diff line
		@@ -50,8 +50,6 @@ public class DozeParameters {
		pw.print(" getPulseDuration(pickup=true): "); pw.println(getPulseDuration(true));
		pw.print(" getPulseInDuration(pickup=false): "); pw.println(getPulseInDuration(false));
		pw.print(" getPulseInDuration(pickup=true): "); pw.println(getPulseInDuration(true));
		pw.print(" getPulseInDelay(pickup=false): "); pw.println(getPulseInDelay(false));
		pw.print(" getPulseInDelay(pickup=true): "); pw.println(getPulseInDelay(true));
		pw.print(" getPulseInVisibleDuration(): "); pw.println(getPulseVisibleDuration());
		pw.print(" getPulseOutDuration(): "); pw.println(getPulseOutDuration());
		pw.print(" getPulseOnSigMotion(): "); pw.println(getPulseOnSigMotion());
		@@ -80,12 +78,6 @@ public class DozeParameters {
		: getInt("doze.pulse.duration.in", R.integer.doze_pulse_duration_in);
		}

		public int getPulseInDelay(boolean pickup) {
		return pickup
		? getInt("doze.pulse.delay.in.pickup", R.integer.doze_pulse_delay_in_pickup)
		: getInt("doze.pulse.delay.in", R.integer.doze_pulse_delay_in);
		}

		public int getPulseVisibleDuration() {
		return getInt("doze.pulse.duration.visible", R.integer.doze_pulse_duration_visible);
		}

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

+13 −11

Original line number	Diff line number	Diff line
		@@ -100,6 +100,16 @@ public class DozeScrimController {
		mHandler.post(mPulseIn);
		}

		public void onScreenTurnedOn() {
		if (isPulsing()) {
		final boolean pickup = mPulseReason == DozeLog.PULSE_REASON_SENSOR_PICKUP;
		startScrimAnimation(true /* inFront */, 0f,
		mDozeParameters.getPulseInDuration(pickup),
		pickup ? mPulseInInterpolatorPickup : mPulseInInterpolator,
		mPulseInFinished);
		}
		}

		public boolean isPulsing() {
		return mPulseCallback != null;
		}
		@@ -138,12 +148,11 @@ public class DozeScrimController {

		private void startScrimAnimation(final boolean inFront, float target, long duration,
		Interpolator interpolator) {
		startScrimAnimation(inFront, target, duration, interpolator, 0 /* delay */,
		null /* endRunnable */);
		startScrimAnimation(inFront, target, duration, interpolator, null /* endRunnable */);
		}

		private void startScrimAnimation(final boolean inFront, float target, long duration,
		Interpolator interpolator, long delay, final Runnable endRunnable) {
		Interpolator interpolator, final Runnable endRunnable) {
		Animator current = getCurrentAnimator(inFront);
		if (current != null) {
		float currentTarget = getCurrentTarget(inFront);
		@@ -162,7 +171,6 @@ public class DozeScrimController {
		});
		anim.setInterpolator(interpolator);
		anim.setDuration(duration);
		anim.setStartDelay(delay);
		anim.addListener(new AnimatorListenerAdapter() {
		@Override
		public void onAnimationEnd(Animator animation) {
		@@ -222,12 +230,6 @@ public class DozeScrimController {
		+ DozeLog.pulseReasonToString(mPulseReason));
		if (!mDozing) return;
		DozeLog.tracePulseStart(mPulseReason);
		final boolean pickup = mPulseReason == DozeLog.PULSE_REASON_SENSOR_PICKUP;
		startScrimAnimation(true /* inFront */, 0f,
		mDozeParameters.getPulseInDuration(pickup),
		pickup ? mPulseInInterpolatorPickup : mPulseInInterpolator,
		mDozeParameters.getPulseInDelay(pickup),
		mPulseInFinished);

		// Signal that the pulse is ready to turn the screen on and draw.
		pulseStarted();
		@@ -249,7 +251,7 @@ public class DozeScrimController {
		if (DEBUG) Log.d(TAG, "Pulse out, mDozing=" + mDozing);
		if (!mDozing) return;
		startScrimAnimation(true /* inFront */, 1f, mDozeParameters.getPulseOutDuration(),
		mPulseOutInterpolator, 0 /* delay */, mPulseOutFinished);
		mPulseOutInterpolator, mPulseOutFinished);
		}
		};

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -918,7 +918,7 @@ public class NotificationPanelView extends PanelView implements
		}

		private int getFalsingThreshold() {
		float factor = mStatusBar.isScreenOnComingFromTouch() ? 1.5f : 1.0f;
		float factor = mStatusBar.isWakeUpComingFromTouch() ? 1.5f : 1.0f;
		return (int) (mQsFalsingThreshold * factor);
		}

		@@ -2075,7 +2075,7 @@ public class NotificationPanelView extends PanelView implements

		@Override
		public float getAffordanceFalsingFactor() {
		return mStatusBar.isScreenOnComingFromTouch() ? 1.5f : 1.0f;
		return mStatusBar.isWakeUpComingFromTouch() ? 1.5f : 1.0f;
		}

		@Override