Unify voice interactor and recognizer settings.
There is now one settings UI to select both the new voice interactor and old voice recognizer. There are still a few wonky things about this that won't be resolved until we start requiring that all interactors specify an associated recognizer service. Change-Id: Ib702ff717fb28bcb244cb30e49577066ddc9f197
This commit is contained in:
163
src/com/android/settings/voice/VoiceInputSettings.java
Normal file
163
src/com/android/settings/voice/VoiceInputSettings.java
Normal file
@@ -0,0 +1,163 @@
|
||||
/*
|
||||
* Copyright (C) 2014 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.voice;
|
||||
|
||||
import android.preference.Preference;
|
||||
import android.provider.Settings;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.SettingsPreferenceFragment;
|
||||
import com.android.settings.voice.VoiceInputPreference.RadioButtonGroupState;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.preference.PreferenceCategory;
|
||||
import android.widget.Checkable;
|
||||
|
||||
public class VoiceInputSettings extends SettingsPreferenceFragment implements
|
||||
Preference.OnPreferenceClickListener, RadioButtonGroupState {
|
||||
|
||||
private static final String TAG = "VoiceInputSettings";
|
||||
private static final boolean DBG = false;
|
||||
|
||||
/**
|
||||
* Preference key for the engine selection preference.
|
||||
*/
|
||||
private static final String KEY_SERVICE_PREFERENCE_SECTION =
|
||||
"voice_service_preference_section";
|
||||
|
||||
private PreferenceCategory mServicePreferenceCategory;
|
||||
|
||||
private CharSequence mInteractorSummary;
|
||||
private CharSequence mRecognizerSummary;
|
||||
private CharSequence mInteractorWarning;
|
||||
|
||||
/**
|
||||
* The currently selected engine.
|
||||
*/
|
||||
private String mCurrentKey;
|
||||
|
||||
/**
|
||||
* The engine checkbox that is currently checked. Saves us a bit of effort
|
||||
* in deducing the right one from the currently selected engine.
|
||||
*/
|
||||
private Checkable mCurrentChecked;
|
||||
|
||||
private VoiceInputHelper mHelper;
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
addPreferencesFromResource(R.xml.voice_input_settings);
|
||||
|
||||
mServicePreferenceCategory = (PreferenceCategory) findPreference(
|
||||
KEY_SERVICE_PREFERENCE_SECTION);
|
||||
|
||||
mInteractorSummary = getActivity().getText(
|
||||
R.string.voice_interactor_preference_summary);
|
||||
mRecognizerSummary = getActivity().getText(
|
||||
R.string.voice_recognizer_preference_summary);
|
||||
mInteractorWarning = getActivity().getText(R.string.voice_interaction_security_warning);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onStart() {
|
||||
super.onStart();
|
||||
initSettings();
|
||||
}
|
||||
|
||||
private void initSettings() {
|
||||
mHelper = new VoiceInputHelper(getActivity());
|
||||
mHelper.buildUi();
|
||||
|
||||
mServicePreferenceCategory.removeAll();
|
||||
|
||||
if (mHelper.mCurrentVoiceInteraction != null) {
|
||||
mCurrentKey = mHelper.mCurrentVoiceInteraction.flattenToShortString();
|
||||
} else if (mHelper.mCurrentRecognizer != null) {
|
||||
mCurrentKey = mHelper.mCurrentRecognizer.flattenToShortString();
|
||||
} else {
|
||||
mCurrentKey = null;
|
||||
}
|
||||
|
||||
for (int i=0; i<mHelper.mAvailableInteractionInfos.size(); i++) {
|
||||
VoiceInputHelper.InteractionInfo info = mHelper.mAvailableInteractionInfos.get(i);
|
||||
VoiceInputPreference pref = new VoiceInputPreference(getActivity(), info,
|
||||
mInteractorSummary, mInteractorWarning, this);
|
||||
mServicePreferenceCategory.addPreference(pref);
|
||||
}
|
||||
|
||||
for (int i=0; i<mHelper.mAvailableRecognizerInfos.size(); i++) {
|
||||
VoiceInputHelper.RecognizerInfo info = mHelper.mAvailableRecognizerInfos.get(i);
|
||||
VoiceInputPreference pref = new VoiceInputPreference(getActivity(), info,
|
||||
mRecognizerSummary, null, this);
|
||||
mServicePreferenceCategory.addPreference(pref);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Checkable getCurrentChecked() {
|
||||
return mCurrentChecked;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getCurrentKey() {
|
||||
return mCurrentKey;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setCurrentChecked(Checkable current) {
|
||||
mCurrentChecked = current;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setCurrentKey(String key) {
|
||||
mCurrentKey = key;
|
||||
for (int i=0; i<mHelper.mAvailableInteractionInfos.size(); i++) {
|
||||
VoiceInputHelper.InteractionInfo info = mHelper.mAvailableInteractionInfos.get(i);
|
||||
if (info.key.equals(key)) {
|
||||
// Put the new value back into secure settings.
|
||||
Settings.Secure.putString(getActivity().getContentResolver(),
|
||||
Settings.Secure.VOICE_INTERACTION_SERVICE, key);
|
||||
// Eventually we will require that an interactor always specify a recognizer
|
||||
if (info.settings != null) {
|
||||
Settings.Secure.putString(getActivity().getContentResolver(),
|
||||
Settings.Secure.VOICE_RECOGNITION_SERVICE,
|
||||
info.settings.flattenToShortString());
|
||||
}
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
for (int i=0; i<mHelper.mAvailableRecognizerInfos.size(); i++) {
|
||||
VoiceInputHelper.RecognizerInfo info = mHelper.mAvailableRecognizerInfos.get(i);
|
||||
if (info.key.equals(key)) {
|
||||
Settings.Secure.putString(getActivity().getContentResolver(),
|
||||
Settings.Secure.VOICE_INTERACTION_SERVICE, null);
|
||||
Settings.Secure.putString(getActivity().getContentResolver(),
|
||||
Settings.Secure.VOICE_RECOGNITION_SERVICE, key);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onPreferenceClick(Preference preference) {
|
||||
if (preference instanceof VoiceInputPreference) {
|
||||
((VoiceInputPreference)preference).doClick();
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user