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

Commit 7e9d5730 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix shortcut rotate trigger swipe notification" into sc-dev am: bd1d8412 am: b10dba7a 

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

Change-Id: I415f3268470fe4ad0b166e9c7cdfa46a47723365
parents 0ea9c33d b10dba7a

libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedDisplayAreaOrganizer.java

+7 −0
Original line number Diff line number Diff line
@@ -191,8 +191,15 @@ public class OneHandedDisplayAreaOrganizer extends DisplayAreaOrganizer { 
                myUserId())) {

            return;

        }



        mDisplayLayout.rotateTo(context.getResources(), toRotation);

        updateDisplayBounds();



        if (mOneHandedSettingsUtil.getSettingsSwipeToNotificationEnabled(

                context.getContentResolver(), myUserId())) {

            // If current settings is swipe notification, skip finishOffset.

            return;

        }

        finishOffset(0, TRANSITION_DIRECTION_EXIT);

    }