Merge "Stop rounded corners from confusing magnification" into oc-dr1-dev (9da5ee9e) · Commits · e / os / android_frameworks_base

core/java/android/view/WindowManager.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -1390,6 +1390,13 @@ public interface WindowManager extends ViewManager {
		*/
		public static final int PRIVATE_FLAG_TASK_SNAPSHOT = 0x00080000;

		/**
		* Flag to indicate that this window should be ignored when determining what parts of the
		* screen can be magnified.
		* @hide
		*/
		public static final int PRIVATE_FLAG_NO_MAGNIFICATION_REGION_EFFECT = 0x00100000;

		/**
		* Control flags that are private to the platform.
		* @hide

packages/SystemUI/src/com/android/systemui/RoundedCorners.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -118,7 +118,8 @@ public class RoundedCorners extends SystemUI implements Tunable {
		\| WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED
		,
		PixelFormat.TRANSLUCENT);
		lp.privateFlags \|= WindowManager.LayoutParams.PRIVATE_FLAG_SHOW_FOR_ALL_USERS;
		lp.privateFlags \|= WindowManager.LayoutParams.PRIVATE_FLAG_SHOW_FOR_ALL_USERS
		\| WindowManager.LayoutParams.PRIVATE_FLAG_NO_MAGNIFICATION_REGION_EFFECT;
		lp.setTitle("RoundedOverlay");
		lp.gravity = Gravity.TOP;
		return lp;

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

+9 −11

Original line number	Diff line number	Diff line
		@@ -16,6 +16,9 @@

		package com.android.server.wm;

		import static android.view.WindowManager.LayoutParams.TYPE_MAGNIFICATION_OVERLAY;
		import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_NO_MAGNIFICATION_REGION_EFFECT;

		import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME;
		import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM;

		@@ -418,13 +421,7 @@ final class AccessibilityController {
		public MagnificationSpec getMagnificationSpecForWindowLocked(WindowState windowState) {
		MagnificationSpec spec = mMagnifedViewport.getMagnificationSpecLocked();
		if (spec != null && !spec.isNop()) {
		WindowManagerPolicy policy = mWindowManagerService.mPolicy;
		final int windowType = windowState.mAttrs.type;
		if (!policy.isTopLevelWindow(windowType) && windowState.isChildWindow()
		&& !policy.canMagnifyWindow(windowType)) {
		return null;
		}
		if (!policy.canMagnifyWindow(windowState.mAttrs.type)) {
		if (!mWindowManagerService.mPolicy.canMagnifyWindow(windowState.mAttrs.type)) {
		return null;
		}
		}
		@@ -540,8 +537,9 @@ final class AccessibilityController {
		final int visibleWindowCount = visibleWindows.size();
		for (int i = visibleWindowCount - 1; i >= 0; i--) {
		WindowState windowState = visibleWindows.valueAt(i);
		if (windowState.mAttrs.type == WindowManager
		.LayoutParams.TYPE_MAGNIFICATION_OVERLAY) {
		if ((windowState.mAttrs.type == TYPE_MAGNIFICATION_OVERLAY)
		\|\| ((windowState.mAttrs.privateFlags
		& PRIVATE_FLAG_NO_MAGNIFICATION_REGION_EFFECT) != 0)) {
		continue;
		}

		@@ -715,7 +713,7 @@ final class AccessibilityController {
		mSurfaceControl.setLayerStack(mWindowManager.getDefaultDisplay()
		.getLayerStack());
		mSurfaceControl.setLayer(mWindowManagerService.mPolicy.getWindowLayerFromTypeLw(
		WindowManager.LayoutParams.TYPE_MAGNIFICATION_OVERLAY)
		TYPE_MAGNIFICATION_OVERLAY)
		* WindowManagerService.TYPE_LAYER_MULTIPLIER);
		mSurfaceControl.setPosition(0, 0);
		mSurface.copyFrom(mSurfaceControl);
		@@ -1313,7 +1311,7 @@ final class AccessibilityController {
		&& windowType != WindowManager.LayoutParams.TYPE_DRAG
		&& windowType != WindowManager.LayoutParams.TYPE_INPUT_CONSUMER
		&& windowType != WindowManager.LayoutParams.TYPE_POINTER
		&& windowType != WindowManager.LayoutParams.TYPE_MAGNIFICATION_OVERLAY
		&& windowType != TYPE_MAGNIFICATION_OVERLAY
		&& windowType != WindowManager.LayoutParams.TYPE_APPLICATION_MEDIA_OVERLAY
		&& windowType != WindowManager.LayoutParams.TYPE_SECURE_SYSTEM_OVERLAY
		&& windowType != WindowManager.LayoutParams.TYPE_PRIVATE_PRESENTATION);