commit 814c31281d058d0b075e4efafd56bffa967310ab
author Paul Soulos <psoulos@google.com> Thu Jul 17 23:34:12 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 17 17:59:02 2014 +0000
tree 4e941ce5268d323ca40a4cc33788b6c362c4d1ac
parent cce3fc6e2354f8e7bc743eef4d74914dde7242b8
parent a56ff2dd825fed27ed5382c088fbeed98c1a773b

Merge "Fixes card collapsing during contact sync"

res/layout/editor_custom_action_bar.xml

diff --git a/res/layout/editor_custom_action_bar.xml b/res/layout/editor_custom_action_bar.xml
index 7a31b92..7764674 100644
--- a/res/layout/editor_custom_action_bar.xml
+++ b/res/layout/editor_custom_action_bar.xml
@@ -30,7 +30,7 @@
         android:layout_marginEnd="8dip"
         android:src="@drawable/ic_done_wht_24dp"
         style="?android:attr/actionButtonStyle"
-        android:description="@string/menu_done" />
+        android:contentDescription="@string/menu_done" />
 
     <TextView
         android:id="@+id/title"

src/com/android/contacts/interactions/CallLogInteractionsLoader.java

diff --git a/src/com/android/contacts/interactions/CallLogInteractionsLoader.java b/src/com/android/contacts/interactions/CallLogInteractionsLoader.java
index 2a9bcea..9cbc0b4 100644
--- a/src/com/android/contacts/interactions/CallLogInteractionsLoader.java
+++ b/src/com/android/contacts/interactions/CallLogInteractionsLoader.java
@@ -101,7 +101,7 @@
     }
 
     private List<ContactInteraction> getCallLogInteractions(String phoneNumber) {
-        final Uri uri = Uri.withAppendedPath(Calls.CONTENT_FILTER_URI, phoneNumber);
+        final Uri uri = Uri.withAppendedPath(Calls.CONTENT_FILTER_URI, Uri.encode(phoneNumber));
         // Append the LIMIT clause onto the ORDER BY clause. This won't cause crashes as long
         // as we don't also set the {@link android.provider.CallLog.Calls.LIMIT_PARAM_KEY} that
         // becomes available in KK.