summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnnie Chin <afchin@google.com>2016-12-19 11:18:51 -0800
committerAnnie Chin <afchin@google.com>2016-12-19 11:20:38 -0800
commit774ce1a8896a09e613bf35e9124d0d7d8d06a765 (patch)
tree9fc86781791888c30c3ac976e6a576d5c5cb1479
parenta3c18ac40a7f3cf7f7d668d91b7a39bc647380ef (diff)
downloadandroid_packages_apps_ExactCalculator-774ce1a8896a09e613bf35e9124d0d7d8d06a765.tar.gz
android_packages_apps_ExactCalculator-774ce1a8896a09e613bf35e9124d0d7d8d06a765.tar.bz2
android_packages_apps_ExactCalculator-774ce1a8896a09e613bf35e9124d0d7d8d06a765.zip
Set mIsOpen in DragLayout.setClosed()/Open()
Fixes: 33747824 Change-Id: I0f41407209e2ffb3dd0b209b3370baf90e820734
-rw-r--r--src/com/android/calculator2/DragLayout.java4
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();