Snap for 9874503 from 83623aaa8eb36544cc0559fb9fffa6e87dc2e46d to tm-qpr3-release (04862172) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/res/values/strings.xml

+4 −3

Original line number	Diff line number	Diff line
		@@ -221,9 +221,10 @@
		the screen. This time the double-tap can happen on the top or bottom of the screen.
		To teach the user about this feature, we display an education explaining how the double-tap
		works and how the app can be moved on the screen.
		This is the text we show to the user below an animated icon visualizing the double-tap
		action. [CHAR LIMIT=NONE] -->
		<string name="letterbox_reachability_reposition_text">Double-tap to move this app</string>
		This is the text we show to the user below an icon visualizing the double-tap
		action. The description should be split in two lines separated by "\n" like for this
		locale. [CHAR LIMIT=NONE] -->
		<string name="letterbox_reachability_reposition_text">Double-tap to\nmove this app</string>

		<!-- Freeform window caption strings -->
		<!-- Accessibility text for the maximize window button [CHAR LIMIT=NONE] -->

packages/SystemUI/shared/src/com/android/systemui/shared/recents/model/Task.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -133,6 +133,10 @@ public class Task {
		return this.baseIntent.getPackage();
		}

		public int getId() {
		return id;
		}

		@Override
		public boolean equals(Object o) {
		if (!(o instanceof TaskKey)) {
		@@ -307,6 +311,10 @@ public class Task {
		lastSnapshotData.set(rawTask.lastSnapshotData);
		}

		public TaskKey getKey() {
		return key;
		}

		/**
		* Returns the visible width to height ratio. Returns 0f if snapshot data is not available.
		*/

packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java

+27 −26

Original line number	Diff line number	Diff line
		@@ -115,28 +115,25 @@ public class QuickStepContract {
		public static final int SYSUI_STATE_FREEFORM_ACTIVE_IN_DESKTOP_MODE = 1 << 26;
		// Device dreaming state
		public static final int SYSUI_STATE_DEVICE_DREAMING = 1 << 27;
		// Whether the screen is currently on. Note that the screen is considered on while turning on,
		// but not while turning off.
		public static final int SYSUI_STATE_SCREEN_ON = 1 << 28;
		// Whether the screen is currently transitioning into the state indicated by
		// SYSUI_STATE_SCREEN_ON.
		public static final int SYSUI_STATE_SCREEN_TRANSITION = 1 << 29;
		// Whether the device is currently awake (as opposed to asleep, see WakefulnessLifecycle).
		// Note that the device is awake on while waking up on, but not while going to sleep.
		public static final int SYSUI_STATE_AWAKE = 1 << 28;
		// Whether the device is currently transitioning between awake/asleep indicated by
		// SYSUI_STATE_AWAKE.
		public static final int SYSUI_STATE_WAKEFULNESS_TRANSITION = 1 << 29;
		// The notification panel expansion fraction is > 0
		public static final int SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE = 1 << 30;

		// Mask for SystemUiStateFlags to isolate SYSUI_STATE_SCREEN_ON and
		// SYSUI_STATE_SCREEN_TRANSITION, to match SCREEN_STATE_*
		public static final int SYSUI_STATE_SCREEN_STATE_MASK =
		SYSUI_STATE_SCREEN_ON \| SYSUI_STATE_SCREEN_TRANSITION;
		// Screen is off.
		public static final int SCREEN_STATE_OFF = 0;
		// Screen is on.
		public static final int SCREEN_STATE_ON = SYSUI_STATE_SCREEN_ON;
		// Screen is still on, but transitioning to turn off.
		public static final int SCREEN_STATE_TURNING_OFF = SYSUI_STATE_SCREEN_TRANSITION;
		// Screen was off and is now turning on.
		public static final int SCREEN_STATE_TURNING_ON =
		SYSUI_STATE_SCREEN_TRANSITION \| SYSUI_STATE_SCREEN_ON;
		// Mask for SystemUiStateFlags to isolate SYSUI_STATE_AWAKE and
		// SYSUI_STATE_WAKEFULNESS_TRANSITION, to match WAKEFULNESS_* constants
		public static final int SYSUI_STATE_WAKEFULNESS_MASK =
		SYSUI_STATE_AWAKE \| SYSUI_STATE_WAKEFULNESS_TRANSITION;
		// Mirroring the WakefulnessLifecycle#Wakefulness states
		public static final int WAKEFULNESS_ASLEEP = 0;
		public static final int WAKEFULNESS_AWAKE = SYSUI_STATE_AWAKE;
		public static final int WAKEFULNESS_GOING_TO_SLEEP = SYSUI_STATE_WAKEFULNESS_TRANSITION;
		public static final int WAKEFULNESS_WAKING =
		SYSUI_STATE_WAKEFULNESS_TRANSITION \| SYSUI_STATE_AWAKE;

		@Retention(RetentionPolicy.SOURCE)
		@IntDef({SYSUI_STATE_SCREEN_PINNING,
		@@ -167,8 +164,9 @@ public class QuickStepContract {
		SYSUI_STATE_VOICE_INTERACTION_WINDOW_SHOWING,
		SYSUI_STATE_FREEFORM_ACTIVE_IN_DESKTOP_MODE,
		SYSUI_STATE_DEVICE_DREAMING,
		SYSUI_STATE_SCREEN_ON,
		SYSUI_STATE_SCREEN_TRANSITION,
		SYSUI_STATE_AWAKE,
		SYSUI_STATE_WAKEFULNESS_TRANSITION,
		SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE,
		})
		public @interface SystemUiStateFlags {}

		@@ -190,7 +188,7 @@ public class QuickStepContract {
		str.add("navbar_hidden");
		}
		if ((flags & SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED) != 0) {
		str.add("notif_visible");
		str.add("notif_expanded");
		}
		if ((flags & SYSUI_STATE_QUICK_SETTINGS_EXPANDED) != 0) {
		str.add("qs_visible");
		@@ -258,11 +256,14 @@ public class QuickStepContract {
		if ((flags & SYSUI_STATE_DEVICE_DREAMING) != 0) {
		str.add("device_dreaming");
		}
		if ((flags & SYSUI_STATE_SCREEN_TRANSITION) != 0) {
		str.add("screen_transition");
		if ((flags & SYSUI_STATE_WAKEFULNESS_TRANSITION) != 0) {
		str.add("wakefulness_transition");
		}
		if ((flags & SYSUI_STATE_AWAKE) != 0) {
		str.add("awake");
		}
		if ((flags & SYSUI_STATE_SCREEN_ON) != 0) {
		str.add("screen_on");
		if ((flags & SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE) != 0) {
		str.add("notif_visible");
		}

		return str.toString();

packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBouncerViewBinder.kt

+1 −2

Original line number	Diff line number	Diff line
		@@ -110,11 +110,11 @@ object KeyguardBouncerViewBinder {
		viewModel.setBouncerViewDelegate(delegate)
		launch {
		viewModel.isShowing.collect { isShowing ->
		view.visibility = if (isShowing) View.VISIBLE else View.INVISIBLE
		if (isShowing) {
		// Reset Security Container entirely.
		securityContainerController.reinflateViewFlipper {
		// Reset Security Container entirely.
		view.visibility = View.VISIBLE
		securityContainerController.onBouncerVisibilityChanged(
		/* isVisible= */ true
		)
		@@ -127,7 +127,6 @@ object KeyguardBouncerViewBinder {
		)
		}
		} else {
		view.visibility = View.INVISIBLE
		securityContainerController.onBouncerVisibilityChanged(
		/* isVisible= */ false
		)

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

+88 −71

Original line number	Diff line number	Diff line
		@@ -21,21 +21,22 @@ import static android.view.MotionEvent.ACTION_CANCEL;
		import static android.view.MotionEvent.ACTION_DOWN;
		import static android.view.MotionEvent.ACTION_UP;
		import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON;

		import static com.android.internal.accessibility.common.ShortcutConstants.CHOOSER_PACKAGE_NAME;
		import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SUPPORTS_WINDOW_CORNERS;
		import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SYSUI_PROXY;
		import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_UNFOLD_ANIMATION_FORWARDER;
		import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_UNLOCK_ANIMATION_CONTROLLER;
		import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_WINDOW_CORNER_RADIUS;
		import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_AWAKE;
		import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BOUNCER_SHOWING;
		import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_DEVICE_DOZING;
		import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_DEVICE_DREAMING;
		import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SCREEN_ON;
		import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SCREEN_TRANSITION;
		import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING;
		import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED;
		import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_TRACING_ENABLED;
		import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_VOICE_INTERACTION_WINDOW_SHOWING;
		import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_WAKEFULNESS_TRANSITION;

		import android.annotation.FloatRange;
		import android.app.ActivityTaskManager;
		@@ -83,6 +84,7 @@ import com.android.systemui.dagger.qualifiers.Main;
		import com.android.systemui.dump.DumpManager;
		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;
		import com.android.systemui.navigationbar.NavigationBarController;
		@@ -518,6 +520,7 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis
		NotificationShadeWindowController statusBarWinController, SysUiState sysUiState,
		UserTracker userTracker,
		ScreenLifecycle screenLifecycle,
		WakefulnessLifecycle wakefulnessLifecycle,
		UiEventLogger uiEventLogger,
		DisplayTracker displayTracker,
		KeyguardUnlockAnimationController sysuiUnlockAnimationController,
		@@ -595,8 +598,8 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis
		// Listen for user setup
		mUserTracker.addCallback(mUserChangedCallback, mMainExecutor);

		screenLifecycle.addObserver(mLifecycleObserver);

		screenLifecycle.addObserver(mScreenLifecycleObserver);
		wakefulnessLifecycle.addObserver(mWakefulnessLifecycleObserver);
		// Connect to the service
		updateEnabledState();
		startConnectionToCurrentUser();
		@@ -786,7 +789,8 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis

		private void disconnectFromLauncherService(String disconnectReason) {
		Log.d(TAG_OPS, "disconnectFromLauncherService bound?: " + mBound +
		" currentProxy: " + mOverviewProxy + " disconnectReason: " + disconnectReason);
		" currentProxy: " + mOverviewProxy + " disconnectReason: " + disconnectReason,
		new Throwable());
		if (mBound) {
		// Always unbind the service (ie. if called through onNullBinding or onBindingDied)
		mContext.unbindService(mOverviewServiceConnection);
		@@ -860,54 +864,36 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis
		}
		}

		private final ScreenLifecycle.Observer mLifecycleObserver = new ScreenLifecycle.Observer() {
		private final ScreenLifecycle.Observer mScreenLifecycleObserver =
		new ScreenLifecycle.Observer() {
		/**
		* Notifies the Launcher that screen turned on and ready to use
		*/
		@Override
		public void onScreenTurnedOn() {
		mSysUiState
		.setFlag(SYSUI_STATE_SCREEN_ON, true)
		.setFlag(SYSUI_STATE_SCREEN_TRANSITION, false)
		.commitUpdate(mContext.getDisplayId());

		try {
		if (mOverviewProxy != null) {
		mOverviewProxy.onScreenTurnedOn();
		} else {
		Log.e(TAG_OPS, "Failed to get overview proxy for screen turned on event.");
		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 turned off.
		*/
		@Override
		public void onScreenTurnedOff() {
		mSysUiState
		.setFlag(SYSUI_STATE_SCREEN_ON, false)
		.setFlag(SYSUI_STATE_SCREEN_TRANSITION, false)
		.commitUpdate(mContext.getDisplayId());
		}

		/**
		* Notifies the Launcher that screen is starting to turn on.
		*/
		@Override
		public void onScreenTurningOff() {
		mSysUiState
		.setFlag(SYSUI_STATE_SCREEN_ON, false)
		.setFlag(SYSUI_STATE_SCREEN_TRANSITION, true)
		.commitUpdate(mContext.getDisplayId());

		try {
		if (mOverviewProxy != null) {
		mOverviewProxy.onScreenTurningOff();
		} else {
		Log.e(TAG_OPS, "Failed to get overview proxy for screen turning off event.");
		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);
		@@ -919,16 +905,12 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis
		*/
		@Override
		public void onScreenTurningOn() {
		mSysUiState
		.setFlag(SYSUI_STATE_SCREEN_ON, true)
		.setFlag(SYSUI_STATE_SCREEN_TRANSITION, true)
		.commitUpdate(mContext.getDisplayId());

		try {
		if (mOverviewProxy != null) {
		mOverviewProxy.onScreenTurningOn();
		} else {
		Log.e(TAG_OPS, "Failed to get overview proxy for screen turning on event.");
		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);
		@@ -936,6 +918,41 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis
		}
		};

		private final WakefulnessLifecycle.Observer mWakefulnessLifecycleObserver =
		new WakefulnessLifecycle.Observer() {
		@Override
		public void onStartedWakingUp() {
		mSysUiState
		.setFlag(SYSUI_STATE_AWAKE, true)
		.setFlag(SYSUI_STATE_WAKEFULNESS_TRANSITION, true)
		.commitUpdate(mContext.getDisplayId());
		}

		@Override
		public void onFinishedWakingUp() {
		mSysUiState
		.setFlag(SYSUI_STATE_AWAKE, true)
		.setFlag(SYSUI_STATE_WAKEFULNESS_TRANSITION, false)
		.commitUpdate(mContext.getDisplayId());
		}

		@Override
		public void onStartedGoingToSleep() {
		mSysUiState
		.setFlag(SYSUI_STATE_AWAKE, false)
		.setFlag(SYSUI_STATE_WAKEFULNESS_TRANSITION, true)
		.commitUpdate(mContext.getDisplayId());
		}

		@Override
		public void onFinishedGoingToSleep() {
		mSysUiState
		.setFlag(SYSUI_STATE_AWAKE, false)
		.setFlag(SYSUI_STATE_WAKEFULNESS_TRANSITION, false)
		.commitUpdate(mContext.getDisplayId());
		}
		};

		void notifyToggleRecentApps() {
		for (int i = mConnectionCallbacks.size() - 1; i >= 0; --i) {
		mConnectionCallbacks.get(i).onToggleRecentApps();