Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21bc8cce authored by Roy Chou's avatar Roy Chou Committed by Android (Google) Code Review
Browse files

Merge "fix(magnification): fullscreen magnification offset changes when... 

Merge "fix(magnification): fullscreen magnification offset changes when settings panel shows" into main
parents 2a3724b9 906dab2e

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

0 → 100644
+8 −0
Original line number Diff line number Diff line 
package: "com.android.window.flags"



flag {

  name: "do_not_check_intersection_when_non_magnifiable_window_transitions"

  namespace: "accessibility"

  description: "The flag controls whether the intersection check for non-magnifiable windows is needed when onWindowTransition,"

  bug: "312624253"

}
 
 No newline at end of file

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

+6 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ import com.android.server.wm.AccessibilityWindowsPopulator.AccessibilityWindow; 
import com.android.server.wm.WindowManagerInternal.AccessibilityControllerInternal;

import com.android.server.wm.WindowManagerInternal.MagnificationCallbacks;

import com.android.server.wm.WindowManagerInternal.WindowsForAccessibilityCallback;

import com.android.window.flags.Flags;



import java.io.File;

import java.io.IOException;
@@ -758,6 +759,11 @@ final class AccessibilityController { 
                    if (!isMagnifierActivated) {

                        break;

                    }

                    if (Flags.doNotCheckIntersectionWhenNonMagnifiableWindowTransitions()) {

                        if (!windowState.shouldMagnify()) {

                            break;

                        }

                    }

                    switch (type) {

                        case WindowManager.LayoutParams.TYPE_APPLICATION:

                        case WindowManager.LayoutParams.TYPE_DRAWN_APPLICATION: