diff options
| author | Annie Chin <afchin@google.com> | 2017-01-06 16:01:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-01-06 16:01:01 +0000 |
| commit | a9395c92523f46caa90ebf94fbd96104b09f6d94 (patch) | |
| tree | 617924148758f2123c91d416082479e28b95ee44 | |
| parent | ef18cc85dda1d39c5c34e762f9cea4a0cbd6b95e (diff) | |
| parent | 774ce1a8896a09e613bf35e9124d0d7d8d06a765 (diff) | |
| download | android_packages_apps_ExactCalculator-a9395c92523f46caa90ebf94fbd96104b09f6d94.tar.gz android_packages_apps_ExactCalculator-a9395c92523f46caa90ebf94fbd96104b09f6d94.tar.bz2 android_packages_apps_ExactCalculator-a9395c92523f46caa90ebf94fbd96104b09f6d94.zip | |
Merge "Set mIsOpen in DragLayout.setClosed()/Open()" into ub-calculator-euler
| -rw-r--r-- | src/com/android/calculator2/DragLayout.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/calculator2/DragLayout.java b/src/com/android/calculator2/DragLayout.java index 40a46d0..9e83aa1 100644 --- a/src/com/android/calculator2/DragLayout.java +++ b/src/com/android/calculator2/DragLayout.java @@ -190,10 +190,12 @@ public class DragLayout extends RelativeLayout { public void setOpen() { mDragHelper.smoothSlideViewTo(mHistoryFrame, 0, mVerticalRange); mHistoryFrame.setVisibility(VISIBLE); + mIsOpen = true; } public void setClosed() { mDragHelper.smoothSlideViewTo(mHistoryFrame, 0, 0); + mIsOpen = false; } public void setCloseCallback(CloseCallback callback) { @@ -250,14 +252,12 @@ public class DragLayout extends RelativeLayout { // The view stopped moving. if (mDraggingBorder == 0) { setClosed(); - mIsOpen = false; mHistoryFrame.setVisibility(GONE); if (mCloseCallback != null) { mCloseCallback.onClose(); } } else if (mDraggingBorder == mVerticalRange) { setOpen(); - mIsOpen = true; } } else if (state == ViewDragHelper.STATE_DRAGGING && !mIsOpen) { onStartDragging(); |