release-request-323db86e-b638-4d24-8eb1-d2e3bf4a9d1a-for-git_oc-mr1-release-4017779 snap-temp-L47900000064949209

Change-Id: I8a532125d14faa88c11892b04395a68f9f8e136c

7 files changed, 32 insertions, 4 deletions

diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 713fcb7a..6a1b6d9f 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="sharedUserLabel" msgid="8024311725474286801">"Core Apps ng Android"</string>
-    <string name="app_label" msgid="3389954322874982620">"Imbakan ng Mga Contact"</string>
+    <string name="app_label" msgid="3389954322874982620">"Storage ng Mga Contact"</string>
     <string name="provider_label" msgid="6012150850819899907">"Mga Contact"</string>
     <string name="upgrade_out_of_memory_notification_ticker" msgid="7638747231223520477">"Nangangailangan ng higit pang memory ang pag-upgrade sa mga contact."</string>
     <string name="upgrade_out_of_memory_notification_title" msgid="8888171924684998531">"Ina-upgrade ang storage para sa mga contact"</string>
diff --git a/src/com/android/providers/contacts/CallLogDatabaseHelper.java b/src/com/android/providers/contacts/CallLogDatabaseHelper.java
index be3e90e2..d4ed9304 100644
--- a/src/com/android/providers/contacts/CallLogDatabaseHelper.java
+++ b/src/com/android/providers/contacts/CallLogDatabaseHelper.java
@@ -39,7 +39,7 @@ import com.android.providers.contacts.util.PropertyUtils;
 public class CallLogDatabaseHelper {
     private static final String TAG = "CallLogDatabaseHelper";
 
-    private static final int DATABASE_VERSION = 4;
+    private static final int DATABASE_VERSION = 5;
 
     private static final boolean DEBUG = false; // DON'T SUBMIT WITH TRUE
 
@@ -151,6 +151,7 @@ public class CallLogDatabaseHelper {
                     Voicemails.SOURCE_DATA + " TEXT," +
                     Voicemails.SOURCE_PACKAGE + " TEXT," +
                     Voicemails.TRANSCRIPTION + " TEXT," +
+                    Voicemails.TRANSCRIPTION_STATE + " INTEGER NOT NULL DEFAULT 0," +
                     Voicemails.STATE + " INTEGER," +
                     Voicemails.DIRTY + " INTEGER NOT NULL DEFAULT 0," +
                     Voicemails.DELETED + " INTEGER NOT NULL DEFAULT 0," +
@@ -195,6 +196,10 @@ public class CallLogDatabaseHelper {
             if (oldVersion < 4) {
                 upgradeToVersion4(db);
             }
+
+            if (oldVersion < 5) {
+                upgradeToVersion5(db);
+            }
         }
     }
 
@@ -264,6 +269,13 @@ public class CallLogDatabaseHelper {
     }
 
     /**
+     * Add {@link Voicemails.TRANSCRIPTION_STATE} column to the CallLog database.
+     */
+    private void upgradeToVersion5(SQLiteDatabase db) {
+        db.execSQL("ALTER TABLE calls ADD transcription_state INTEGER NOT NULL DEFAULT 0");
+    }
+
+    /**
      * Perform the migration from the contacts2.db (of the latest version) to the current calllog/
      * voicemail status tables.
      */
diff --git a/src/com/android/providers/contacts/CallLogProvider.java b/src/com/android/providers/contacts/CallLogProvider.java
index 9d2111ff..9b53c0ef 100644
--- a/src/com/android/providers/contacts/CallLogProvider.java
+++ b/src/com/android/providers/contacts/CallLogProvider.java
@@ -135,6 +135,7 @@ public class CallLogProvider extends ContentProvider {
         sCallsProjectionMap.put(Calls.NEW, Calls.NEW);
         sCallsProjectionMap.put(Calls.VOICEMAIL_URI, Calls.VOICEMAIL_URI);
         sCallsProjectionMap.put(Calls.TRANSCRIPTION, Calls.TRANSCRIPTION);
+        sCallsProjectionMap.put(Calls.TRANSCRIPTION_STATE, Calls.TRANSCRIPTION_STATE);
         sCallsProjectionMap.put(Calls.IS_READ, Calls.IS_READ);
         sCallsProjectionMap.put(Calls.CACHED_NAME, Calls.CACHED_NAME);
         sCallsProjectionMap.put(Calls.CACHED_NUMBER_TYPE, Calls.CACHED_NUMBER_TYPE);
diff --git a/src/com/android/providers/contacts/ContactLocaleUtils.java b/src/com/android/providers/contacts/ContactLocaleUtils.java
index 3480960a..2b7f1ff4 100644
--- a/src/com/android/providers/contacts/ContactLocaleUtils.java
+++ b/src/com/android/providers/contacts/ContactLocaleUtils.java
@@ -425,6 +425,19 @@ public class ContactLocaleUtils {
             keys.add(romajiName);
             return keys.iterator();
         }
+
+        /**
+         * Returns the number for "#" bucket index.
+         * Adds an additional 'misc' bucket for Kanji characters to the base class set.
+         */
+        @Override
+        public int getNumberBucketIndex() {
+            final int numberBucketIndex = super.getNumberBucketIndex();
+            if (numberBucketIndex > mMiscBucketIndex) {
+                return numberBucketIndex + 1;
+            }
+            return numberBucketIndex;
+        }
     }
 
     /**
diff --git a/src/com/android/providers/contacts/VoicemailContentTable.java b/src/com/android/providers/contacts/VoicemailContentTable.java
index 9e36c520..09a8c1f0 100644
--- a/src/com/android/providers/contacts/VoicemailContentTable.java
+++ b/src/com/android/providers/contacts/VoicemailContentTable.java
@@ -64,6 +64,7 @@ public class VoicemailContentTable implements VoicemailTable.Delegate {
             .add(Voicemails.DURATION)
             .add(Voicemails.IS_READ)
             .add(Voicemails.TRANSCRIPTION)
+            .add(Voicemails.TRANSCRIPTION_STATE)
             .add(Voicemails.STATE)
             .add(Voicemails.SOURCE_DATA)
             .add(Voicemails.SOURCE_PACKAGE)
@@ -102,6 +103,7 @@ public class VoicemailContentTable implements VoicemailTable.Delegate {
                 .add(Voicemails.DURATION)
                 .add(Voicemails.IS_READ)
                 .add(Voicemails.TRANSCRIPTION)
+                .add(Voicemails.TRANSCRIPTION_STATE)
                 .add(Voicemails.STATE)
                 .add(Voicemails.SOURCE_DATA)
                 .add(Voicemails.SOURCE_PACKAGE)
diff --git a/tests/src/com/android/providers/contacts/CallLogProviderTest.java b/tests/src/com/android/providers/contacts/CallLogProviderTest.java
index 8ee7a5be..f6078464 100644
--- a/tests/src/com/android/providers/contacts/CallLogProviderTest.java
+++ b/tests/src/com/android/providers/contacts/CallLogProviderTest.java
@@ -61,7 +61,7 @@ public class CallLogProviderTest extends BaseContactsProvider2Test {
             Voicemails.DIRTY,
             Voicemails.DELETED};
     /** Total number of columns exposed by call_log provider. */
-    private static final int NUM_CALLLOG_FIELDS = 30;
+    private static final int NUM_CALLLOG_FIELDS = 31;
 
     private CallLogProviderTestable mCallLogProvider;
 
diff --git a/tests/src/com/android/providers/contacts/VoicemailProviderTest.java b/tests/src/com/android/providers/contacts/VoicemailProviderTest.java
index 16abf2f6..4fa935fa 100644
--- a/tests/src/com/android/providers/contacts/VoicemailProviderTest.java
+++ b/tests/src/com/android/providers/contacts/VoicemailProviderTest.java
@@ -61,7 +61,7 @@ public class VoicemailProviderTest extends BaseVoicemailProviderTest {
             Calls.COUNTRY_ISO
     };
     /** Total number of columns exposed by voicemail provider. */
-    private static final int NUM_VOICEMAIL_FIELDS = 23;
+    private static final int NUM_VOICEMAIL_FIELDS = 24;
 
     @Override
     protected void setUp() throws Exception {