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

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

Merge "chore(magnification): cleanup... 

Merge "chore(magnification): cleanup do_not_check_intersection_when_non_magnifiable_window_transitions flag usage" into main
parents 841ea736 e4cf08c9

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

+1 −6
Original line number Diff line number Diff line
@@ -817,14 +817,9 @@ final class AccessibilityController { 
            switch (transition) {

                case WindowManagerPolicy.TRANSIT_ENTER:

                case WindowManagerPolicy.TRANSIT_SHOW: {

                    if (!isMagnifierActivated) {

                    if (!isMagnifierActivated || !windowState.shouldMagnify()) {

                        break;

                    }

                    if (Flags.doNotCheckIntersectionWhenNonMagnifiableWindowTransitions()) {

                        if (!windowState.shouldMagnify()) {

                            break;

                        }

                    }

                    switch (type) {

                        case WindowManager.LayoutParams.TYPE_APPLICATION:

                        case WindowManager.LayoutParams.TYPE_DRAWN_APPLICATION: