Merge "Update DisplayContent tap exclude region on window resize" into oc-mr1-dev (43bc0adc) · Commits · e / os / android_frameworks_base

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -2126,8 +2126,9 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
		pw.print("x"); pw.print(mDisplayInfo.smallestNominalAppHeight);
		pw.print("-"); pw.print(mDisplayInfo.largestNominalAppWidth);
		pw.print("x"); pw.println(mDisplayInfo.largestNominalAppHeight);
		pw.println(subPrefix + "deferred=" + mDeferredRemoval
		pw.print(subPrefix + "deferred=" + mDeferredRemoval
		+ " mLayoutNeeded=" + mLayoutNeeded);
		pw.println(" mTouchExcludeRegion=" + mTouchExcludeRegion);

		pw.println();
		pw.println(prefix + "Application tokens in top down Z order:");

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

+43 −13

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ import android.os.RemoteException;
		import android.os.SystemClock;
		import android.os.UserHandle;
		import android.provider.Settings;
		import android.util.ArraySet;
		import android.util.EventLog;
		import android.util.Slog;
		import android.util.SparseIntArray;
		@@ -663,19 +664,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> {
		defaultDisplay.pendingLayoutChanges);
		}

		for (i = mService.mResizingWindows.size() - 1; i >= 0; i--) {
		WindowState win = mService.mResizingWindows.get(i);
		if (win.mAppFreezing) {
		// Don't remove this window until rotation has completed.
		continue;
		}
		// Discard the saved surface if window size is changed, it can't be reused.
		if (win.mAppToken != null) {
		win.mAppToken.destroySavedSurfaces();
		}
		win.reportResized();
		mService.mResizingWindows.remove(i);
		}
		final ArraySet<DisplayContent> touchExcludeRegionUpdateDisplays = handleResizingWindows();

		if (DEBUG_ORIENTATION && mService.mDisplayFrozen) Slog.v(TAG,
		"With display frozen, orientationChangeComplete=" + mOrientationChangeComplete);
		@@ -817,6 +806,16 @@ class RootWindowContainer extends WindowContainer<DisplayContent> {
		mService.mInputMonitor.updateInputWindowsLw(false /force/);
		}
		mService.setFocusTaskRegionLocked(null);
		if (touchExcludeRegionUpdateDisplays != null) {
		final DisplayContent focusedDc = mService.mFocusedApp != null
		? mService.mFocusedApp.getDisplayContent() : null;
		for (DisplayContent dc : touchExcludeRegionUpdateDisplays) {
		// The focused DisplayContent was recalcuated in setFocusTaskRegionLocked
		if (focusedDc != dc) {
		dc.setTouchExcludeRegion(null /* focusedTask */);
		}
		}
		}

		// Check to see if we are now in a state where the screen should
		// be enabled, because the window obscured flags have changed.
		@@ -867,6 +866,37 @@ class RootWindowContainer extends WindowContainer<DisplayContent> {
		mService.mDisplayManagerInternal.performTraversalInTransactionFromWindowManager();
		}

		/**
		* Handles resizing windows during surface placement.
		*
		* @return A set of any DisplayContent whose touch exclude region needs to be recalculated due
		* to a tap-exclude window resizing, or null if no such DisplayContents were found.
		*/
		private ArraySet<DisplayContent> handleResizingWindows() {
		ArraySet<DisplayContent> touchExcludeRegionUpdateSet = null;
		for (int i = mService.mResizingWindows.size() - 1; i >= 0; i--) {
		WindowState win = mService.mResizingWindows.get(i);
		if (win.mAppFreezing) {
		// Don't remove this window until rotation has completed.
		continue;
		}
		// Discard the saved surface if window size is changed, it can't be reused.
		if (win.mAppToken != null) {
		win.mAppToken.destroySavedSurfaces();
		}
		win.reportResized();
		mService.mResizingWindows.remove(i);
		if (WindowManagerService.excludeWindowTypeFromTapOutTask(win.mAttrs.type)) {
		final DisplayContent dc = win.getDisplayContent();
		if (touchExcludeRegionUpdateSet == null) {
		touchExcludeRegionUpdateSet = new ArraySet<>();
		}
		touchExcludeRegionUpdateSet.add(dc);
		}
		}
		return touchExcludeRegionUpdateSet;
		}

		/**
		* @param w WindowState this method is applied to.
		* @param obscured True if there is a window on top of this obscuring the display.