diff options
| author | Bryce Lee <brycelee@google.com> | 2015-02-06 23:05:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-06 23:05:05 +0000 |
| commit | a7404dbde991d36353440546ff8c92e44d218dfe (patch) | |
| tree | c809846e22482d1300c0b1d77f85dd2fd66bb6e1 /core | |
| parent | 53b9fbd1610b6d3deb837dab34fd309d515f6385 (diff) | |
| parent | cc8b467c590170dd52e817dc1fd48ace83e6599e (diff) | |
| download | frameworks_base-a7404dbde991d36353440546ff8c92e44d218dfe.zip frameworks_base-a7404dbde991d36353440546ff8c92e44d218dfe.tar.gz frameworks_base-a7404dbde991d36353440546ff8c92e44d218dfe.tar.bz2 | |
Merge "Add voice assist action for global actions." into lmp-mr1-modular-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/res/res/values-watch/config.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 3 | ||||
| -rwxr-xr-x | core/res/res/values/symbols.xml | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/core/res/res/values-watch/config.xml b/core/res/res/values-watch/config.xml index 3eede32..307a1ea 100644 --- a/core/res/res/values-watch/config.xml +++ b/core/res/res/values-watch/config.xml @@ -23,7 +23,7 @@ <!-- Only show settings item due to smaller real estate. --> <string-array translatable="false" name="config_globalActionsList"> - <item>settings</item> + <item>voiceassist</item> </string-array> <!-- Base "touch slop" value used by ViewConfiguration as a diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 20b4b62..d30d36e 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -482,6 +482,9 @@ <!-- label for item that launches settings in phone options dialog [CHAR LIMIT=15]--> <string name="global_action_settings">Settings</string> + <!-- label for item that launches voice assist in phone options dialog [CHAR LIMIT=15]--> + <string name="global_action_voice_assist">Voice Assist</string> + <!-- label for item that locks the phone and enforces that it can't be unlocked without entering a credential. [CHAR LIMIT=15] --> <string name="global_action_lockdown">Lock now</string> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 1055547..77c981a 100755 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1527,6 +1527,7 @@ <java-symbol type="string" name="global_action_silent_mode_on_status" /> <java-symbol type="string" name="global_action_toggle_silent_mode" /> <java-symbol type="string" name="global_action_lockdown" /> + <java-symbol type="string" name="global_action_voice_assist" /> <java-symbol type="string" name="invalidPuk" /> <java-symbol type="string" name="lockscreen_carrier_default" /> <java-symbol type="style" name="Animation.LockScreen" /> @@ -1614,6 +1615,7 @@ <java-symbol type="drawable" name="ic_notification_ime_default" /> <java-symbol type="drawable" name="ic_menu_refresh" /> <java-symbol type="drawable" name="ic_settings" /> + <java-symbol type="drawable" name="ic_voice_search" /> <java-symbol type="drawable" name="stat_notify_car_mode" /> <java-symbol type="drawable" name="stat_notify_disabled_data" /> <java-symbol type="drawable" name="stat_notify_disk_full" /> |