Merge cherrypicks of [16049893, 16049894, 16049738, 16049991, 16049805,... (3ec7bff8) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/doze/DozeScreenBrightness.java

+30 −6

Original line number	Original line	Diff line number	Diff line
	@@ -36,6 +36,7 @@ import com.android.systemui.doze.dagger.DozeScope;
	import com.android.systemui.doze.dagger.WrappedService;		import com.android.systemui.doze.dagger.WrappedService;
	import com.android.systemui.keyguard.WakefulnessLifecycle;		import com.android.systemui.keyguard.WakefulnessLifecycle;
	import com.android.systemui.statusbar.phone.DozeParameters;		import com.android.systemui.statusbar.phone.DozeParameters;
			import com.android.systemui.statusbar.phone.UnlockedScreenOffAnimationController;
	import com.android.systemui.util.sensors.AsyncSensorManager;		import com.android.systemui.util.sensors.AsyncSensorManager;

	import java.io.PrintWriter;		import java.io.PrintWriter;
	@@ -55,6 +56,16 @@ public class DozeScreenBrightness extends BroadcastReceiver implements DozeMachi
	"com.android.systemui.doze.AOD_BRIGHTNESS";		"com.android.systemui.doze.AOD_BRIGHTNESS";
	protected static final String BRIGHTNESS_BUCKET = "brightness_bucket";		protected static final String BRIGHTNESS_BUCKET = "brightness_bucket";

			/**
			* Just before the screen times out from user inactivity, DisplayPowerController dims the screen
			* brightness to the lower of {@link #mScreenBrightnessDim}, or the current brightness minus
			* DisplayPowerController#SCREEN_DIM_MINIMUM_REDUCTION_FLOAT.
			*
			* This value is 0.04f * 255, which converts SCREEN_DIM_MINIMUM_REDUCTION_FLOAT to the integer
			* brightness values used by doze.
			*/
			private static final int SCREEN_DIM_MINIMUM_REDUCTION_INT = 10;

	private final Context mContext;		private final Context mContext;
	private final DozeMachine.Service mDozeService;		private final DozeMachine.Service mDozeService;
	private final DozeHost mDozeHost;		private final DozeHost mDozeHost;
	@@ -82,6 +93,8 @@ public class DozeScreenBrightness extends BroadcastReceiver implements DozeMachi
	*/		*/
	private int mDebugBrightnessBucket = -1;		private int mDebugBrightnessBucket = -1;

			private UnlockedScreenOffAnimationController mUnlockedScreenOffAnimationController;

	@Inject		@Inject
	public DozeScreenBrightness(Context context, @WrappedService DozeMachine.Service service,		public DozeScreenBrightness(Context context, @WrappedService DozeMachine.Service service,
	AsyncSensorManager sensorManager,		AsyncSensorManager sensorManager,
	@@ -89,7 +102,8 @@ public class DozeScreenBrightness extends BroadcastReceiver implements DozeMachi
	AlwaysOnDisplayPolicy alwaysOnDisplayPolicy,		AlwaysOnDisplayPolicy alwaysOnDisplayPolicy,
	WakefulnessLifecycle wakefulnessLifecycle,		WakefulnessLifecycle wakefulnessLifecycle,
	DozeParameters dozeParameters,		DozeParameters dozeParameters,
	DockManager dockManager) {		DockManager dockManager,
			UnlockedScreenOffAnimationController unlockedScreenOffAnimationController) {
	mContext = context;		mContext = context;
	mDozeService = service;		mDozeService = service;
	mSensorManager = sensorManager;		mSensorManager = sensorManager;
	@@ -99,6 +113,7 @@ public class DozeScreenBrightness extends BroadcastReceiver implements DozeMachi
	mDozeHost = host;		mDozeHost = host;
	mHandler = handler;		mHandler = handler;
	mDockManager = dockManager;		mDockManager = dockManager;
			mUnlockedScreenOffAnimationController = unlockedScreenOffAnimationController;

	mDefaultDozeBrightness = alwaysOnDisplayPolicy.defaultDozeBrightness;		mDefaultDozeBrightness = alwaysOnDisplayPolicy.defaultDozeBrightness;
	mScreenBrightnessDim = alwaysOnDisplayPolicy.dimBrightness;		mScreenBrightnessDim = alwaysOnDisplayPolicy.dimBrightness;
	@@ -148,14 +163,15 @@ public class DozeScreenBrightness extends BroadcastReceiver implements DozeMachi
	}		}
	}		}

	private void updateBrightnessAndReady(boolean force) {		public void updateBrightnessAndReady(boolean force) {
	if (force \|\| mRegistered \|\| mDebugBrightnessBucket != -1) {		if (force \|\| mRegistered \|\| mDebugBrightnessBucket != -1) {
	int sensorValue = mDebugBrightnessBucket == -1		int sensorValue = mDebugBrightnessBucket == -1
	? mLastSensorValue : mDebugBrightnessBucket;		? mLastSensorValue : mDebugBrightnessBucket;
	int brightness = computeBrightness(sensorValue);		int brightness = computeBrightness(sensorValue);
	boolean brightnessReady = brightness > 0;		boolean brightnessReady = brightness > 0;
	if (brightnessReady) {		if (brightnessReady) {
	mDozeService.setDozeScreenBrightness(clampToUserSetting(brightness));		mDozeService.setDozeScreenBrightness(
			clampToDimBrightnessForScreenOff(clampToUserSetting(brightness)));
	}		}

	int scrimOpacity = -1;		int scrimOpacity = -1;
	@@ -207,13 +223,21 @@ public class DozeScreenBrightness extends BroadcastReceiver implements DozeMachi
	/**		/**
	* Clamp the brightness to the dim brightness value used by PowerManagerService just before the		* Clamp the brightness to the dim brightness value used by PowerManagerService just before the
	* device times out and goes to sleep, if we are sleeping from a timeout. This ensures that we		* device times out and goes to sleep, if we are sleeping from a timeout. This ensures that we
	* don't raise the brightness back to the user setting before playing the screen off animation.		* don't raise the brightness back to the user setting before or during the screen off
			* animation.
	*/		*/
	private int clampToDimBrightnessForScreenOff(int brightness) {		private int clampToDimBrightnessForScreenOff(int brightness) {
	if (mDozeParameters.shouldControlUnlockedScreenOff()		if (mUnlockedScreenOffAnimationController.isScreenOffAnimationPlaying()
	&& mWakefulnessLifecycle.getLastSleepReason()		&& mWakefulnessLifecycle.getLastSleepReason()
	== PowerManager.GO_TO_SLEEP_REASON_TIMEOUT) {		== PowerManager.GO_TO_SLEEP_REASON_TIMEOUT) {
	return Math.min(mScreenBrightnessDim, brightness);		return Math.max(
			PowerManager.BRIGHTNESS_OFF,
			// Use the lower of either the dim brightness, or the current brightness reduced
			// by the minimum dim amount. This is the same logic used in
			// DisplayPowerController#updatePowerState to apply a minimum dim amount.
			Math.min(
			brightness - SCREEN_DIM_MINIMUM_REDUCTION_INT,
			mScreenBrightnessDim));
	} else {		} else {
	return brightness;		return brightness;
	}		}

packages/SystemUI/src/com/android/systemui/doze/DozeScreenState.java

+10 −1

Original line number	Original line	Diff line number	Diff line
	@@ -77,6 +77,7 @@ public class DozeScreenState implements DozeMachine.Part {
	private final Provider<UdfpsController> mUdfpsControllerProvider;		private final Provider<UdfpsController> mUdfpsControllerProvider;
	@Nullable private UdfpsController mUdfpsController;		@Nullable private UdfpsController mUdfpsController;
	private final DozeLog mDozeLog;		private final DozeLog mDozeLog;
			private final DozeScreenBrightness mDozeScreenBrightness;

	private int mPendingScreenState = Display.STATE_UNKNOWN;		private int mPendingScreenState = Display.STATE_UNKNOWN;
	private SettableWakeLock mWakeLock;		private SettableWakeLock mWakeLock;
	@@ -90,7 +91,8 @@ public class DozeScreenState implements DozeMachine.Part {
	WakeLock wakeLock,		WakeLock wakeLock,
	AuthController authController,		AuthController authController,
	Provider<UdfpsController> udfpsControllerProvider,		Provider<UdfpsController> udfpsControllerProvider,
	DozeLog dozeLog) {		DozeLog dozeLog,
			DozeScreenBrightness dozeScreenBrightness) {
	mDozeService = service;		mDozeService = service;
	mHandler = handler;		mHandler = handler;
	mParameters = parameters;		mParameters = parameters;
	@@ -99,6 +101,7 @@ public class DozeScreenState implements DozeMachine.Part {
	mAuthController = authController;		mAuthController = authController;
	mUdfpsControllerProvider = udfpsControllerProvider;		mUdfpsControllerProvider = udfpsControllerProvider;
	mDozeLog = dozeLog;		mDozeLog = dozeLog;
			mDozeScreenBrightness = dozeScreenBrightness;

	updateUdfpsController();		updateUdfpsController();
	if (mUdfpsController == null) {		if (mUdfpsController == null) {
	@@ -204,6 +207,12 @@ public class DozeScreenState implements DozeMachine.Part {
	if (screenState != Display.STATE_UNKNOWN) {		if (screenState != Display.STATE_UNKNOWN) {
	if (DEBUG) Log.d(TAG, "setDozeScreenState(" + screenState + ")");		if (DEBUG) Log.d(TAG, "setDozeScreenState(" + screenState + ")");
	mDozeService.setDozeScreenState(screenState);		mDozeService.setDozeScreenState(screenState);
			if (screenState == Display.STATE_DOZE) {
			// If we're entering doze, update the doze screen brightness. We might have been
			// clamping it to the dim brightness during the screen off animation, and we should
			// now change it to the brightness we actually want according to the sensor.
			mDozeScreenBrightness.updateBrightnessAndReady(false /* force */);
			}
	mPendingScreenState = Display.STATE_UNKNOWN;		mPendingScreenState = Display.STATE_UNKNOWN;
	mWakeLock.setAcquired(false);		mWakeLock.setAcquired(false);
	}		}

packages/SystemUI/tests/src/com/android/systemui/doze/DozeScreenBrightnessTest.java

+14 −5

packages/SystemUI/tests/src/com/android/systemui/doze/DozeScreenStateTest.java

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -82,6 +82,8 @@ public class DozeScreenStateTest extends SysuiTestCase {
	private UdfpsController mUdfpsController;		private UdfpsController mUdfpsController;
	@Mock		@Mock
	private DozeLog mDozeLog;		private DozeLog mDozeLog;
			@Mock
			private DozeScreenBrightness mDozeScreenBrightness;

	@Before		@Before
	public void setUp() throws Exception {		public void setUp() throws Exception {
	@@ -96,7 +98,8 @@ public class DozeScreenStateTest extends SysuiTestCase {
	mHandlerFake = new FakeHandler(Looper.getMainLooper());		mHandlerFake = new FakeHandler(Looper.getMainLooper());
	mWakeLock = new WakeLockFake();		mWakeLock = new WakeLockFake();
	mScreen = new DozeScreenState(mServiceFake, mHandlerFake, mDozeHost, mDozeParameters,		mScreen = new DozeScreenState(mServiceFake, mHandlerFake, mDozeHost, mDozeParameters,
	mWakeLock, mAuthController, mUdfpsControllerProvider, mDozeLog);		mWakeLock, mAuthController, mUdfpsControllerProvider, mDozeLog,
			mDozeScreenBrightness);
	}		}

	@Test		@Test

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

+9 −3

Original line number	Original line	Diff line number	Diff line
	@@ -3387,9 +3387,15 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
	final List<RemoteAction> actions = r.pictureInPictureArgs.getActions();		final List<RemoteAction> actions = r.pictureInPictureArgs.getActions();
	mRootWindowContainer.moveActivityToPinnedRootTask(		mRootWindowContainer.moveActivityToPinnedRootTask(
	r, "enterPictureInPictureMode");		r, "enterPictureInPictureMode");
	final Task rootTask = r.getRootTask();		final Task task = r.getTask();
	rootTask.setPictureInPictureAspectRatio(aspectRatio);		task.setPictureInPictureAspectRatio(aspectRatio);
	rootTask.setPictureInPictureActions(actions);		task.setPictureInPictureActions(actions);

			// Continue the pausing process after entering pip.
			if (task.getPausingActivity() == r) {
			task.schedulePauseActivity(r, false /* userLeaving */,
			false /* pauseImmediately */, "auto-pip");
			}
	}		}
	};		};

Original line number	Original line	Diff line number	Diff line
	@@ -51,6 +51,7 @@ import com.android.systemui.SysuiTestCase;
	import com.android.systemui.dock.DockManager;		import com.android.systemui.dock.DockManager;
	import com.android.systemui.keyguard.WakefulnessLifecycle;		import com.android.systemui.keyguard.WakefulnessLifecycle;
	import com.android.systemui.statusbar.phone.DozeParameters;		import com.android.systemui.statusbar.phone.DozeParameters;
			import com.android.systemui.statusbar.phone.UnlockedScreenOffAnimationController;
	import com.android.systemui.util.concurrency.FakeExecutor;		import com.android.systemui.util.concurrency.FakeExecutor;
	import com.android.systemui.util.concurrency.FakeThreadFactory;		import com.android.systemui.util.concurrency.FakeThreadFactory;
	import com.android.systemui.util.sensors.AsyncSensorManager;		import com.android.systemui.util.sensors.AsyncSensorManager;
	@@ -86,6 +87,8 @@ public class DozeScreenBrightnessTest extends SysuiTestCase {
	DozeParameters mDozeParameters;		DozeParameters mDozeParameters;
	@Mock		@Mock
	DockManager mDockManager;		DockManager mDockManager;
			@Mock
			private UnlockedScreenOffAnimationController mUnlockedScreenOffAnimationController;
	private FakeExecutor mFakeExecutor = new FakeExecutor(new FakeSystemClock());		private FakeExecutor mFakeExecutor = new FakeExecutor(new FakeSystemClock());
	private FakeThreadFactory mFakeThreadFactory = new FakeThreadFactory(mFakeExecutor);		private FakeThreadFactory mFakeThreadFactory = new FakeThreadFactory(mFakeExecutor);

	@@ -113,7 +116,8 @@ public class DozeScreenBrightnessTest extends SysuiTestCase {
	mSensor = fakeSensorManager.getFakeLightSensor();		mSensor = fakeSensorManager.getFakeLightSensor();
	mScreen = new DozeScreenBrightness(mContext, mServiceFake, mSensorManager,		mScreen = new DozeScreenBrightness(mContext, mServiceFake, mSensorManager,
	Optional.of(mSensor.getSensor()), mDozeHost, null /* handler */,		Optional.of(mSensor.getSensor()), mDozeHost, null /* handler */,
	mAlwaysOnDisplayPolicy, mWakefulnessLifecycle, mDozeParameters, mDockManager);		mAlwaysOnDisplayPolicy, mWakefulnessLifecycle, mDozeParameters, mDockManager,
			mUnlockedScreenOffAnimationController);
	}		}

	@Test		@Test
	@@ -211,7 +215,8 @@ public class DozeScreenBrightnessTest extends SysuiTestCase {
	public void testPulsing_withoutLightSensor_setsAoDDimmingScrimTransparent() throws Exception {		public void testPulsing_withoutLightSensor_setsAoDDimmingScrimTransparent() throws Exception {
	mScreen = new DozeScreenBrightness(mContext, mServiceFake, mSensorManager,		mScreen = new DozeScreenBrightness(mContext, mServiceFake, mSensorManager,
	Optional.empty() /* sensor /, mDozeHost, null / handler */,		Optional.empty() /* sensor /, mDozeHost, null / handler */,
	mAlwaysOnDisplayPolicy, mWakefulnessLifecycle, mDozeParameters, mDockManager);		mAlwaysOnDisplayPolicy, mWakefulnessLifecycle, mDozeParameters, mDockManager,
			mUnlockedScreenOffAnimationController);
	mScreen.transitionTo(UNINITIALIZED, INITIALIZED);		mScreen.transitionTo(UNINITIALIZED, INITIALIZED);
	mScreen.transitionTo(INITIALIZED, DOZE);		mScreen.transitionTo(INITIALIZED, DOZE);
	reset(mDozeHost);		reset(mDozeHost);
	@@ -240,7 +245,8 @@ public class DozeScreenBrightnessTest extends SysuiTestCase {
	public void testNullSensor() throws Exception {		public void testNullSensor() throws Exception {
	mScreen = new DozeScreenBrightness(mContext, mServiceFake, mSensorManager,		mScreen = new DozeScreenBrightness(mContext, mServiceFake, mSensorManager,
	Optional.empty() /* sensor /, mDozeHost, null / handler */,		Optional.empty() /* sensor /, mDozeHost, null / handler */,
	mAlwaysOnDisplayPolicy, mWakefulnessLifecycle, mDozeParameters, mDockManager);		mAlwaysOnDisplayPolicy, mWakefulnessLifecycle, mDozeParameters, mDockManager,