Merge "Use clientVisibility and visibleRequested model for wallpaper" into sc-dev (637ddadc) · Commits · e / os / android_frameworks_base

data/etc/services.core.protolog.json

+18 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,12 @@
		"group": "WM_ERROR",
		"at": "com\/android\/server\/wm\/WindowManagerService.java"
		},
		"-2093859262": {
		"message": "setClientVisible: %s clientVisible=%b Callers=%s",
		"level": "VERBOSE",
		"group": "WM_DEBUG_APP_TRANSITIONS",
		"at": "com\/android\/server\/wm\/WindowToken.java"
		},
		"-2072089308": {
		"message": "Attempted to add window with token that is a sub-window: %s. Aborting.",
		"level": "WARN",
		@@ -1831,6 +1837,12 @@
		"group": "WM_DEBUG_TASKS",
		"at": "com\/android\/server\/wm\/RootWindowContainer.java"
		},
		"63329306": {
		"message": "commitVisibility: %s: visible=%b mVisibleRequested=%b",
		"level": "VERBOSE",
		"group": "WM_DEBUG_WINDOW_TRANSITIONS",
		"at": "com\/android\/server\/wm\/WallpaperWindowToken.java"
		},
		"73987756": {
		"message": "ControlAdapter onAnimationCancelled mSource: %s mControlTarget: %s",
		"level": "INFO",
		@@ -2461,6 +2473,12 @@
		"group": "WM_DEBUG_REMOTE_ANIMATIONS",
		"at": "com\/android\/server\/wm\/RemoteAnimationController.java"
		},
		"691515534": {
		"message": " Commit wallpaper becoming invisible: %s",
		"level": "VERBOSE",
		"group": "WM_DEBUG_WINDOW_TRANSITIONS",
		"at": "com\/android\/server\/wm\/Transition.java"
		},
		"693423992": {
		"message": "setAnimationLocked: setting mFocusMayChange true",
		"level": "INFO",

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

+9 −15

Original line number	Diff line number	Diff line
		@@ -581,9 +581,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A

		private Task mLastParent;

		// Have we told the window clients to show themselves?
		private boolean mClientVisible;

		boolean firstWindowDrawn;
		/** Whether the visible window(s) of this activity is drawn. */
		private boolean mReportedDrawn;
		@@ -999,7 +996,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		pw.print(prefix); pw.print("mOrientation=");
		pw.println(ActivityInfo.screenOrientationToString(mOrientation));
		pw.println(prefix + "mVisibleRequested=" + mVisibleRequested
		+ " mVisible=" + mVisible + " mClientVisible=" + mClientVisible
		+ " mVisible=" + mVisible + " mClientVisible=" + isClientVisible()
		+ ((mDeferHidingClient) ? " mDeferHidingClient=" + mDeferHidingClient : "")
		+ " reportedDrawn=" + mReportedDrawn + " reportedVisible=" + reportedVisible);
		if (paused) {
		@@ -1736,7 +1733,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		keysPaused = false;
		inHistory = false;
		nowVisible = false;
		mClientVisible = true;
		super.setClientVisible(true);
		idle = false;
		hasBeenLaunched = false;
		mTaskSupervisor = supervisor;
		@@ -3776,7 +3773,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		setVisibleRequested(true);
		mVisibleSetFromTransferredStartingWindow = true;
		}
		setClientVisible(fromActivity.mClientVisible);
		setClientVisible(fromActivity.isClientVisible());

		if (fromActivity.isAnimating()) {
		transferAnimation(fromActivity);
		@@ -5877,18 +5874,15 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		return mReportedDrawn;
		}

		boolean isClientVisible() {
		return mClientVisible;
		}

		@Override
		void setClientVisible(boolean clientVisible) {
		if (mClientVisible == clientVisible \|\| (!clientVisible && mDeferHidingClient)) {
		return;
		}
		// TODO(shell-transitions): Remove mDeferHidingClient once everything is shell-transitions.
		// pip activities should just remain in clientVisible.
		if (!clientVisible && mDeferHidingClient) return;
		ProtoLog.v(WM_DEBUG_APP_TRANSITIONS,
		"setClientVisible: %s clientVisible=%b Callers=%s", this, clientVisible,
		Debug.getCallers(5));
		mClientVisible = clientVisible;
		super.setClientVisible(clientVisible);
		sendAppVisibilityToClients();
		}

		@@ -8186,7 +8180,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		proto.write(TRANSLUCENT, !occludesParent());
		proto.write(VISIBLE, mVisible);
		proto.write(VISIBLE_REQUESTED, mVisibleRequested);
		proto.write(CLIENT_VISIBLE, mClientVisible);
		proto.write(CLIENT_VISIBLE, isClientVisible());
		proto.write(DEFER_HIDING_CLIENT, mDeferHidingClient);
		proto.write(REPORTED_DRAWN, mReportedDrawn);
		proto.write(REPORTED_VISIBLE, reportedVisible);

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -4823,7 +4823,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		}
		mNoAnimationNotifyOnTransitionFinished.clear();

		mWallpaperController.hideDeferredWallpapersIfNeeded();
		mWallpaperController.hideDeferredWallpapersIfNeededLegacy();

		onAppTransitionDone();

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -99,6 +99,9 @@ class EnsureActivitiesVisibleHelper {
		mTask.forAllActivities(a -> {
		setActivityVisibilityState(a, starting, resumeTopActivity);
		});
		if (mTask.mAtmService.getTransitionController().getTransitionPlayer() != null) {
		mTask.getDisplayContent().mWallpaperController.adjustWallpaperWindows();
		}
		}

		private void setActivityVisibilityState(ActivityRecord r, ActivityRecord starting,

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

+15 −5

Original line number	Diff line number	Diff line
		@@ -135,6 +135,11 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe
		mSyncId = mSyncEngine.startSyncSet(this);
		}

		@VisibleForTesting
		int getSyncId() {
		return mSyncId;
		}

		/**
		* Formally starts the transition. Participants can be collected before this is started,
		* but this won't consider itself ready until started -- even if all the participants have
		@@ -271,13 +276,18 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe
		// Commit all going-invisible containers
		for (int i = 0; i < mParticipants.size(); ++i) {
		final ActivityRecord ar = mParticipants.valueAt(i).asActivityRecord();
		if (ar == null \|\| ar.mVisibleRequested) {
		continue;
		}
		if (ar != null && !ar.isVisibleRequested()) {
		ProtoLog.v(ProtoLogGroup.WM_DEBUG_WINDOW_TRANSITIONS,
		" Commit activity becoming invisible: %s", ar);
		ar.commitVisibility(false /* visible /, false / performLayout */);
		}
		final WallpaperWindowToken wt = mParticipants.valueAt(i).asWallpaperToken();
		if (wt != null && !wt.isVisibleRequested()) {
		ProtoLog.v(ProtoLogGroup.WM_DEBUG_WINDOW_TRANSITIONS,
		" Commit wallpaper becoming invisible: %s", ar);
		wt.commitVisibility(false /* visible */);
		}
		}
		}

		void abort() {