commit 488cebf3b87fce38242a3dc11f28f96a027f8e08
author Bill Yi <byi@google.com> Thu Dec 01 06:23:27 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Dec 01 06:23:27 2016 +0000
tree ace51069ec246f8de483cbc93170e775648403e9
parent cdbfa125e04d942177a716ea528c09f2827d0e3b
parent cc06c82fb9ba9c2d27be68adc99a6bdb68352933

Import translations. DO NOT MERGE
am: cc06c82fb9  -s ours

Change-Id: Ie399d0f88993cc90cdb3c642b955c7574afc60b2

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 285774d..5bdf99d 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="10613"
-    android:versionName="1.6.13">
+    android:versionCode="10700"
+    android:versionName="1.7.0">
 
     <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="25" />
 

src/com/android/contacts/activities/PeopleActivity.java

diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index cdea930..c3308b5 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -739,7 +739,9 @@
 
         final AccessibilityManager am =
                 (AccessibilityManager) getSystemService(Context.ACCESSIBILITY_SERVICE);
-        final int length = am.isEnabled() ? Snackbar.LENGTH_INDEFINITE : Snackbar.LENGTH_LONG;
+        //TODO set to INDEFINITE and track user interaction to dismiss b/33208886
+        final int accessibilityLength = 15000;
+        final int length = am.isEnabled() ? accessibilityLength : Snackbar.LENGTH_LONG;
         final String message = getString(R.string.groupDeletedToast);
 
         final Snackbar snackbar = Snackbar.make(mLayoutRoot, message, length)