Merge "Remove ActivityRecord mDeferHidingClient since shell transition enabled" into main (2c478a02) · Commits · e / os / android_frameworks_base

core/java/android/window/flags/windowing_frontend.aconfig

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -454,6 +454,17 @@ flag {
	bug: "376407910"		bug: "376407910"
	}		}

			flag {
			name: "remove_defer_hiding_client"
			namespace: "windowing_frontend"
			description: "Remove mDeferHidingClient since everything is in shell-transition."
			is_fixed_read_only: true
			bug: "382485959"
			metadata {
			purpose: PURPOSE_BUGFIX
			}
			}

	flag {		flag {
	name: "relative_insets"		name: "relative_insets"
	namespace: "windowing_frontend"		namespace: "windowing_frontend"

+11 −3

Original line number	Original line	Diff line number	Diff line
	@@ -5408,10 +5408,16 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
	}		}

	void setDeferHidingClient() {		void setDeferHidingClient() {
			if (Flags.removeDeferHidingClient()) {
			return;
			}
	mDeferHidingClient = true;		mDeferHidingClient = true;
	}		}

	void clearDeferHidingClient() {		void clearDeferHidingClient() {
			if (Flags.removeDeferHidingClient()) {
			return;
			}
	if (!mDeferHidingClient) return;		if (!mDeferHidingClient) return;
	mDeferHidingClient = false;		mDeferHidingClient = false;
	if (!mVisibleRequested) {		if (!mVisibleRequested) {
	@@ -7141,9 +7147,11 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A

	@Override		@Override
	void setClientVisible(boolean clientVisible) {		void setClientVisible(boolean clientVisible) {
	// TODO(shell-transitions): Remove mDeferHidingClient once everything is shell-transitions.		if (!Flags.removeDeferHidingClient()) {
	// pip activities should just remain in clientVisible.		// TODO(shell-transitions): Remove mDeferHidingClient once everything is
			// shell-transitions. pip activities should just remain in clientVisible.
	if (!clientVisible && mDeferHidingClient) return;		if (!clientVisible && mDeferHidingClient) return;
			}
	super.setClientVisible(clientVisible);		super.setClientVisible(clientVisible);
	}		}