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

Commit 682e6cb5 authored by Liran Binyamin's avatar Liran Binyamin Committed by Automerger Merge Worker
Browse files

Merge "Collapse the overflow view when swiping back" into udc-qpr-dev am: 889d4e08 am: 81a32e33 

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



Change-Id: I41208e75bfa31727968b8575380513ccc6871b1d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 066ba25d 81a32e33

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java

+6 −2
Original line number Diff line number Diff line
@@ -821,13 +821,17 @@ public class BubbleController implements ConfigurationChangeListener, 
     * @param interceptBack whether back should be intercepted or not.

     */

    void updateWindowFlagsForBackpress(boolean interceptBack) {

        if (mStackView != null && mAddedToWindowManager) {

        if (mAddedToWindowManager) {

            mWmLayoutParams.flags = interceptBack

                    ? 0

                    : WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE

                            | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL;

            mWmLayoutParams.flags |= WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED;

            if (mStackView != null) {

                mWindowManager.updateViewLayout(mStackView, mWmLayoutParams);

            } else if (mLayerView != null) {

                mWindowManager.updateViewLayout(mLayerView, mWmLayoutParams);

            }

        }

    }