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

Commit e420b546 authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Ensure the back gesture window is not touchable" into sc-dev am: 4c0f4e3a am: 9f6c848d 

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

Change-Id: I255bb32c3afc9c37611c4df99351d46aabede1d5
parents a1053360 9f6c848d

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java

+1 −0
Original line number Diff line number Diff line
@@ -506,6 +506,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 
        lp.windowAnimations = 0;

        lp.setTitle("NavigationBar" + mContext.getDisplayId());

        lp.setFitInsetsTypes(0 /* types */);

        lp.setTrustedOverlay();



        NavigationBarFrame frame = (NavigationBarFrame) LayoutInflater.from(mContext).inflate(

                R.layout.navigation_bar_window, null);

packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java

+4 −4
Original line number Diff line number Diff line
@@ -533,16 +533,16 @@ public class EdgeBackGestureHandler extends CurrentUserTracker 
                resources.getDimensionPixelSize(R.dimen.navigation_edge_panel_height),

                WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL,

                WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE

                        | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL

                        | WindowManager.LayoutParams.FLAG_SPLIT_TOUCH

                        | WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE

                        | WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN,

                PixelFormat.TRANSLUCENT);

        layoutParams.accessibilityTitle = mContext.getString(R.string.nav_bar_edge_panel);

        layoutParams.windowAnimations = 0;

        layoutParams.privateFlags |=

                WindowManager.LayoutParams.SYSTEM_FLAG_SHOW_FOR_ALL_USERS;

        layoutParams.setTitle(TAG + mContext.getDisplayId());

        layoutParams.accessibilityTitle = mContext.getString(R.string.nav_bar_edge_panel);

        layoutParams.windowAnimations = 0;

        layoutParams.setFitInsetsTypes(0 /* types */);

        layoutParams.setTrustedOverlay();

        return layoutParams;

    }