Merge "Remove remaining insets system UI flags in DisplayPolicy" (9704a8c4) · Commits · e / os / android_frameworks_base

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

+1 −339

Original line number	Diff line number	Diff line
		@@ -16,88 +16,19 @@

		package com.android.server.wm;

		import static com.android.server.wm.BarControllerProto.STATE;
		import static com.android.server.wm.BarControllerProto.TRANSIENT_STATE;

		import android.annotation.NonNull;
		import android.app.StatusBarManager;
		import android.graphics.Rect;
		import android.os.Handler;
		import android.os.Message;
		import android.os.SystemClock;
		import android.util.Slog;
		import android.util.proto.ProtoOutputStream;
		import android.view.View;
		import android.view.ViewRootImpl;
		import android.view.WindowManager;

		import com.android.server.LocalServices;
		import com.android.server.UiThread;
		import com.android.server.statusbar.StatusBarManagerInternal;

		import java.io.PrintWriter;

		/**
		* Controls state/behavior specific to a system bar window.
		*/
		public class BarController {
		private static final boolean DEBUG = false;

		private static final int TRANSIENT_BAR_NONE = 0;
		private static final int TRANSIENT_BAR_SHOW_REQUESTED = 1;
		private static final int TRANSIENT_BAR_SHOWING = 2;
		private static final int TRANSIENT_BAR_HIDING = 3;

		private static final int TRANSLUCENT_ANIMATION_DELAY_MS = 1000;

		private static final int MSG_NAV_BAR_VISIBILITY_CHANGED = 1;

		protected final String mTag;
		protected final int mDisplayId;
		private final int mTransientFlag;
		private final int mUnhideFlag;
		private final int mTranslucentFlag;
		private final int mTransparentFlag;
		private final int mStatusBarManagerId;
		private final int mTranslucentWmFlag;
		private final int mWindowType;
		protected final Handler mHandler;
		private final Object mServiceAquireLock = new Object();
		private StatusBarManagerInternal mStatusBarInternal;

		protected WindowState mWin;
		private @StatusBarManager.WindowVisibleState int mState =
		StatusBarManager.WINDOW_STATE_SHOWING;
		private int mTransientBarState;
		private boolean mPendingShow;
		private long mLastTranslucent;
		private boolean mShowTransparent;
		private boolean mSetUnHideFlagWhenNextTransparent;
		private boolean mNoAnimationOnNextShow;
		private final Rect mContentFrame = new Rect();

		private OnBarVisibilityChangedListener mVisibilityChangeListener;

		BarController(String tag, int displayId, int transientFlag, int unhideFlag, int translucentFlag,
		int statusBarManagerId, int windowType, int translucentWmFlag, int transparentFlag) {
		mTag = "BarController." + tag;
		mDisplayId = displayId;
		mTransientFlag = transientFlag;
		mUnhideFlag = unhideFlag;
		mTranslucentFlag = translucentFlag;
		mStatusBarManagerId = statusBarManagerId;
		BarController(int windowType) {
		mWindowType = windowType;
		mTranslucentWmFlag = translucentWmFlag;
		mTransparentFlag = transparentFlag;
		mHandler = new BarHandler();
		}

		void setWindow(WindowState win) {
		if (ViewRootImpl.sNewInsetsMode == ViewRootImpl.NEW_INSETS_MODE_FULL) {
		// BarController gets replaced with InsetsPolicy in the full insets mode.
		return;
		}
		mWin = win;
		}

		/**
		@@ -109,67 +40,6 @@ public class BarController {
		mContentFrame.set(frame);
		}

		void setShowTransparent(boolean transparent) {
		if (transparent != mShowTransparent) {
		mShowTransparent = transparent;
		mSetUnHideFlagWhenNextTransparent = transparent;
		mNoAnimationOnNextShow = true;
		}
		}

		void showTransient() {
		if (mWin != null) {
		setTransientBarState(TRANSIENT_BAR_SHOW_REQUESTED);
		}
		}

		boolean isTransientShowing() {
		return mTransientBarState == TRANSIENT_BAR_SHOWING;
		}

		boolean isTransientShowRequested() {
		return mTransientBarState == TRANSIENT_BAR_SHOW_REQUESTED;
		}

		boolean wasRecentlyTranslucent() {
		return (SystemClock.uptimeMillis() - mLastTranslucent) < TRANSLUCENT_ANIMATION_DELAY_MS;
		}

		void adjustSystemUiVisibilityLw(int oldVis, int vis) {
		if (mWin != null && mTransientBarState == TRANSIENT_BAR_SHOWING
		&& (vis & mTransientFlag) == 0) {
		// sysui requests hide
		setTransientBarState(TRANSIENT_BAR_HIDING);
		setBarShowingLw(false);
		} else if (mWin != null && (oldVis & mUnhideFlag) != 0 && (vis & mUnhideFlag) == 0) {
		// sysui ready to unhide
		setBarShowingLw(true);
		}
		}

		int applyTranslucentFlagLw(WindowState win, int vis, int oldVis) {
		if (mWin != null) {
		if (win != null) {
		int fl = PolicyControl.getWindowFlags(win, null);
		if ((fl & mTranslucentWmFlag) != 0) {
		vis \|= mTranslucentFlag;
		} else {
		vis &= ~mTranslucentFlag;
		}
		if ((fl & WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS) != 0
		&& isTransparentAllowed(win)) {
		vis \|= mTransparentFlag;
		} else {
		vis &= ~mTransparentFlag;
		}
		} else {
		vis = (vis & ~mTranslucentFlag) \| (oldVis & mTranslucentFlag);
		vis = (vis & ~mTransparentFlag) \| (oldVis & mTransparentFlag);
		}
		}
		return vis;
		}

		private Rect getContentFrame(@NonNull WindowState win) {
		final Rect rotatedContentFrame = win.mToken.getFixedRotationBarContentFrame(mWindowType);
		return rotatedContentFrame != null ? rotatedContentFrame : mContentFrame;
		@@ -188,212 +58,4 @@ public class BarController {
		}
		return win.letterboxNotIntersectsOrFullyContains(getContentFrame(win));
		}

		boolean setBarShowingLw(final boolean show) {
		if (mWin == null) return false;
		if (show && mTransientBarState == TRANSIENT_BAR_HIDING) {
		mPendingShow = true;
		return false;
		}
		final boolean wasVis = mWin.isVisibleLw();
		final boolean wasAnim = mWin.isAnimatingLw();
		final boolean skipAnim = skipAnimation();
		final boolean change = show ? mWin.showLw(!mNoAnimationOnNextShow && !skipAnim)
		: mWin.hideLw(!mNoAnimationOnNextShow && !skipAnim);
		mNoAnimationOnNextShow = false;
		final int state = computeStateLw(wasVis, wasAnim, mWin, change);
		final boolean stateChanged = updateStateLw(state);

		if (change && (mVisibilityChangeListener != null)) {
		mHandler.obtainMessage(MSG_NAV_BAR_VISIBILITY_CHANGED, show ? 1 : 0, 0).sendToTarget();
		}

		return change \|\| stateChanged;
		}

		void setOnBarVisibilityChangedListener(OnBarVisibilityChangedListener listener,
		boolean invokeWithState) {
		mVisibilityChangeListener = listener;
		if (invokeWithState) {
		// Optionally report the initial window state for initialization purposes
		mHandler.obtainMessage(MSG_NAV_BAR_VISIBILITY_CHANGED,
		(mState == StatusBarManager.WINDOW_STATE_SHOWING) ? 1 : 0, 0).sendToTarget();
		}
		}

		protected boolean skipAnimation() {
		return !mWin.isDrawn();
		}

		private @StatusBarManager.WindowVisibleState int computeStateLw(
		boolean wasVis, boolean wasAnim, WindowState win, boolean change) {
		if (win.isDrawn()) {
		final boolean vis = win.isVisibleLw();
		final boolean anim = win.isAnimatingLw();
		if (mState == StatusBarManager.WINDOW_STATE_HIDING && !change && !vis) {
		return StatusBarManager.WINDOW_STATE_HIDDEN;
		} else if (mState == StatusBarManager.WINDOW_STATE_HIDDEN && vis) {
		return StatusBarManager.WINDOW_STATE_SHOWING;
		} else if (change) {
		if (wasVis && vis && !wasAnim && anim) {
		return StatusBarManager.WINDOW_STATE_HIDING;
		} else {
		return StatusBarManager.WINDOW_STATE_SHOWING;
		}
		}
		}
		return mState;
		}

		private boolean updateStateLw(@StatusBarManager.WindowVisibleState final int state) {
		if (mWin != null && state != mState) {
		mState = state;
		if (DEBUG) Slog.d(mTag, "mState: " + StatusBarManager.windowStateToString(state));
		mHandler.post(new Runnable() {
		@Override
		public void run() {
		StatusBarManagerInternal statusbar = getStatusBarInternal();
		if (statusbar != null) {
		statusbar.setWindowState(mDisplayId, mStatusBarManagerId, state);
		}
		}
		});
		return true;
		}
		return false;
		}

		boolean checkHiddenLw() {
		if (mWin != null && mWin.isDrawn()) {
		if (!mWin.isVisibleLw() && !mWin.isAnimatingLw()) {
		updateStateLw(StatusBarManager.WINDOW_STATE_HIDDEN);
		}
		if (mTransientBarState == TRANSIENT_BAR_HIDING && !mWin.isVisibleLw()) {
		// Finished animating out, clean up and reset style
		setTransientBarState(TRANSIENT_BAR_NONE);
		if (mPendingShow) {
		setBarShowingLw(true);
		mPendingShow = false;
		}
		return true;
		}
		}
		return false;
		}

		boolean checkShowTransientBarLw() {
		if (mTransientBarState == TRANSIENT_BAR_SHOWING) {
		if (DEBUG) Slog.d(mTag, "Not showing transient bar, already shown");
		return false;
		} else if (mTransientBarState == TRANSIENT_BAR_SHOW_REQUESTED) {
		if (DEBUG) Slog.d(mTag, "Not showing transient bar, already requested");
		return false;
		} else if (mWin == null) {
		if (DEBUG) Slog.d(mTag, "Not showing transient bar, bar doesn't exist");
		return false;
		} else if (mWin.isDisplayed()) {
		if (DEBUG) Slog.d(mTag, "Not showing transient bar, bar already visible");
		return false;
		} else {
		return true;
		}
		}

		int updateVisibilityLw(boolean transientAllowed, int oldVis, int vis) {
		if (mWin == null) return vis;
		if (isTransientShowing() \|\| isTransientShowRequested()) { // transient bar requested
		if (transientAllowed) {
		vis \|= mTransientFlag;
		if ((oldVis & mTransientFlag) == 0) {
		vis \|= mUnhideFlag; // tell sysui we're ready to unhide
		}
		setTransientBarState(TRANSIENT_BAR_SHOWING); // request accepted
		} else {
		setTransientBarState(TRANSIENT_BAR_NONE); // request denied
		}
		}
		if (mShowTransparent) {
		vis \|= mTransparentFlag;
		if (mSetUnHideFlagWhenNextTransparent) {
		vis \|= mUnhideFlag;
		mSetUnHideFlagWhenNextTransparent = false;
		}
		}
		if (mTransientBarState != TRANSIENT_BAR_NONE) {
		vis \|= mTransientFlag; // ignore clear requests until transition completes
		vis &= ~View.SYSTEM_UI_FLAG_LOW_PROFILE; // never show transient bars in low profile
		}
		if ((vis & mTranslucentFlag) != 0 \|\| (oldVis & mTranslucentFlag) != 0
		\|\| ((vis \| oldVis) & mTransparentFlag) != 0) {
		mLastTranslucent = SystemClock.uptimeMillis();
		}
		return vis;
		}

		private void setTransientBarState(int state) {
		if (mWin != null && state != mTransientBarState) {
		if (mTransientBarState == TRANSIENT_BAR_SHOWING \|\| state == TRANSIENT_BAR_SHOWING) {
		mLastTranslucent = SystemClock.uptimeMillis();
		}
		mTransientBarState = state;
		if (DEBUG) Slog.d(mTag, "mTransientBarState: " + transientBarStateToString(state));
		}
		}

		protected StatusBarManagerInternal getStatusBarInternal() {
		synchronized (mServiceAquireLock) {
		if (mStatusBarInternal == null) {
		mStatusBarInternal = LocalServices.getService(StatusBarManagerInternal.class);
		}
		return mStatusBarInternal;
		}
		}

		private static String transientBarStateToString(int state) {
		if (state == TRANSIENT_BAR_HIDING) return "TRANSIENT_BAR_HIDING";
		if (state == TRANSIENT_BAR_SHOWING) return "TRANSIENT_BAR_SHOWING";
		if (state == TRANSIENT_BAR_SHOW_REQUESTED) return "TRANSIENT_BAR_SHOW_REQUESTED";
		if (state == TRANSIENT_BAR_NONE) return "TRANSIENT_BAR_NONE";
		throw new IllegalArgumentException("Unknown state " + state);
		}

		void dumpDebug(ProtoOutputStream proto, long fieldId) {
		final long token = proto.start(fieldId);
		proto.write(STATE, mState);
		proto.write(TRANSIENT_STATE, mTransientBarState);
		proto.end(token);
		}

		void dump(PrintWriter pw, String prefix) {
		if (mWin != null) {
		pw.print(prefix); pw.println(mTag);
		pw.print(prefix); pw.print(" "); pw.print("mState"); pw.print('=');
		pw.println(StatusBarManager.windowStateToString(mState));
		pw.print(prefix); pw.print(" "); pw.print("mTransientBar"); pw.print('=');
		pw.println(transientBarStateToString(mTransientBarState));
		pw.print(prefix); pw.print(" mContentFrame="); pw.println(mContentFrame);
		}
		}

		private class BarHandler extends Handler {
		BarHandler() {
		super(UiThread.getHandler().getLooper());
		}

		@Override
		public void handleMessage(Message msg) {
		switch (msg.what) {
		case MSG_NAV_BAR_VISIBILITY_CHANGED:
		final boolean visible = msg.arg1 != 0;
		if (mVisibilityChangeListener != null) {
		mVisibilityChangeListener.onBarVisibilityChanged(visible);
		}
		break;
		}
		}
		}

		interface OnBarVisibilityChangedListener {
		void onBarVisibilityChanged(boolean visible);
		}
		}

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

+6 −24

Original line number	Diff line number	Diff line
		@@ -192,7 +192,6 @@ import android.view.SurfaceControl;
		import android.view.SurfaceControl.Transaction;
		import android.view.SurfaceSession;
		import android.view.View;
		import android.view.ViewRootImpl;
		import android.view.WindowInsets;
		import android.view.WindowManager;
		import android.view.WindowManagerPolicyConstants.PointerEventListener;
		@@ -3744,7 +3743,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp

		void statusBarVisibilityChanged(int visibility) {
		mLastStatusBarVisibility = visibility;
		visibility = getDisplayPolicy().adjustSystemUiVisibilityLw(visibility);
		updateStatusBarVisibilityLocked(visibility);
		}

		@@ -3769,7 +3767,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp

		void updateSystemUiVisibility(int visibility, int globalDiff) {
		forAllWindows(w -> {
		try {
		final int curValue = w.mSystemUiVisibility;
		final int diff = (curValue ^ visibility) & globalDiff;
		final int newValue = (curValue & ~diff) \| (visibility & diff);
		@@ -3777,24 +3774,9 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		w.mSeq++;
		w.mSystemUiVisibility = newValue;
		}
		if ((newValue != curValue \|\| w.mAttrs.hasSystemUiListeners)
		&& ViewRootImpl.sNewInsetsMode != ViewRootImpl.NEW_INSETS_MODE_FULL) {
		w.mClient.dispatchSystemUiVisibilityChanged(w.mSeq,
		visibility, newValue, diff);
		}
		} catch (RemoteException e) {
		// so sorry
		}
		}, true /* traverseTopToBottom */);
		}

		void reevaluateStatusBarVisibility() {
		int visibility = getDisplayPolicy().adjustSystemUiVisibilityLw(mLastStatusBarVisibility);
		if (updateStatusBarVisibilityLocked(visibility)) {
		mWmService.mWindowPlacerLocked.requestTraversal();
		}
		}

		void onWindowFreezeTimeout() {
		Slog.w(TAG_WM, "Window freeze timeout expired.");
		mWmService.mWindowsFreezingScreen = WINDOWS_FREEZING_SCREENS_TIMEOUT;

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

+164 −454

File changed.

Preview size limit exceeded, changes collapsed.

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

deleted100644 → 0

+0 −109

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2018 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.server.wm;

		import static android.view.WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS;
		import static android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR;

		import static com.android.server.wm.WindowManagerInternal.AppTransitionListener;

		import android.app.StatusBarManager;
		import android.os.IBinder;
		import android.view.View;

		import com.android.server.statusbar.StatusBarManagerInternal;

		/**
		* Implements status bar specific behavior.
		*/
		public class StatusBarController extends BarController {

		private final AppTransitionListener mAppTransitionListener = new AppTransitionListener() {

		private Runnable mAppTransitionPending = () -> {
		StatusBarManagerInternal statusBar = getStatusBarInternal();
		if (statusBar != null) {
		statusBar.appTransitionPending(mDisplayId);
		}
		};

		private Runnable mAppTransitionCancelled = () -> {
		StatusBarManagerInternal statusBar = getStatusBarInternal();
		if (statusBar != null) {
		statusBar.appTransitionCancelled(mDisplayId);
		}
		};

		private Runnable mAppTransitionFinished = () -> {
		StatusBarManagerInternal statusBar = getStatusBarInternal();
		if (statusBar != null) {
		statusBar.appTransitionFinished(mDisplayId);
		}
		};

		@Override
		public void onAppTransitionPendingLocked() {
		mHandler.post(mAppTransitionPending);
		}

		@Override
		public int onAppTransitionStartingLocked(int transit, long duration,
		long statusBarAnimationStartTime, long statusBarAnimationDuration) {
		mHandler.post(() -> {
		StatusBarManagerInternal statusBar = getStatusBarInternal();
		if (statusBar != null) {
		statusBar.appTransitionStarting(mDisplayId,
		statusBarAnimationStartTime, statusBarAnimationDuration);
		}
		});
		return 0;
		}

		@Override
		public void onAppTransitionCancelledLocked(int transit) {
		mHandler.post(mAppTransitionCancelled);
		}

		@Override
		public void onAppTransitionFinishedLocked(IBinder token) {
		mHandler.post(mAppTransitionFinished);
		}
		};

		StatusBarController(int displayId) {
		super("StatusBar",
		displayId,
		View.STATUS_BAR_TRANSIENT,
		View.STATUS_BAR_UNHIDE,
		View.STATUS_BAR_TRANSLUCENT,
		StatusBarManager.WINDOW_STATUS_BAR,
		TYPE_STATUS_BAR,
		FLAG_TRANSLUCENT_STATUS,
		View.STATUS_BAR_TRANSPARENT);
		}

		void setTopAppHidesStatusBar(boolean hidesStatusBar) {
		StatusBarManagerInternal statusBar = getStatusBarInternal();
		if (statusBar != null) {
		statusBar.setTopAppHidesStatusBar(hidesStatusBar);
		}
		}

		AppTransitionListener getAppTransitionListener() {
		return mAppTransitionListener;
		}
		}

services/tests/wmtests/src/com/android/server/wm/DisplayPolicyLayoutTests.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -124,7 +124,7 @@ public class DisplayPolicyLayoutTests extends DisplayPolicyTestsBase {
		spyOn(mNavBarWindow);

		// Disabling this call for most tests since it can override the systemUiFlags when called.
		doReturn(0).when(mDisplayPolicy).updateSystemUiVisibilityLw();
		doReturn(false).when(mDisplayPolicy).updateSystemUiVisibilityLw();

		updateDisplayFrames();
		}