PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove interactors from voice input settings

Browse Source 
Bug: 180960127

Tested: on device, emulator

Change-Id: I53a74e5d003a662b1e86a1c2d77e73ba84262201
This commit is contained in:
Victoria Lestari
2021-03-04 15:17:12 +00:00
parent e604c56241
commit b3729f6675
3 changed files with 7 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java
View File

@@ -26,7 +26,6 @@ import android.text.TextUtils;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.internal.app.AssistUtils;
import com.android.settings.applications.defaultapps.DefaultAppPreferenceController;
import com.android.settingslib.applications.DefaultAppInfo;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -42,17 +41,13 @@ public class DefaultVoiceInputPreferenceController extends DefaultAppPreferenceC
private static final String KEY_VOICE_INPUT = "voice_input_settings";
private VoiceInputHelper mHelper;
private AssistUtils mAssistUtils;
private PreferenceScreen mScreen;
private Preference mPreference;
private SettingObserver mSettingObserver;
private Context mContext;
public DefaultVoiceInputPreferenceController(Context context, Lifecycle lifecycle) {
super(context);
mContext = context;
mSettingObserver = new SettingObserver();
mAssistUtils = new AssistUtils(context);
mHelper = new VoiceInputHelper(context);
mHelper.buildUi();
if (lifecycle != null) {
@@ -80,7 +75,6 @@ public class DefaultVoiceInputPreferenceController extends DefaultAppPreferenceC
@Override
public void onResume() {
mSettingObserver.register(mContext.getContentResolver(), true);
updatePreference();
}
@@ -91,9 +85,7 @@ public class DefaultVoiceInputPreferenceController extends DefaultAppPreferenceC
}
@Override
public void onPause() {
mSettingObserver.register(mContext.getContentResolver(), false);
}
public void onPause() {}
@Override
protected DefaultAppInfo getDefaultAppInfo() {
@@ -101,12 +93,6 @@ public class DefaultVoiceInputPreferenceController extends DefaultAppPreferenceC
if (defaultKey == null) {
return null;
}
for (VoiceInputHelper.InteractionInfo info : mHelper.mAvailableInteractionInfos) {
if (TextUtils.equals(defaultKey, info.key)) {
return new DefaultVoiceInputPicker.VoiceInputDefaultAppInfo(mContext,
mPackageManager, mUserId, info, true /* enabled */);
}
}
for (VoiceInputHelper.RecognizerInfo info : mHelper.mAvailableRecognizerInfos) {
if (TextUtils.equals(defaultKey, info.key)) {
@@ -149,16 +135,4 @@ public class DefaultVoiceInputPreferenceController extends DefaultAppPreferenceC
}
return currentService.flattenToShortString();
}
class SettingObserver extends AssistSettingObserver {
@Override
protected List<Uri> getSettingUris() {
return null;
}
@Override
public void onSettingChange() {
updatePreference();
}
}
}