summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/voice
diff options
context:
space:
mode:
authorJorim Jaggi <jjaggi@google.com>2015-07-10 16:48:37 -0700
committerJorim Jaggi <jjaggi@google.com>2015-07-14 04:13:57 +0000
commit0798ef0523b99212c4782d4fb0f1a68d903dbc39 (patch)
treebc0db71a64dcf10c5b7cc37ee2a9c38a3e975f3c /src/com/android/settings/voice
parent53dd1d4deea9968f1255018248ff0393252032dd (diff)
downloadpackages_apps_Settings-0798ef0523b99212c4782d4fb0f1a68d903dbc39.tar.gz
packages_apps_Settings-0798ef0523b99212c4782d4fb0f1a68d903dbc39.tar.bz2
packages_apps_Settings-0798ef0523b99212c4782d4fb0f1a68d903dbc39.zip
Disable voice input if assist is voice service
Bug: 22358252 Change-Id: Id4a9de8c5287c5e025d0ccc7f98edd8855db519c
Diffstat (limited to 'src/com/android/settings/voice')
-rw-r--r--src/com/android/settings/voice/VoiceInputListPreference.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/com/android/settings/voice/VoiceInputListPreference.java b/src/com/android/settings/voice/VoiceInputListPreference.java
index a131d21cf..ddb56d1f7 100644
--- a/src/com/android/settings/voice/VoiceInputListPreference.java
+++ b/src/com/android/settings/voice/VoiceInputListPreference.java
@@ -121,6 +121,16 @@ public class VoiceInputListPreference extends AppListPreferenceWithSettings {
}
}
+ public ComponentName getCurrentService() {
+ if (mHelper.mCurrentVoiceInteraction != null) {
+ return mHelper.mCurrentVoiceInteraction;
+ } else if (mHelper.mCurrentRecognizer != null) {
+ return mHelper.mCurrentRecognizer;
+ } else {
+ return null;
+ }
+ }
+
private class CustomAdapter extends ArrayAdapter<CharSequence> {
public CustomAdapter(Context context, CharSequence[] objects) {