commit 94c1bd954266677f3e6bdd00741eaf4db6881c18
author Annie Chin <afchin@google.com> Wed Nov 23 13:39:56 2016 -0800
committer Annie Chin <afchin@google.com> Wed Nov 23 17:13:09 2016 -0800
tree e907a513b73183b6a5392893a15452dc7d5cd24c
parent a22908741beddd5b62a927f6aeae4bafce0bafc6

Fix isResultLayout()

Bug: 33105525
Bug: 33106867

Also reinitialize the dragController so it can keep up on rotation
or background display changes.

Change-Id: Ic1846bc4495196c35ebd4d4ac78f61078dca7573

src/com/android/calculator2/HistoryAdapter.java

diff --git a/src/com/android/calculator2/HistoryAdapter.java b/src/com/android/calculator2/HistoryAdapter.java
index e8c6eb7..cc2f7e1 100644
--- a/src/com/android/calculator2/HistoryAdapter.java
+++ b/src/com/android/calculator2/HistoryAdapter.java
@@ -39,7 +39,7 @@
 
     private List<HistoryItem> mDataSet;
 
-    private boolean mIsResultState;
+    private boolean mIsResultLayout;
 
     public HistoryAdapter(Calculator calculator, ArrayList<HistoryItem> dataSet,
             String currentExpressionDescription) {
@@ -125,7 +125,7 @@
     }
 
     private int getEvaluatorIndex(int position) {
-        if (EvaluatorStateUtils.isDisplayEmpty(mEvaluator) || mIsResultState) {
+        if (EvaluatorStateUtils.isDisplayEmpty(mEvaluator) || mIsResultLayout) {
             return (int) mEvaluator.getMaxIndex() - position;
         } else {
             // Account for the additional "Current Expression" with the +1.
@@ -133,8 +133,8 @@
         }
     }
 
-    public void setIsResultState(boolean isResult) {
-        mIsResultState = isResult;
+    public void setIsResultLayout(boolean isResult) {
+        mIsResultLayout = isResult;
     }
 
     public static class ViewHolder extends RecyclerView.ViewHolder {