Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix for testLifecycleOnMoveToFromSplitScreenRelaunch"

Browse Source
This commit is contained in:
Treehugger Robot
2019-02-19 02:02:35 +00:00
committed by Gerrit Code Review
parent da75e38817 7b6ae663d6
commit 43d11758fa
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/com/android/internal/policy/DividerSnapAlgorithm.java
View File

@@ -137,6 +137,7 @@ public class DividerSnapAlgorithm {
mDismissStartTarget = mTargets.get(0); mDismissStartTarget = mTargets.get(0);
mDismissEndTarget = mTargets.get(mTargets.size() - 1); mDismissEndTarget = mTargets.get(mTargets.size() - 1);
mMiddleTarget = mTargets.get(mTargets.size() / 2); mMiddleTarget = mTargets.get(mTargets.size() / 2);
mMiddleTarget.isMiddleTarget = true;
} }
/** /**
@@ -438,6 +439,8 @@ public class DividerSnapAlgorithm {
public final int flag; public final int flag;
public boolean isMiddleTarget;
/** /**
* Multiplier used to calculate distance to snap position. The lower this value, the harder * Multiplier used to calculate distance to snap position. The lower this value, the harder
* it's to snap on this target * it's to snap on this target

3
packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java
View File

@@ -464,6 +464,9 @@ public class DividerView extends FrameLayout implements OnTouchListener,
if (mSnapAlgorithm == null) { if (mSnapAlgorithm == null) {
mSnapAlgorithm = new DividerSnapAlgorithm(getContext().getResources(), mDisplayWidth, mSnapAlgorithm = new DividerSnapAlgorithm(getContext().getResources(), mDisplayWidth,
mDisplayHeight, mDividerSize, isHorizontalDivision(), mStableInsets, mDockSide); mDisplayHeight, mDividerSize, isHorizontalDivision(), mStableInsets, mDockSide);
if (mSnapTargetBeforeMinimized != null && mSnapTargetBeforeMinimized.isMiddleTarget) {
mSnapTargetBeforeMinimized = mSnapAlgorithm.getMiddleTarget();
}
} }
if (mMinimizedSnapAlgorithm == null) { if (mMinimizedSnapAlgorithm == null) {
mMinimizedSnapAlgorithm = new DividerSnapAlgorithm(getContext().getResources(), mMinimizedSnapAlgorithm = new DividerSnapAlgorithm(getContext().getResources(),