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

Commit 40c5c918 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Make inline suggestions tooltip is not magnified" into sc-dev am: cac7ab9c 

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

Change-Id: I98d82d1d46e2755c8ac5fc6e7222ba0b00870d79
parents 6ba39309 cac7ab9c

core/java/android/view/WindowManager.java

+13 −0
Original line number Diff line number Diff line
@@ -2370,6 +2370,14 @@ public interface WindowManager extends ViewManager { 
         */

        public static final int PRIVATE_FLAG_IS_ROUNDED_CORNERS_OVERLAY = 0x00100000;



        /**

         * Flag to prevent the window from being magnified by the accessibility magnifier.

         *

         * TODO(b/190623172): This is a temporary solution and need to find out another way instead.

         * @hide

         */

        public static final int PRIVATE_FLAG_NOT_MAGNIFIABLE = 0x00400000;



        /**

         * Flag to indicate that the status bar window is in a state such that it forces showing

         * the navigation bar unless the navigation bar window is explicitly set to
@@ -2473,6 +2481,7 @@ public interface WindowManager extends ViewManager { 
                PRIVATE_FLAG_SUSTAINED_PERFORMANCE_MODE,

                SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS,

                PRIVATE_FLAG_IS_ROUNDED_CORNERS_OVERLAY,

                PRIVATE_FLAG_NOT_MAGNIFIABLE,

                PRIVATE_FLAG_STATUS_FORCE_SHOW_NAVIGATION,

                PRIVATE_FLAG_COLOR_SPACE_AGNOSTIC,

                PRIVATE_FLAG_USE_BLAST,
@@ -2552,6 +2561,10 @@ public interface WindowManager extends ViewManager { 
                        mask = PRIVATE_FLAG_IS_ROUNDED_CORNERS_OVERLAY,

                        equals = PRIVATE_FLAG_IS_ROUNDED_CORNERS_OVERLAY,

                        name = "IS_ROUNDED_CORNERS_OVERLAY"),

                @ViewDebug.FlagToString(

                        mask = PRIVATE_FLAG_NOT_MAGNIFIABLE,

                        equals = PRIVATE_FLAG_NOT_MAGNIFIABLE,

                        name = "NOT_MAGNIFIABLE"),

                @ViewDebug.FlagToString(

                        mask = PRIVATE_FLAG_STATUS_FORCE_SHOW_NAVIGATION,

                        equals = PRIVATE_FLAG_STATUS_FORCE_SHOW_NAVIGATION,

core/java/com/android/internal/view/inline/InlineTooltipUi.java

+2 −0
Original line number Diff line number Diff line
@@ -213,6 +213,8 @@ public final class InlineTooltipUi extends PopupWindow implements AutoCloseable 
            if (!mShowing) {

                params.flags = WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL

                        | WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;

                params.privateFlags |=

                        WindowManager.LayoutParams.PRIVATE_FLAG_NOT_MAGNIFIABLE;

                mContentContainer.addOnLayoutChangeListener(mAnchoredOnLayoutChangeListener);

                mWm.addView(mContentContainer, params);

                mShowing = true;

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

+4 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_M 
import static android.view.WindowManager.LayoutParams.MATCH_PARENT;

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

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

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

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

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

import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_WILL_NOT_REPLACE_ON_RELAUNCH;
@@ -5385,6 +5386,9 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
                || mAttrs.type == TYPE_NAVIGATION_BAR_PANEL) {

            return false;

        }

        if ((mAttrs.privateFlags & PRIVATE_FLAG_NOT_MAGNIFIABLE) != 0) {

            return false;

        }

        return true;

    }