Merge "Update notification FSI logic for when device is considered dreaming"... (00afaefd) · Commits · e / os / android_frameworks_base

packages/SystemUI/plugin/src/com/android/systemui/plugins/statusbar/StatusBarStateController.java

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -49,6 +49,13 @@ public interface StatusBarStateController {
	*/		*/
	boolean isPulsing();		boolean isPulsing();

			/**
			* Is device dreaming. This method is more inclusive than
			* {@link android.service.dreams.IDreamManager.isDreaming}, as it will return true during the
			* dream's wake-up phase.
			*/
			boolean isDreaming();

	/**		/**
	* Adds a state listener		* Adds a state listener
	*/		*/

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

+8 −1

Original line number	Original line	Diff line number	Diff line
	@@ -57,6 +57,7 @@ import com.android.systemui.plugins.statusbar.StatusBarStateController.StateList
	import com.android.systemui.shade.ShadeExpansionStateManager;		import com.android.systemui.shade.ShadeExpansionStateManager;
	import com.android.systemui.statusbar.notification.stack.StackStateAnimator;		import com.android.systemui.statusbar.notification.stack.StackStateAnimator;
	import com.android.systemui.statusbar.policy.CallbackController;		import com.android.systemui.statusbar.policy.CallbackController;
			import com.android.systemui.util.Compile;

	import java.io.PrintWriter;		import java.io.PrintWriter;
	import java.util.ArrayList;		import java.util.ArrayList;
	@@ -300,7 +301,7 @@ public class StatusBarStateControllerImpl implements

	@Override		@Override
	public boolean setIsDreaming(boolean isDreaming) {		public boolean setIsDreaming(boolean isDreaming) {
	if (Log.isLoggable(TAG, Log.DEBUG)) {		if (Log.isLoggable(TAG, Log.DEBUG) \|\| Compile.IS_DEBUG) {
	Log.d(TAG, "setIsDreaming:" + isDreaming);		Log.d(TAG, "setIsDreaming:" + isDreaming);
	}		}
	if (mIsDreaming == isDreaming) {		if (mIsDreaming == isDreaming) {
	@@ -321,6 +322,11 @@ public class StatusBarStateControllerImpl implements
	return true;		return true;
	}		}

			@Override
			public boolean isDreaming() {
			return mIsDreaming;
			}

	@Override		@Override
	public void setAndInstrumentDozeAmount(View view, float dozeAmount, boolean animated) {		public void setAndInstrumentDozeAmount(View view, float dozeAmount, boolean animated) {
	if (mDarkAnimator != null && mDarkAnimator.isRunning()) {		if (mDarkAnimator != null && mDarkAnimator.isRunning()) {
	@@ -581,6 +587,7 @@ public class StatusBarStateControllerImpl implements
	pw.println(" mLeaveOpenOnKeyguardHide=" + mLeaveOpenOnKeyguardHide);		pw.println(" mLeaveOpenOnKeyguardHide=" + mLeaveOpenOnKeyguardHide);
	pw.println(" mKeyguardRequested=" + mKeyguardRequested);		pw.println(" mKeyguardRequested=" + mKeyguardRequested);
	pw.println(" mIsDozing=" + mIsDozing);		pw.println(" mIsDozing=" + mIsDozing);
			pw.println(" mIsDreaming=" + mIsDreaming);
	pw.println(" mListeners{" + mListeners.size() + "}=");		pw.println(" mListeners{" + mListeners.size() + "}=");
	for (RankedListener rl : mListeners) {		for (RankedListener rl : mListeners) {
	pw.println(" " + rl.mListener);		pw.println(" " + rl.mListener);

packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderImpl.java

+4 −18

Original line number	Original line	Diff line number	Diff line
	@@ -28,11 +28,8 @@ import android.database.ContentObserver;
	import android.hardware.display.AmbientDisplayConfiguration;		import android.hardware.display.AmbientDisplayConfiguration;
	import android.os.Handler;		import android.os.Handler;
	import android.os.PowerManager;		import android.os.PowerManager;
	import android.os.RemoteException;
	import android.provider.Settings;		import android.provider.Settings;
	import android.service.dreams.IDreamManager;
	import android.service.notification.StatusBarNotification;		import android.service.notification.StatusBarNotification;
	import android.util.Log;

	import com.android.internal.annotations.VisibleForTesting;		import com.android.internal.annotations.VisibleForTesting;
	import com.android.internal.logging.UiEvent;		import com.android.internal.logging.UiEvent;
	@@ -67,7 +64,6 @@ public class NotificationInterruptStateProviderImpl implements NotificationInter
	private final KeyguardStateController mKeyguardStateController;		private final KeyguardStateController mKeyguardStateController;
	private final ContentResolver mContentResolver;		private final ContentResolver mContentResolver;
	private final PowerManager mPowerManager;		private final PowerManager mPowerManager;
	private final IDreamManager mDreamManager;
	private final AmbientDisplayConfiguration mAmbientDisplayConfiguration;		private final AmbientDisplayConfiguration mAmbientDisplayConfiguration;
	private final BatteryController mBatteryController;		private final BatteryController mBatteryController;
	private final HeadsUpManager mHeadsUpManager;		private final HeadsUpManager mHeadsUpManager;
	@@ -109,7 +105,6 @@ public class NotificationInterruptStateProviderImpl implements NotificationInter
	public NotificationInterruptStateProviderImpl(		public NotificationInterruptStateProviderImpl(
	ContentResolver contentResolver,		ContentResolver contentResolver,
	PowerManager powerManager,		PowerManager powerManager,
	IDreamManager dreamManager,
	AmbientDisplayConfiguration ambientDisplayConfiguration,		AmbientDisplayConfiguration ambientDisplayConfiguration,
	BatteryController batteryController,		BatteryController batteryController,
	StatusBarStateController statusBarStateController,		StatusBarStateController statusBarStateController,
	@@ -123,7 +118,6 @@ public class NotificationInterruptStateProviderImpl implements NotificationInter
	UserTracker userTracker) {		UserTracker userTracker) {
	mContentResolver = contentResolver;		mContentResolver = contentResolver;
	mPowerManager = powerManager;		mPowerManager = powerManager;
	mDreamManager = dreamManager;
	mBatteryController = batteryController;		mBatteryController = batteryController;
	mAmbientDisplayConfiguration = ambientDisplayConfiguration;		mAmbientDisplayConfiguration = ambientDisplayConfiguration;
	mStatusBarStateController = statusBarStateController;		mStatusBarStateController = statusBarStateController;
	@@ -283,7 +277,9 @@ public class NotificationInterruptStateProviderImpl implements NotificationInter
	}		}

	// If the device is currently dreaming, then launch the FullScreenIntent		// If the device is currently dreaming, then launch the FullScreenIntent
	if (isDreaming()) {		// We avoid using IDreamManager#isDreaming here as that method will return false during
			// the dream's wake-up phase.
			if (mStatusBarStateController.isDreaming()) {
	return getDecisionGivenSuppression(FullScreenIntentDecision.FSI_DEVICE_IS_DREAMING,		return getDecisionGivenSuppression(FullScreenIntentDecision.FSI_DEVICE_IS_DREAMING,
	suppressedByDND);		suppressedByDND);
	}		}
	@@ -383,16 +379,6 @@ public class NotificationInterruptStateProviderImpl implements NotificationInter
	mLogger.logFullscreen(entry, "Expected not to HUN");		mLogger.logFullscreen(entry, "Expected not to HUN");
	}		}
	}		}

	private boolean isDreaming() {
	try {
	return mDreamManager.isDreaming();
	} catch (RemoteException e) {
	Log.e(TAG, "Failed to query dream manager.", e);
	return false;
	}
	}

	private boolean shouldHeadsUpWhenAwake(NotificationEntry entry, boolean log) {		private boolean shouldHeadsUpWhenAwake(NotificationEntry entry, boolean log) {
	StatusBarNotification sbn = entry.getSbn();		StatusBarNotification sbn = entry.getSbn();

	@@ -442,7 +428,7 @@ public class NotificationInterruptStateProviderImpl implements NotificationInter
	return false;		return false;
	}		}

	boolean inUse = mPowerManager.isScreenOn() && !isDreaming();		boolean inUse = mPowerManager.isScreenOn() && !mStatusBarStateController.isDreaming();

	if (!inUse) {		if (!inUse) {
	if (log) mLogger.logNoHeadsUpNotInUse(entry);		if (log) mLogger.logNoHeadsUpNotInUse(entry);

packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarStateControllerImplTest.kt

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -167,4 +167,13 @@ class StatusBarStateControllerImplTest : SysuiTestCase() {
	controller.setIsDreaming(false)		controller.setIsDreaming(false)
	verify(listener).onDreamingChanged(false)		verify(listener).onDreamingChanged(false)
	}		}

			@Test
			fun testSetDreamState_getterReturnsCurrentState() {
			controller.setIsDreaming(true)
			assertTrue(controller.isDreaming())

			controller.setIsDreaming(false)
			assertFalse(controller.isDreaming())
			}
	}		}

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderImplTest.java

+18 −22

Original line number	Original line	Diff line number	Diff line
	@@ -51,7 +51,6 @@ import android.hardware.display.AmbientDisplayConfiguration;
	import android.os.Handler;		import android.os.Handler;
	import android.os.PowerManager;		import android.os.PowerManager;
	import android.os.RemoteException;		import android.os.RemoteException;
	import android.service.dreams.IDreamManager;
	import android.testing.AndroidTestingRunner;		import android.testing.AndroidTestingRunner;

	import androidx.test.filters.SmallTest;		import androidx.test.filters.SmallTest;
	@@ -87,8 +86,6 @@ public class NotificationInterruptStateProviderImplTest extends SysuiTestCase {
	@Mock		@Mock
	PowerManager mPowerManager;		PowerManager mPowerManager;
	@Mock		@Mock
	IDreamManager mDreamManager;
	@Mock
	AmbientDisplayConfiguration mAmbientDisplayConfiguration;		AmbientDisplayConfiguration mAmbientDisplayConfiguration;
	@Mock		@Mock
	StatusBarStateController mStatusBarStateController;		StatusBarStateController mStatusBarStateController;
	@@ -126,7 +123,6 @@ public class NotificationInterruptStateProviderImplTest extends SysuiTestCase {
	new NotificationInterruptStateProviderImpl(		new NotificationInterruptStateProviderImpl(
	mContext.getContentResolver(),		mContext.getContentResolver(),
	mPowerManager,		mPowerManager,
	mDreamManager,
	mAmbientDisplayConfiguration,		mAmbientDisplayConfiguration,
	mBatteryController,		mBatteryController,
	mStatusBarStateController,		mStatusBarStateController,
	@@ -150,7 +146,7 @@ public class NotificationInterruptStateProviderImplTest extends SysuiTestCase {
	when(mHeadsUpManager.isSnoozed(any())).thenReturn(false);		when(mHeadsUpManager.isSnoozed(any())).thenReturn(false);

	when(mStatusBarStateController.isDozing()).thenReturn(false);		when(mStatusBarStateController.isDozing()).thenReturn(false);
	when(mDreamManager.isDreaming()).thenReturn(false);		when(mStatusBarStateController.isDreaming()).thenReturn(false);
	when(mPowerManager.isScreenOn()).thenReturn(true);		when(mPowerManager.isScreenOn()).thenReturn(true);
	}		}

	@@ -352,7 +348,7 @@ public class NotificationInterruptStateProviderImplTest extends SysuiTestCase {

	// Also not in use if screen is on but we're showing screen saver / "dreaming"		// Also not in use if screen is on but we're showing screen saver / "dreaming"
	when(mPowerManager.isDeviceIdleMode()).thenReturn(true);		when(mPowerManager.isDeviceIdleMode()).thenReturn(true);
	when(mDreamManager.isDreaming()).thenReturn(true);		when(mStatusBarStateController.isDreaming()).thenReturn(true);
	assertThat(mNotifInterruptionStateProvider.shouldHeadsUp(entry)).isFalse();		assertThat(mNotifInterruptionStateProvider.shouldHeadsUp(entry)).isFalse();
	}		}