Merge "Clean up RECEIVE_UNFOLD_EVENTS_FROM_SYSUI flag" into udc-qpr-dev (83e6680e) · Commits · e / os / android_frameworks_base

packages/SystemUI/shared/src/com/android/systemui/shared/recents/IOverviewProxy.aidl

+0 −15

Original line number	Diff line number	Diff line
		@@ -75,26 +75,11 @@ oneway interface IOverviewProxy {
		*/
		void onSystemBarAttributesChanged(int displayId, int behavior) = 20;

		/**
		* Sent when screen turned on and ready to use (blocker scrim is hidden)
		*/
		void onScreenTurnedOn() = 21;

		/**
		* Sent when the desired dark intensity of the nav buttons has changed
		*/
		void onNavButtonsDarkIntensityChanged(float darkIntensity) = 22;

		/**
		* Sent when screen started turning on.
		*/
		void onScreenTurningOn() = 23;

		/**
		* Sent when screen started turning off.
		*/
		void onScreenTurningOff() = 24;

		/**
		* Sent when split keyboard shortcut is triggered to enter stage split.
		*/

packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java

+0 −57

Original line number	Diff line number	Diff line
		@@ -87,7 +87,6 @@ import com.android.systemui.dump.DumpManager;
		import com.android.systemui.flags.FeatureFlags;
		import com.android.systemui.flags.Flags;
		import com.android.systemui.keyguard.KeyguardUnlockAnimationController;
		import com.android.systemui.keyguard.ScreenLifecycle;
		import com.android.systemui.keyguard.WakefulnessLifecycle;
		import com.android.systemui.model.SysUiState;
		import com.android.systemui.navigationbar.NavigationBar;
		@@ -571,7 +570,6 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis
		SysUiState sysUiState,
		Provider<SceneInteractor> sceneInteractor,
		UserTracker userTracker,
		ScreenLifecycle screenLifecycle,
		WakefulnessLifecycle wakefulnessLifecycle,
		UiEventLogger uiEventLogger,
		DisplayTracker displayTracker,
		@@ -651,7 +649,6 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis
		// Listen for user setup
		mUserTracker.addCallback(mUserChangedCallback, mMainExecutor);

		screenLifecycle.addObserver(mScreenLifecycleObserver);
		wakefulnessLifecycle.addObserver(mWakefulnessLifecycleObserver);
		// Connect to the service
		updateEnabledAndBinding();
		@@ -923,60 +920,6 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis
		}
		}

		private final ScreenLifecycle.Observer mScreenLifecycleObserver =
		new ScreenLifecycle.Observer() {
		/**
		* Notifies the Launcher that screen turned on and ready to use
		*/
		@Override
		public void onScreenTurnedOn() {
		try {
		if (mOverviewProxy != null) {
		mOverviewProxy.onScreenTurnedOn();
		} else {
		Log.e(TAG_OPS,
		"Failed to get overview proxy for screen turned on event.");
		}
		} catch (RemoteException e) {
		Log.e(TAG_OPS, "Failed to call onScreenTurnedOn()", e);
		}
		}

		/**
		* Notifies the Launcher that screen is starting to turn on.
		*/
		@Override
		public void onScreenTurningOff() {
		try {
		if (mOverviewProxy != null) {
		mOverviewProxy.onScreenTurningOff();
		} else {
		Log.e(TAG_OPS,
		"Failed to get overview proxy for screen turning off event.");
		}
		} catch (RemoteException e) {
		Log.e(TAG_OPS, "Failed to call onScreenTurningOff()", e);
		}
		}

		/**
		* Notifies the Launcher that screen is starting to turn on.
		*/
		@Override
		public void onScreenTurningOn() {
		try {
		if (mOverviewProxy != null) {
		mOverviewProxy.onScreenTurningOn();
		} else {
		Log.e(TAG_OPS,
		"Failed to get overview proxy for screen turning on event.");
		}
		} catch (RemoteException e) {
		Log.e(TAG_OPS, "Failed to call onScreenTurningOn()", e);
		}
		}
		};

		private final WakefulnessLifecycle.Observer mWakefulnessLifecycleObserver =
		new WakefulnessLifecycle.Observer() {
		@Override

packages/SystemUI/tests/src/com/android/systemui/recents/OverviewProxyServiceTest.kt

+0 −3

Original line number	Diff line number	Diff line
		@@ -31,7 +31,6 @@ import com.android.systemui.dagger.qualifiers.Main
		import com.android.systemui.dump.DumpManager
		import com.android.systemui.flags.FakeFeatureFlags
		import com.android.systemui.keyguard.KeyguardUnlockAnimationController
		import com.android.systemui.keyguard.ScreenLifecycle
		import com.android.systemui.keyguard.WakefulnessLifecycle
		import com.android.systemui.model.SysUiState
		import com.android.systemui.navigationbar.NavigationBarController
		@@ -84,7 +83,6 @@ class OverviewProxyServiceTest : SysuiTestCase() {
		private val fakeSystemClock = FakeSystemClock()
		private val sysUiState = SysUiState(displayTracker)
		private val featureFlags = FakeFeatureFlags()
		private val screenLifecycle = ScreenLifecycle(dumpManager)
		private val wakefulnessLifecycle =
		WakefulnessLifecycle(mContext, null, fakeSystemClock, dumpManager)

		@@ -142,7 +140,6 @@ class OverviewProxyServiceTest : SysuiTestCase() {
		sysUiState,
		mock(),
		userTracker,
		screenLifecycle,
		wakefulnessLifecycle,
		uiEventLogger,
		displayTracker,