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

Commit b02b9f11 authored by Tracy Zhou's avatar Tracy Zhou
Browse files

Do not zoom out window types above TYPE_VOLUME_OVERLAY (Reland) 

Order matters! upTo() overrides except()!

Fixes: 400727533
Test: manual
Flag: com.android.systemui.spatial_model_app_pushback
Change-Id: I1ba848eb1d3c810b63c810068588d50d7068edb2
parent 0d36a90c

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

+2 −1
Original line number Diff line number Diff line
@@ -165,9 +165,10 @@ public abstract class DisplayAreaPolicy { 
                        .addFeature(new Feature.Builder(wmService.mPolicy, "AppZoomOut",

                                FEATURE_APP_ZOOM_OUT)

                                .all()

                                .upTo(TYPE_VOLUME_OVERLAY)

                                .except(TYPE_NAVIGATION_BAR, TYPE_NAVIGATION_BAR_PANEL,

                                        TYPE_STATUS_BAR, TYPE_NOTIFICATION_SHADE,

                                        TYPE_KEYGUARD_DIALOG, TYPE_WALLPAPER, TYPE_VOLUME_OVERLAY)

                                        TYPE_KEYGUARD_DIALOG, TYPE_WALLPAPER)

                                .build());

            }

            if (USE_DISPLAY_AREA_FOR_FULLSCREEN_MAGNIFICATION) {