Merge cherrypicks of [19734803, 19744936, 19746494] into tm-qpr1-release. (4412eb63) · Commits · e / os / android_frameworks_base

core/java/android/os/BatteryStats.java

+11 −2

Original line number	Diff line number	Diff line
		@@ -956,7 +956,16 @@ public abstract class BatteryStats implements Parcelable {

		public static final int NUM_WIFI_BATCHED_SCAN_BINS = 5;

		public static final int NUM_USER_ACTIVITY_TYPES = PowerManager.USER_ACTIVITY_EVENT_MAX + 1;
		/**
		* Note that these must match the constants in android.os.PowerManager.
		* Also, if the user activity types change, the BatteryStatsImpl.VERSION must
		* also be bumped.
		*/
		static final String[] USER_ACTIVITY_TYPES = {
		"other", "button", "touch", "accessibility", "attention"
		};

		public static final int NUM_USER_ACTIVITY_TYPES = USER_ACTIVITY_TYPES.length;

		public abstract void noteUserActivityLocked(int type);
		public abstract boolean hasUserActivity();
		@@ -6168,7 +6177,7 @@ public abstract class BatteryStats implements Parcelable {
		}
		sb.append(val);
		sb.append(" ");
		sb.append(PowerManager.userActivityEventToString(i));
		sb.append(Uid.USER_ACTIVITY_TYPES[i]);
		}
		}
		if (hasData) {

core/java/android/os/PowerManager.java

+0 −38

Original line number	Diff line number	Diff line
		@@ -344,44 +344,6 @@ public final class PowerManager {
		*/
		public static final int USER_ACTIVITY_EVENT_DEVICE_STATE = 6;

		/**
		* @hide
		*/
		public static final int USER_ACTIVITY_EVENT_MAX = USER_ACTIVITY_EVENT_DEVICE_STATE;

		/**
		* @hide
		*/
		@IntDef(prefix = { "USER_ACTIVITY_EVENT_" }, value = {
		USER_ACTIVITY_EVENT_OTHER,
		USER_ACTIVITY_EVENT_BUTTON,
		USER_ACTIVITY_EVENT_TOUCH,
		USER_ACTIVITY_EVENT_ACCESSIBILITY,
		USER_ACTIVITY_EVENT_ATTENTION,
		USER_ACTIVITY_EVENT_FACE_DOWN,
		USER_ACTIVITY_EVENT_DEVICE_STATE,
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface UserActivityEvent{}

		/**
		*
		* Convert the user activity event to a string for debugging purposes.
		* @hide
		*/
		public static String userActivityEventToString(@UserActivityEvent int userActivityEvent) {
		switch (userActivityEvent) {
		case USER_ACTIVITY_EVENT_OTHER: return "other";
		case USER_ACTIVITY_EVENT_BUTTON: return "button";
		case USER_ACTIVITY_EVENT_TOUCH: return "touch";
		case USER_ACTIVITY_EVENT_ACCESSIBILITY: return "accessibility";
		case USER_ACTIVITY_EVENT_ATTENTION: return "attention";
		case USER_ACTIVITY_EVENT_FACE_DOWN: return "faceDown";
		case USER_ACTIVITY_EVENT_DEVICE_STATE: return "deviceState";
		default: return Integer.toString(userActivityEvent);
		}
		}

		/**
		* User activity flag: If already dimmed, extend the dim timeout
		* but do not brighten. This flag is useful for keeping the screen on

core/java/com/android/internal/os/BatteryStatsImpl.java

+5 −6

Original line number	Diff line number	Diff line
		@@ -6144,8 +6144,7 @@ public class BatteryStatsImpl extends BatteryStats {
		}

		@GuardedBy("this")
		public void noteUserActivityLocked(int uid, @PowerManager.UserActivityEvent int event,
		long elapsedRealtimeMs, long uptimeMs) {
		public void noteUserActivityLocked(int uid, int event, long elapsedRealtimeMs, long uptimeMs) {
		if (mOnBatteryInternal) {
		uid = mapUid(uid);
		getUidStatsLocked(uid, elapsedRealtimeMs, uptimeMs).noteUserActivityLocked(event);
		@@ -9957,14 +9956,14 @@ public class BatteryStatsImpl extends BatteryStats {
		}

		@Override
		public void noteUserActivityLocked(@PowerManager.UserActivityEvent int event) {
		public void noteUserActivityLocked(int type) {
		if (mUserActivityCounters == null) {
		initUserActivityLocked();
		}
		if (event >= 0 && event < NUM_USER_ACTIVITY_TYPES) {
		mUserActivityCounters[event].stepAtomic();
		if (type >= 0 && type < NUM_USER_ACTIVITY_TYPES) {
		mUserActivityCounters[type].stepAtomic();
		} else {
		Slog.w(TAG, "Unknown user activity event " + event + " was specified.",
		Slog.w(TAG, "Unknown user activity type " + type + " was specified.",
		new Throwable());
		}
		}

libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java

+8 −43

Original line number	Diff line number	Diff line
		@@ -80,10 +80,7 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange
		public static final int PARALLAX_DISMISSING = 1;
		public static final int PARALLAX_ALIGN_CENTER = 2;

		private static final int FLING_RESIZE_DURATION = 250;
		private static final int FLING_SWITCH_DURATION = 350;
		private static final int FLING_ENTER_DURATION = 350;
		private static final int FLING_EXIT_DURATION = 350;
		private static final int FLING_ANIMATION_DURATION = 250;

		private final int mDividerWindowWidth;
		private final int mDividerInsets;
		@@ -96,9 +93,6 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange
		private final Rect mBounds1 = new Rect();
		// Bounds2 final position should be always at bottom or right
		private final Rect mBounds2 = new Rect();
		// The temp bounds outside of display bounds for side stage when split screen inactive to avoid
		// flicker next time active split screen.
		private final Rect mInvisibleBounds = new Rect();
		private final Rect mWinBounds1 = new Rect();
		private final Rect mWinBounds2 = new Rect();
		private final SplitLayoutHandler mSplitLayoutHandler;
		@@ -147,10 +141,6 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange
		resetDividerPosition();

		mDimNonImeSide = resources.getBoolean(R.bool.config_dimNonImeAttachedSide);

		mInvisibleBounds.set(mRootBounds);
		mInvisibleBounds.offset(isLandscape() ? mRootBounds.right : 0,
		isLandscape() ? 0 : mRootBounds.bottom);
		}

		private int getDividerInsets(Resources resources, Display display) {
		@@ -249,12 +239,6 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange
		rect.offset(-mRootBounds.left, -mRootBounds.top);
		}

		/** Gets bounds size equal to root bounds but outside of screen, used for position side stage
		* when split inactive to avoid flicker when next time active. */
		public void getInvisibleBounds(Rect rect) {
		rect.set(mInvisibleBounds);
		}

		/** Returns leash of the current divider bar. */
		@Nullable
		public SurfaceControl getDividerLeash() {
		@@ -300,10 +284,6 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange
		mDividerSnapAlgorithm = getSnapAlgorithm(mContext, mRootBounds, null);
		initDividerPosition(mTempRect);

		mInvisibleBounds.set(mRootBounds);
		mInvisibleBounds.offset(isLandscape() ? mRootBounds.right : 0,
		isLandscape() ? 0 : mRootBounds.bottom);

		return true;
		}

		@@ -425,13 +405,6 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange
		mFreezeDividerWindow = freezeDividerWindow;
		}

		/** Update current layout as divider put on start or end position. */
		public void setDividerAtBorder(boolean start) {
		final int pos = start ? mDividerSnapAlgorithm.getDismissStartTarget().position
		: mDividerSnapAlgorithm.getDismissEndTarget().position;
		setDividePosition(pos, false /* applyLayoutChange */);
		}

		/**
		* Updates bounds with the passing position. Usually used to update recording bounds while
		* performing animation or dragging divider bar to resize the splits.
		@@ -476,17 +449,17 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange
		public void snapToTarget(int currentPosition, DividerSnapAlgorithm.SnapTarget snapTarget) {
		switch (snapTarget.flag) {
		case FLAG_DISMISS_START:
		flingDividePosition(currentPosition, snapTarget.position, FLING_RESIZE_DURATION,
		flingDividePosition(currentPosition, snapTarget.position,
		() -> mSplitLayoutHandler.onSnappedToDismiss(false /* bottomOrRight */,
		EXIT_REASON_DRAG_DIVIDER));
		break;
		case FLAG_DISMISS_END:
		flingDividePosition(currentPosition, snapTarget.position, FLING_RESIZE_DURATION,
		flingDividePosition(currentPosition, snapTarget.position,
		() -> mSplitLayoutHandler.onSnappedToDismiss(true /* bottomOrRight */,
		EXIT_REASON_DRAG_DIVIDER));
		break;
		default:
		flingDividePosition(currentPosition, snapTarget.position, FLING_RESIZE_DURATION,
		flingDividePosition(currentPosition, snapTarget.position,
		() -> setDividePosition(snapTarget.position, true /* applyLayoutChange */));
		break;
		}
		@@ -543,20 +516,12 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange
		public void flingDividerToDismiss(boolean toEnd, int reason) {
		final int target = toEnd ? mDividerSnapAlgorithm.getDismissEndTarget().position
		: mDividerSnapAlgorithm.getDismissStartTarget().position;
		flingDividePosition(getDividePosition(), target, FLING_EXIT_DURATION,
		flingDividePosition(getDividePosition(), target,
		() -> mSplitLayoutHandler.onSnappedToDismiss(toEnd, reason));
		}

		/** Fling divider from current position to center position. */
		public void flingDividerToCenter() {
		final int pos = mDividerSnapAlgorithm.getMiddleTarget().position;
		flingDividePosition(getDividePosition(), pos, FLING_ENTER_DURATION,
		() -> setDividePosition(pos, true /* applyLayoutChange */));
		}

		@VisibleForTesting
		void flingDividePosition(int from, int to, int duration,
		@Nullable Runnable flingFinishedCallback) {
		void flingDividePosition(int from, int to, @Nullable Runnable flingFinishedCallback) {
		if (from == to) {
		// No animation run, still callback to stop resizing.
		mSplitLayoutHandler.onLayoutSizeChanged(this);
		@@ -566,7 +531,7 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange
		}
		ValueAnimator animator = ValueAnimator
		.ofInt(from, to)
		.setDuration(duration);
		.setDuration(FLING_ANIMATION_DURATION);
		animator.setInterpolator(Interpolators.FAST_OUT_SLOW_IN);
		animator.addUpdateListener(
		animation -> updateDivideBounds((int) animation.getAnimatedValue()));
		@@ -623,7 +588,7 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange

		AnimatorSet set = new AnimatorSet();
		set.playTogether(animator1, animator2, animator3);
		set.setDuration(FLING_SWITCH_DURATION);
		set.setDuration(FLING_ANIMATION_DURATION);
		set.addListener(new AnimatorListenerAdapter() {
		@Override
		public void onAnimationEnd(Animator animation) {

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

+19 −36

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;
		import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS;
		import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
		import static android.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK;
		import static android.content.res.Configuration.SMALLEST_SCREEN_WIDTH_DP_UNDEFINED;
		import static android.view.Display.DEFAULT_DISPLAY;
		import static android.view.RemoteAnimationTarget.MODE_OPENING;
		import static android.view.WindowManager.LayoutParams.TYPE_DOCK_DIVIDER;
		@@ -489,6 +488,13 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		final WindowContainerTransaction wct = new WindowContainerTransaction();
		options = resolveStartStage(STAGE_TYPE_UNDEFINED, position, options, wct);

		// If split still not active, apply windows bounds first to avoid surface reset to
		// wrong pos by SurfaceAnimator from wms.
		// TODO(b/223325631): check is it still necessary after improve enter transition done.
		if (!mMainStage.isActive()) {
		updateWindowBounds(mSplitLayout, wct);
		}

		wct.sendPendingIntent(intent, fillInIntent, options);
		mSyncQueue.queue(transition, WindowManager.TRANSIT_OPEN, wct);
		}
		@@ -635,7 +641,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		wct.startTask(sideTaskId, sideOptions);
		}
		// Using legacy transitions, so we can't use blast sync since it conflicts.
		mSyncQueue.queue(wct);
		mTaskOrganizer.applyTransaction(wct);
		mSyncQueue.runInSync(t -> {
		setDividerVisibility(true, t);
		updateSurfaceBounds(mSplitLayout, t, false /* applyResizingOffset */);
		@@ -887,13 +893,10 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		mShouldUpdateRecents = false;
		mIsDividerRemoteAnimating = false;

		mSplitLayout.getInvisibleBounds(mTempRect1);
		if (childrenToTop == null) {
		mSideStage.removeAllTasks(wct, false /* toTop */);
		mMainStage.deactivate(wct, false /* toTop */);
		wct.reorder(mRootTaskInfo.token, false /* onTop */);
		wct.setForceTranslucent(mRootTaskInfo.token, true);
		wct.setBounds(mSideStage.mRootTaskInfo.token, mTempRect1);
		onTransitionAnimationComplete();
		} else {
		// Expand to top side split as full screen for fading out decor animation and dismiss
		@@ -904,32 +907,27 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		? mSideStage : mMainStage;
		tempFullStage.resetBounds(wct);
		wct.setSmallestScreenWidthDp(tempFullStage.mRootTaskInfo.token,
		SMALLEST_SCREEN_WIDTH_DP_UNDEFINED);
		mRootTaskInfo.configuration.smallestScreenWidthDp);
		dismissStage.dismiss(wct, false /* toTop */);
		}
		mSyncQueue.queue(wct);
		mSyncQueue.runInSync(t -> {
		t.setWindowCrop(mMainStage.mRootLeash, null)
		.setWindowCrop(mSideStage.mRootLeash, null);
		t.setPosition(mMainStage.mRootLeash, 0, 0)
		.setPosition(mSideStage.mRootLeash, 0, 0);
		t.hide(mMainStage.mDimLayer).hide(mSideStage.mDimLayer);
		setDividerVisibility(false, t);

		if (childrenToTop == null) {
		t.setPosition(mSideStage.mRootLeash, mTempRect1.left, mTempRect1.right);
		} else {
		// In this case, exit still under progress, fade out the split decor after first WCT
		// done and do remaining WCT after animation finished.
		if (childrenToTop != null) {
		childrenToTop.fadeOutDecor(() -> {
		WindowContainerTransaction finishedWCT = new WindowContainerTransaction();
		mIsExiting = false;
		childrenToTop.dismiss(finishedWCT, true /* toTop */);
		finishedWCT.reorder(mRootTaskInfo.token, false /* toTop */);
		finishedWCT.setForceTranslucent(mRootTaskInfo.token, true);
		finishedWCT.setBounds(mSideStage.mRootTaskInfo.token, mTempRect1);
		mSyncQueue.queue(finishedWCT);
		mSyncQueue.runInSync(at -> {
		at.setPosition(mSideStage.mRootLeash, mTempRect1.left, mTempRect1.right);
		});
		mTaskOrganizer.applyTransaction(finishedWCT);
		onTransitionAnimationComplete();
		});
		}
		@@ -998,7 +996,6 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		mMainStage.activate(wct, true /* includingTopTask */);
		updateWindowBounds(mSplitLayout, wct);
		wct.reorder(mRootTaskInfo.token, true);
		wct.setForceTranslucent(mRootTaskInfo.token, false);
		}

		void finishEnterSplitScreen(SurfaceControl.Transaction t) {
		@@ -1224,13 +1221,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		// Make the stages adjacent to each other so they occlude what's behind them.
		wct.setAdjacentRoots(mMainStage.mRootTaskInfo.token, mSideStage.mRootTaskInfo.token);
		wct.setLaunchAdjacentFlagRoot(mSideStage.mRootTaskInfo.token);
		wct.setForceTranslucent(mRootTaskInfo.token, true);
		mSplitLayout.getInvisibleBounds(mTempRect1);
		wct.setBounds(mSideStage.mRootTaskInfo.token, mTempRect1);
		mSyncQueue.queue(wct);
		mSyncQueue.runInSync(t -> {
		t.setPosition(mSideStage.mRootLeash, mTempRect1.left, mTempRect1.top);
		});
		mTaskOrganizer.applyTransaction(wct);
		}

		private void onRootTaskVanished() {
		@@ -1386,17 +1377,10 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		// TODO (b/238697912) : Add the validation to prevent entering non-recovered status
		final WindowContainerTransaction wct = new WindowContainerTransaction();
		mSplitLayout.init();
		mSplitLayout.setDividerAtBorder(mSideStagePosition == SPLIT_POSITION_TOP_OR_LEFT);
		mMainStage.activate(wct, true /* includingTopTask */);
		updateWindowBounds(mSplitLayout, wct);
		wct.reorder(mRootTaskInfo.token, true);
		wct.setForceTranslucent(mRootTaskInfo.token, false);
		prepareEnterSplitScreen(wct);
		mSyncQueue.queue(wct);
		mSyncQueue.runInSync(t -> {
		updateSurfaceBounds(mSplitLayout, t, false /* applyResizingOffset */);

		mSplitLayout.flingDividerToCenter();
		});
		mSyncQueue.runInSync(t ->
		updateSurfaceBounds(mSplitLayout, t, false /* applyResizingOffset */));
		}
		if (mMainStageListener.mHasChildren && mSideStageListener.mHasChildren) {
		mShouldUpdateRecents = true;
		@@ -1838,7 +1822,6 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		// properly for the animation itself.
		mSplitLayout.release();
		mSplitLayout.resetDividerPosition();
		mSideStagePosition = SPLIT_POSITION_BOTTOM_OR_RIGHT;
		mTopStageAfterFoldDismiss = STAGE_TYPE_UNDEFINED;
		}
		}