diff options
author | Hyunyoung Song <hyunyoungs@google.com> | 2017-07-24 19:19:52 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-07-24 19:19:52 +0000 |
commit | 345e10e5e436507b9ff33abfd1a3a108ad440913 (patch) | |
tree | 24fcc5a156b0586324ee2b45105cb9d72380e1ba | |
parent | 507f4fb2d6ea81759720074afaa487732424557f (diff) | |
parent | 6dc62fb2d427d5c841ab6c8f8552fd57ee1d4b38 (diff) | |
download | android_packages_apps_Trebuchet-345e10e5e436507b9ff33abfd1a3a108ad440913.tar.gz android_packages_apps_Trebuchet-345e10e5e436507b9ff33abfd1a3a108ad440913.tar.bz2 android_packages_apps_Trebuchet-345e10e5e436507b9ff33abfd1a3a108ad440913.zip |
Merge changes from topic 'am-866a059a-f7fc-4082-9b78-f35b177cf256' into ub-launcher3-dorval-polish2
* changes:
separate enforceContainerWithinScreen logic to a private method am: 27790352a3
separate enforceContainerWithinScreen logic to a private method
-rw-r--r-- | src/com/android/launcher3/popup/PopupContainerWithArrow.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java index f5f7ddb31..c3e2d8b89 100644 --- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java +++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java @@ -402,9 +402,14 @@ public class PopupContainerWithArrow extends AbstractFloatingView implements Dra @Override protected void onLayout(boolean changed, int l, int t, int r, int b) { super.onLayout(changed, l, t, r, b); + enforceContainedWithinScreen(l, r); + + } + + private void enforceContainedWithinScreen(int left, int right) { DragLayer dragLayer = mLauncher.getDragLayer(); - if (getTranslationX() + l < 0 || - getTranslationX() + l + getMeasuredWidth() > dragLayer.getWidth()) { + if (getTranslationX() + left < 0 || + getTranslationX() + right > dragLayer.getWidth()) { // If we are still off screen, center horizontally too. mGravity |= Gravity.CENTER_HORIZONTAL; } |