commit b2e96181066c1b50dafbf4d3e067be393ec23a0a
author Annie Chin <afchin@google.com> Mon Nov 28 13:14:54 2016 -0800
committer Annie Chin <afchin@google.com> Mon Nov 28 15:29:39 2016 -0800
tree 0b55f7593c37cb7d6e7253ae98f639351bdc4956
parent 8149c8c2f02a3a6aae34d8d8b3bc67ce0f56378c

Use isOpen() to determine recyclerview visibility.

Fixes: 33130810

Change-Id: Ie8d4fb3243c6551eda14a1bd3e971dc54e4a9e4c

src/com/android/calculator2/DragController.java

diff --git a/src/com/android/calculator2/DragController.java b/src/com/android/calculator2/DragController.java
index 3160fbf..e195463 100644
--- a/src/com/android/calculator2/DragController.java
+++ b/src/com/android/calculator2/DragController.java
@@ -152,10 +152,11 @@
     }
 
     /**
-     * Reset all initialized values and set recyclerview to INVISIBLE to avoid flickering.
+     * Reset all initialized values.
+     * If the DragLayout is closed, set recyclerview to INVISIBLE to avoid flickering.
      */
-    public void initializeAnimation(RecyclerView recyclerView, boolean isResult) {
-        recyclerView.setVisibility(View.INVISIBLE);
+    public void initializeAnimation(RecyclerView recyclerView, boolean isResult, boolean isOpen) {
+        recyclerView.setVisibility(isOpen ? View.VISIBLE : View.INVISIBLE);
         mAnimationInitialized = false;
         initializeController(isResult);
     }

src/com/android/calculator2/HistoryFragment.java

diff --git a/src/com/android/calculator2/HistoryFragment.java b/src/com/android/calculator2/HistoryFragment.java
index 6eed1c2..b16ccdb 100644
--- a/src/com/android/calculator2/HistoryFragment.java
+++ b/src/com/android/calculator2/HistoryFragment.java
@@ -79,6 +79,7 @@
 
     private RecyclerView mRecyclerView;
     private HistoryAdapter mAdapter;
+    private DragLayout mDragLayout;
 
     private Evaluator mEvaluator;
 
@@ -129,13 +130,13 @@
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
-        final DragLayout dragLayout = (DragLayout) getActivity().findViewById(R.id.drag_layout);
-        dragLayout.removeDragCallback(mDragCallback);
-        dragLayout.addDragCallback(mDragCallback);
-
         final Calculator activity = (Calculator) getActivity();
         final boolean isResultLayout = activity.isResultLayout();
 
+        mDragLayout = (DragLayout) activity.findViewById(R.id.drag_layout);
+        mDragLayout.removeDragCallback(mDragCallback);
+        mDragLayout.addDragCallback(mDragCallback);
+
         mEvaluator = Evaluator.getInstance(activity);
 
         if (mEvaluator != null) {
@@ -174,7 +175,7 @@
 
         // The orientation may have changed.
         mDragController.initializeAnimation(mRecyclerView,
-                ((Calculator) getActivity()).isResultLayout());
+                ((Calculator) getActivity()).isResultLayout(), mDragLayout.isOpen());
     }
 
     @Override