commit 3d7939d20d92047e7ab068ad60901b3a0fd01c1e
author Brandon Maxwell <maxwelb@google.com> Thu Mar 17 00:37:48 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 17 00:37:48 2016 +0000
tree e5db62d116426c14172522733338a0bc9229a1dd
parent 77c6c5582a7387fbf326c0089bdd56bd8027eb50
parent fb7ff8268c1c03837a0f2bf2f2cb51326ebfeeb6

Merge "Fixing securityException issue" into nyc-dev

build-library.gradle

diff --git a/build-library.gradle b/build-library.gradle
index d353016..a2394aa 100644
--- a/build-library.gradle
+++ b/build-library.gradle
@@ -12,6 +12,11 @@
         manifest.srcFile 'AndroidManifest.xml'
         res.srcDirs = ['res']
     }
+
+    sourceSets.androidTest {
+        java.srcDirs = ['tests/src']
+        res.srcDirs = ['test/res']
+    }
 }
 
 dependencies {

src/com/android/dialer/calllog/CallLogAdapter.java

diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java
index dfb5190..165594e 100644
--- a/src/com/android/dialer/calllog/CallLogAdapter.java
+++ b/src/com/android/dialer/calllog/CallLogAdapter.java
@@ -595,9 +595,10 @@
             // In case ViewHolders were added/removed, update the expanded position if the rowIds
             // match so that we can restore the correct expanded state on rebind.
             mCurrentlyExpandedPosition = position;
+            views.showActions(true);
+        } else {
+            views.showActions(false);
         }
-
-        views.showActions(mCurrentlyExpandedPosition == position);
         views.updatePhoto();
 
         mCallLogListItemHelper.setPhoneCallDetails(views, details);
@@ -684,6 +685,14 @@
     }
 
     /**
+     * When the list is changing all stored position is no longer valid.
+     */
+    public void invalidatePositions() {
+        mCurrentlyExpandedPosition = RecyclerView.NO_POSITION;
+        mHiddenPosition = RecyclerView.NO_POSITION;
+    }
+
+    /**
      * When the user clicks "undo", the hidden item is unhidden.
      */
     @Override

src/com/android/dialer/calllog/CallLogFragment.java

diff --git a/src/com/android/dialer/calllog/CallLogFragment.java b/src/com/android/dialer/calllog/CallLogFragment.java
index 07299a2..67b72a5 100644
--- a/src/com/android/dialer/calllog/CallLogFragment.java
+++ b/src/com/android/dialer/calllog/CallLogFragment.java
@@ -217,6 +217,7 @@
             // Return false; we did not take ownership of the cursor
             return false;
         }
+        mAdapter.invalidatePositions();
         mAdapter.setLoading(false);
         mAdapter.changeCursor(cursor);
         // This will update the state of the "Clear call log" menu item.