Merge "Migrate from depreated Guava APIs" into ub-contactsdialer-h-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8dc6e4d..84aadf7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,8 +16,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.contacts"
- android:versionCode="10610"
- android:versionName="1.6.10">
+ android:versionCode="10611"
+ android:versionName="1.6.11">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="25" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e5990ec..6980f23 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -961,7 +961,7 @@
<!-- Content displayed in QuickContact activity after Contacts app receiving
Calendar and SMS permissions [CHAR LIMIT=60] -->
- <string name="permission_explanation_subheader_calendar_and_SMS">Events and Messages</string>
+ <string name="permission_explanation_subheader_calendar_and_SMS">Events and messages</string>
<!-- Content displayed in QuickContact activity after Contacts app receiving
Calendar permission [CHAR LIMIT=40] -->
diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index f8d7436..a00bb2f 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -2450,6 +2450,8 @@
ActionType.UNKNOWN_ACTION, /* thirdPartyAction */ null);
}
mRecentCard.setVisibility(View.VISIBLE);
+ } else {
+ mRecentCard.setVisibility(View.GONE);
}
Trace.endSection();