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

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

Change-Id: Ic90e3d27fcc267a62bdb6a79da77d8e681f0f5a5
This commit is contained in:
TreeHugger Robot
2021-06-18 17:22:59 +00:00
committed by Automerger Merge Worker

View File

@@ -191,8 +191,15 @@ public class OneHandedDisplayAreaOrganizer extends DisplayAreaOrganizer {
myUserId())) { myUserId())) {
return; return;
} }
mDisplayLayout.rotateTo(context.getResources(), toRotation); mDisplayLayout.rotateTo(context.getResources(), toRotation);
updateDisplayBounds(); updateDisplayBounds();
if (mOneHandedSettingsUtil.getSettingsSwipeToNotificationEnabled(
context.getContentResolver(), myUserId())) {
// If current settings is swipe notification, skip finishOffset.
return;
}
finishOffset(0, TRANSITION_DIRECTION_EXIT); finishOffset(0, TRANSITION_DIRECTION_EXIT);
} }