diff options
| author | Winson Chung <winsonc@google.com> | 2015-08-10 22:59:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-10 22:59:20 +0000 |
| commit | 0396828d05a9f25791a4b9324ee5a23b7481b2e2 (patch) | |
| tree | 6c211bc54fb2b57bfbd7d63ec3d3599c51ffb007 /res/values | |
| parent | 0c2c31336593685ad1336134f6a895971f267555 (diff) | |
| parent | a1ee659e748b02ed74d8cafd3796a5c8ce5f1c44 (diff) | |
| download | android_packages_apps_Trebuchet-0396828d05a9f25791a4b9324ee5a23b7481b2e2.tar.gz android_packages_apps_Trebuchet-0396828d05a9f25791a4b9324ee5a23b7481b2e2.tar.bz2 android_packages_apps_Trebuchet-0396828d05a9f25791a4b9324ee5a23b7481b2e2.zip | |
am a1ee659e: Merge "Adding market search." into ub-launcher3-burnaby
* commit 'a1ee659e748b02ed74d8cafd3796a5c8ce5f1c44':
Adding market search.
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/colors.xml | 1 | ||||
| -rw-r--r-- | res/values/strings.xml | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml index 51e4d40a5..0add48cd8 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -44,6 +44,7 @@ <!-- All Apps --> <color name="all_apps_grid_section_text_color">#009688</color> + <color name="all_apps_search_market_button_focused_bg_color">#DDDDDD</color> <!-- Widgets view --> <color name="widgets_view_fastscroll_thumb_inactive_color">#42FFFFFF</color> diff --git a/res/values/strings.xml b/res/values/strings.xml index 88f149bd0..fefadef28 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -24,10 +24,10 @@ <!-- URI used to import old favorites. [DO NOT TRANSLATE] --> <string name="old_launcher_provider_uri" translatable="false">content://com.android.launcher2.settings/favorites?notify=true</string> - <!-- Permission to receive the com.android.launcher3.action.LAUNCH intent --> + <!-- Permission to receive the com.android.launcher3.action.LAUNCH intent. [DO NOT TRANSLATE] --> <string name="receive_launch_broadcasts_permission" translatable="false">com.android.launcher3.permission.RECEIVE_LAUNCH_BROADCASTS</string> - <!-- Permission to receive the com.android.launcher3.action.FIRST_LOAD_COMPLETE intent --> + <!-- Permission to receive the com.android.launcher3.action.FIRST_LOAD_COMPLETE intent. [DO NOT TRANSLATE] --> <string name="receive_first_load_broadcast_permission" translatable="false">com.android.launcher3.permission.RECEIVE_FIRST_LOAD_BROADCAST</string> <!-- Application name --> @@ -61,6 +61,9 @@ <string name="all_apps_loading_message">Loading Apps…</string> <!-- No-search-results text. [CHAR_LIMIT=50] --> <string name="all_apps_no_search_results">No Apps found matching \"<xliff:g id="query" example="Android">%1$s</xliff:g>\"</string> + <!-- Search market text. This is a format string where the first argument is the name of the activity + handling the search. The format string does not need to handle both of these arguments. [CHAR_LIMIT=50] --> + <string name="all_apps_search_market_message">Go to <xliff:g id="query" example="Play Store">%1$s</xliff:g></string> <!-- Drag and drop --> <skip /> |