commit 8861323dcc360b12de1c369fcb84e88d634cfcb7
author Annie Chin <afchin@google.com> Wed Jan 04 12:21:52 2017 -0800
committer Annie Chin <afchin@google.com> Thu Jan 05 14:57:32 2017 -0800
tree 6c6d80b9cbd5898b212612f738699e277b37f29c
parent c3a0b31c6fc6637b4390b2f9c119c19a8acfeb00

Polish History multiwindow support.

Fixes: 34081054
Fixes: 34081005
Fixes: 32987283

-Hide quick result from current expression when we are in one-line
display mode.
-Adjust bottom padding for history item in one-line mode.
-Add font padding when bottom padding for items is 0 to prevent running
into the bottom edge of the display.

Change-Id: Icf3ddd4951ac0e4ab680124ecff7dd5258ccc05f

src/com/android/calculator2/HistoryFragment.java

diff --git a/src/com/android/calculator2/HistoryFragment.java b/src/com/android/calculator2/HistoryFragment.java
index 86ab138..af06dfa 100644
--- a/src/com/android/calculator2/HistoryFragment.java
+++ b/src/com/android/calculator2/HistoryFragment.java
@@ -141,6 +141,7 @@
         mAdapter.setEvaluator(Evaluator.getInstance(activity));
 
         final boolean isResultLayout = activity.isResultLayout();
+        final boolean isOneLine = activity.isOneLine();
 
         mDragLayout = (DragLayout) activity.findViewById(R.id.drag_layout);
         mDragLayout.removeDragCallback(mDragCallback);
@@ -149,7 +150,7 @@
         mEvaluator = Evaluator.getInstance(activity);
 
         if (mEvaluator != null) {
-            initializeController(isResultLayout);
+            initializeController(isResultLayout, isOneLine);
 
             final long maxIndex = mEvaluator.getMaxIndex();
 
@@ -178,6 +179,7 @@
             mDataSet = newDataSet;
             mAdapter.setDataSet(mDataSet);
             mAdapter.setIsResultLayout(isResultLayout);
+            mAdapter.setIsOneLine(activity.isOneLine());
         }
 
         mAdapter.notifyDataSetChanged();
@@ -186,10 +188,10 @@
     @Override
     public void onStart() {
         super.onStart();
-
+        final Calculator activity = (Calculator) getActivity();
         // The orientation may have changed.
         mDragController.initializeAnimation(mRecyclerView,
-                ((Calculator) getActivity()).isResultLayout(), mDragLayout.isOpen());
+                activity.isResultLayout(), activity.isOneLine(), mDragLayout.isOpen());
     }
 
     @Override
@@ -221,7 +223,7 @@
         super.onDestroyView();
     }
 
-    private void initializeController(boolean isResult) {
+    private void initializeController(boolean isResult, boolean isOneLine) {
         mDragController.setDisplayFormula(
                 (CalculatorFormula) getActivity().findViewById(R.id.formula));
 
@@ -232,7 +234,7 @@
 
         mDragController.setEvaluator(mEvaluator);
 
-        mDragController.initializeController(isResult);
+        mDragController.initializeController(isResult, isOneLine);
     }
 
     public boolean stopActionModeOrContextMenu() {