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

Commit 37705543 authored by Tony Huang's avatar Tony Huang Committed by Automerger Merge Worker
Browse files

Merge "Fix divider dismiss position wrong on potrait" into tm-qpr-dev am: d36b472c 

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



Change-Id: Ia94f94530d7ae69aad8a1ab7824ef206f47f1292
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7fa9cf21 d36b472c

core/java/com/android/internal/policy/DividerSnapAlgorithm.java

+1 −3
Original line number Diff line number Diff line
@@ -287,7 +287,6 @@ public class DividerSnapAlgorithm { 
        int dividerMax = isHorizontalDivision

                ? mDisplayHeight

                : mDisplayWidth;

        int navBarSize = isHorizontalDivision ? mInsets.bottom : mInsets.right;

        int startPos = -mDividerSize;

        if (dockedSide == DOCKED_RIGHT) {

            startPos += mInsets.left;
@@ -308,8 +307,7 @@ public class DividerSnapAlgorithm { 
                addMinimizedTarget(isHorizontalDivision, dockedSide);

                break;

        }

        mTargets.add(new SnapTarget(dividerMax - navBarSize, dividerMax,

                SnapTarget.FLAG_DISMISS_END, 0.35f));

        mTargets.add(new SnapTarget(dividerMax, dividerMax, SnapTarget.FLAG_DISMISS_END, 0.35f));

    }



    private void addNonDismissingTargets(boolean isHorizontalDivision, int topPosition,