From 774ce1a8896a09e613bf35e9124d0d7d8d06a765 Mon Sep 17 00:00:00 2001 From: Annie Chin Date: Mon, 19 Dec 2016 11:18:51 -0800 Subject: Set mIsOpen in DragLayout.setClosed()/Open() Fixes: 33747824 Change-Id: I0f41407209e2ffb3dd0b209b3370baf90e820734 --- src/com/android/calculator2/DragLayout.java | 4 ++-- 1 file 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(); -- cgit v1.2.3