From 6000b7dc911fe05857882c2d5de38c4ef9a7ff4f Mon Sep 17 00:00:00 2001
From: taiki tsutsumi <taiki.x.tsutsumi@sonymobile.com>
Date: Wed, 7 Dec 2016 17:19:15 +0900
Subject: Fixed the issue that unknown contact sort

Change the header of unknown contact to #.
When using JapaneseContactUtil and ChineseTWContactUtils,
change the sort index of Number Bucket.

affected area:
When including Japanese and Chinese.
This utility class provides specialized handling for locale specific.
information: labels, name lookup keys.

Change-Id: Ie60d647d2b9823194c5f7319f7e57a2f370b4e3a
---
 src/com/android/providers/contacts/ContactLocaleUtils.java | 13 +++++++++++++
 1 file changed, 13 insertions(+)

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;
+        }
     }
 
     /**
-- 
cgit v1.2.3


From 90f690852cd16ad92674cc196c29aeecbdf45e04 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Wed, 10 May 2017 12:14:39 -0700
Subject: Import translations. DO NOT MERGE

Change-Id: I520ee811630ad5e531b7b88e78c70a2a3375afbe
Auto-generated-cl: translation import
---
 res/values-tl/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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>
-- 
cgit v1.2.3