Merge change 7054 into donut

* changes:
  Change the GoogleSearch strings so that "Google" shows up for the label in global search, but "Google Search" shows up as the name in 'manage applications'.

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 297fb03..c97226b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -26,7 +26,7 @@
 
     <application
         android:process="android.process.acore"
-        android:label="@string/search_label">
+        android:label="@string/app_label">
 
         <activity android:name=".GoogleSearch"
                 android:theme="@android:style/Theme.NoDisplay"
@@ -50,6 +50,7 @@
         </activity>
 
         <provider android:name=".SuggestionProvider"
+            android:label="@string/search_label"
             android:authorities="com.android.googlesearch.SuggestionProvider" />
 
         <meta-data android:name="android.app.default_searchable"

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 455eca2..e5e3adf 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -15,9 +15,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
-    <!-- Do not translate.  This string is not displayed in UI (because we have a badge icon). -->
+    <!-- Search source name as displayed in the search dialog. -->
     <string name="search_label">Google</string>
 
+    <!-- The app label as shown, for example, in 'manage applications'. -->
+    <string name="app_label">Google Search</string>
+
     <!-- This is the hint text shown in the search widget, before text is entered. -->
     <!-- This translation MUST MATCH the string "search_hint" which is found in
          Home/res/values/strings.xml -->