auto import from //branches/cupcake_rel/...@141571

4 files changed, 54 insertions, 23 deletions

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 3f43b6f2..eb36a2b1 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -16,9 +16,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label">"Información de los contactos"</string>
-    <string name="dialNumber">"Marcar número"</string>
-    <string name="createNewContact">"Contacto nuevo"</string>
-    <string name="usingNumber">"Usar <xliff:g id="NUMBER">%s</xliff:g>"</string>
     <!-- no translation found for dial_number_using (6620964003493356963) -->
     <skip />
     <!-- no translation found for create_contact_using (5278375606850817161) -->
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
new file mode 100644
index 00000000..eecd4411
--- /dev/null
+++ b/res/values-ja/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for app_label (3389954322874982620) -->
+    <skip />
+    <!-- no translation found for createNewContact (3647121853378288573) -->
+    <skip />
+    <!-- no translation found for usingNumber (6703644134009250885) -->
+    <skip />
+    <!-- no translation found for dial_number_using (6620964003493356963) -->
+    <skip />
+    <!-- no translation found for create_contact_using (5278375606850817161) -->
+    <skip />
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 55eaedcd..45637dd7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -19,14 +19,4 @@
     <!-- This is the label for the application that stores contacts data -->
     <string name="app_label">Contacts Storage</string>
 
-    <!-- Strings for search suggestions -->
-    <string name="dialNumber">Dial number</string>
-    <string name="createNewContact">New contact</string>
-    <string name="usingNumber">Using <xliff:g id="number">%s</xliff:g></string>    
-
-    <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
-    <string name="dial_number_using">Dial number\nusing <xliff:g id="number" example="555">%s</xliff:g></string>
-
-    <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
-    <string name="create_contact_using">Create contact\nusing <xliff:g id="number" example="555">%s</xliff:g></string>
 </resources>
diff --git a/src/com/android/providers/contacts/ContactsProvider.java b/src/com/android/providers/contacts/ContactsProvider.java
index 7a324155..fc9073cb 100644
--- a/src/com/android/providers/contacts/ContactsProvider.java
+++ b/src/com/android/providers/contacts/ContactsProvider.java
@@ -26,6 +26,7 @@ import android.content.ContentValues;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.UriMatcher;
+import android.content.res.Resources;
 import android.database.Cursor;
 import android.database.CursorJoiner;
 import android.database.DatabaseUtils;
@@ -920,7 +921,7 @@ public class ContactsProvider extends AbstractSyncableContentProvider {
                 final SQLiteDatabase db = getDatabase();
                 Cursor c = db.rawQueryWithFactory(null, query, null, sPeopleTable);
                 if ((c != null) && !isTemporary()) {
-                    c.setNotificationUri(getContext().getContentResolver(), url);
+                    c.setNotificationUri(getContext().getContentResolver(), notificationUri);
                 }
                 return c;
             }
@@ -951,7 +952,7 @@ public class ContactsProvider extends AbstractSyncableContentProvider {
                 final SQLiteDatabase db = getDatabase();
                 Cursor c = db.rawQueryWithFactory(null, query, null, sPeopleTable);
                 if ((c != null) && !isTemporary()) {
-                    c.setNotificationUri(getContext().getContentResolver(), url);
+                    c.setNotificationUri(getContext().getContentResolver(), notificationUri);
                 }
                 return c;
             }
@@ -1297,18 +1298,33 @@ public class ContactsProvider extends AbstractSyncableContentProvider {
                         SearchManager.SUGGEST_COLUMN_INTENT_ACTION,
                 };
 
-/*
- *  TODO: figure out how to localize things so myFaves can read the constants when sub classing
- */
+                Resources r = getContext().getResources();
+                String s;
+                int i;
+
                 ArrayList dialNumber = new ArrayList();
-                dialNumber.add("Dial number");
-                dialNumber.add("Using " + searchClause);
+                s = r.getString(com.android.internal.R.string.dial_number_using, searchClause);
+                i = s.indexOf('\n');
+                if (i < 0) {
+                    dialNumber.add(s);
+                    dialNumber.add("");
+                } else {
+                    dialNumber.add(s.substring(0, i));
+                    dialNumber.add(s.substring(i + 1));
+                }
                 dialNumber.add("tel:" + searchClause);
-                dialNumber.add(Intents.SEARCH_SUGGESTION_DIAL_NUMBER_CLICKED);
+                dialNumber.add(Intents.SEARCH_SUGGESTION_DIAL_NUMBER_CLICKED);  
 
                 ArrayList createContact = new ArrayList();
-                createContact.add("Create contact");
-                createContact.add("Using " + searchClause);
+                s = r.getString(com.android.internal.R.string.create_contact_using, searchClause);
+                i = s.indexOf('\n');
+                if (i < 0) {
+                    createContact.add(s);
+                    createContact.add("");
+                } else {
+                    createContact.add(s.substring(0, i));
+                    createContact.add(s.substring(i + 1));
+                }
                 createContact.add("tel:" + searchClause);
                 createContact.add(Intents.SEARCH_SUGGESTION_CREATE_CONTACT_CLICKED);