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

Commit 96181d14 authored by Arthur Hung's avatar Arthur Hung Committed by Automerger Merge Worker
Browse files

Merge changes from topic "presubmit-am-d842c29bd1bd43a78e30c4e5c8765007" into... 

Merge changes from topic "presubmit-am-d842c29bd1bd43a78e30c4e5c8765007" into tm-mainline-prod am: 6b13d60a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17635306



Change-Id: I8eecf318c87d1c0e3e8cb0f73c6e582fd4617e47
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 38182651 6b13d60a

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

+3 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static android.view.WindowManager.LayoutParams.TYPE_MAGNIFICATION_OVERLAY 
import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR;

import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL;

import static android.view.WindowManager.LayoutParams.TYPE_NOTIFICATION_SHADE;

import static android.view.WindowManager.LayoutParams.TYPE_SECURE_SYSTEM_OVERLAY;

import static android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR;

import static android.window.DisplayAreaOrganizer.FEATURE_DEFAULT_TASK_CONTAINER;

import static android.window.DisplayAreaOrganizer.FEATURE_FULLSCREEN_MAGNIFICATION;
@@ -139,7 +140,8 @@ public abstract class DisplayAreaPolicy { 
                        .addFeature(new Feature.Builder(wmService.mPolicy, "OneHanded",

                                FEATURE_ONE_HANDED)

                                .all()

                                .except(TYPE_NAVIGATION_BAR, TYPE_NAVIGATION_BAR_PANEL)

                                .except(TYPE_NAVIGATION_BAR, TYPE_NAVIGATION_BAR_PANEL,

                                        TYPE_SECURE_SYSTEM_OVERLAY)

                                .build());

            }

            rootHierarchy