diff options
| author | Cedric Ho <cedricho@google.com> | 2015-04-27 15:47:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-27 15:47:28 +0000 |
| commit | 991c8c53aff32f3d605f6715b3fa78a86990f7ff (patch) | |
| tree | d1d567b043677ca014a7917f03738e1e3d7bcdd8 /core | |
| parent | 17c0b25441a264efe87ab2db82c04c0e018c178c (diff) | |
| parent | c663d99f007c0faa7b66a569ec4083b82d60ef15 (diff) | |
| download | frameworks_base-991c8c53aff32f3d605f6715b3fa78a86990f7ff.zip frameworks_base-991c8c53aff32f3d605f6715b3fa78a86990f7ff.tar.gz frameworks_base-991c8c53aff32f3d605f6715b3fa78a86990f7ff.tar.bz2 | |
Merge "Enable VoiceInteractionService on watch." into lmp-mr1-modular-dev
Diffstat (limited to 'core')
| -rwxr-xr-x | core/res/res/values/config.xml | 3 | ||||
| -rwxr-xr-x | core/res/res/values/symbols.xml | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index d5a6d72..d3c31d7 100755 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -2099,4 +2099,7 @@ <!-- Keyguard component --> <string name="config_keyguardComponent" translatable="false">com.android.systemui/com.android.systemui.keyguard.KeyguardService</string> + + <!-- This config is used to force VoiceInteractionService to start on certain low ram devices. --> + <bool name="config_forceEnableVoiceInteractionService">false</bool> </resources> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index a645b4e..a4dc155 100755 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -281,6 +281,7 @@ <java-symbol type="bool" name="config_enableScreenshotChord" /> <java-symbol type="bool" name="config_bluetooth_default_profiles" /> <java-symbol type="bool" name="config_enableWifiDisplay" /> + <java-symbol type="bool" name="config_forceEnableVoiceInteractionService" /> <java-symbol type="bool" name="config_useDevInputEventForAudioJack" /> <java-symbol type="bool" name="config_safe_media_volume_enabled" /> <java-symbol type="bool" name="config_camera_sound_forced" /> |