Merge "Reland "Fixed constant window switching on lock screen..."" into mnc-dev (63c4a718) · Commits · e / os / android_frameworks_base

core/java/android/view/WindowManagerPolicy.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -916,9 +916,10 @@ public interface WindowManagerPolicy {
		*
		* @param win The window being positioned.
		* @param attrs The LayoutParams of the window.
		* @param attached For sub-windows, the window it is attached to. Otherwise null.
		*/
		public void applyPostLayoutPolicyLw(WindowState win,
		WindowManager.LayoutParams attrs);
		WindowManager.LayoutParams attrs, WindowState attached);

		/**
		* Called following layout of all windows and after policy has been applied

+8 −3

Original line number	Diff line number	Diff line
		@@ -4251,7 +4251,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {

		/** {@inheritDoc} */
		@Override
		public void applyPostLayoutPolicyLw(WindowState win, WindowManager.LayoutParams attrs) {
		public void applyPostLayoutPolicyLw(WindowState win, WindowManager.LayoutParams attrs,
		WindowState attached) {
		if (DEBUG_LAYOUT) Slog.i(TAG, "Win " + win + ": isVisibleOrBehindKeyguardLw="
		+ win.isVisibleOrBehindKeyguardLw());
		final int fl = PolicyControl.getWindowFlags(win, attrs);
		@@ -4296,8 +4297,12 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		}
		}

		if (appWindow) {
		final IApplicationToken appToken = win.getAppToken();

		// For app windows that are not attached, we decide if all windows in the app they
		// represent should be hidden or if we should hide the lockscreen. For attached app
		// windows we defer the decision to the window it is attached to.
		if (appWindow && attached == null) {
		if (showWhenLocked) {
		// Remove any previous windows with the same appToken.
		mAppsToBeHidden.remove(appToken);

+1 −1

Original line number	Diff line number	Diff line
		@@ -9937,7 +9937,7 @@ public class WindowManagerService extends IWindowManager.Stub
		for (i = windows.size() - 1; i >= 0; i--) {
		WindowState w = windows.get(i);
		if (w.mHasSurface) {
		mPolicy.applyPostLayoutPolicyLw(w, w.mAttrs);
		mPolicy.applyPostLayoutPolicyLw(w, w.mAttrs, w.mAttachedWindow);
		}
		}
		displayContent.pendingLayoutChanges \|= mPolicy.finishPostLayoutPolicyLw();