diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-14 09:23:41 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-14 09:23:41 -0700 |
commit | f80418069834e7cc70a00ce9a7f7129761204fd2 (patch) | |
tree | 906fcfee4daf1398b5410f3a877fab063a55ff67 | |
parent | 7b464d2fa5c3fe898ab14db74c3d9fa5bb11ba4f (diff) | |
parent | f8991f48e945ebd5823714f32fb10152fdc5e4ee (diff) | |
download | GoogleSearch-f80418069834e7cc70a00ce9a7f7129761204fd2.tar.gz |
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'.
-rw-r--r-- | AndroidManifest.xml | 3 | ||||
-rw-r--r-- | res/values/strings.xml | 5 |
2 files changed, 6 insertions, 2 deletions
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" 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 --> |