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

Merge "Show VoiceInput settings at all times" into sc-dev am: f92211eb6f

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13471611

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I05edf4bcc811d207229c1fba589a781778e4ec1c
This commit is contained in:
Victoria Lestari
2021-02-19 15:06:39 +00:00
committed by Automerger Merge Worker
parent c71b55bdcb f92211eb6f
commit 5e6d0216cf
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,7 @@ package com.android.settings.applications.assist;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager;
import android.net.Uri; import android.net.Uri;
import android.text.TextUtils; import android.text.TextUtils;
@@ -45,9 +46,11 @@ public class DefaultVoiceInputPreferenceController extends DefaultAppPreferenceC
private PreferenceScreen mScreen; private PreferenceScreen mScreen;
private Preference mPreference; private Preference mPreference;
private SettingObserver mSettingObserver; private SettingObserver mSettingObserver;
private Context mContext;
public DefaultVoiceInputPreferenceController(Context context, Lifecycle lifecycle) { public DefaultVoiceInputPreferenceController(Context context, Lifecycle lifecycle) {
super(context); super(context);
mContext = context;
mSettingObserver = new SettingObserver(); mSettingObserver = new SettingObserver();
mAssistUtils = new AssistUtils(context); mAssistUtils = new AssistUtils(context);
mHelper = new VoiceInputHelper(context); mHelper = new VoiceInputHelper(context);
@@ -59,13 +62,8 @@ public class DefaultVoiceInputPreferenceController extends DefaultAppPreferenceC
@Override @Override
public boolean isAvailable() { public boolean isAvailable() {
// If current assist is also voice service, don't show voice preference. return mContext.getPackageManager().hasSystemFeature(
final ComponentName currentVoiceService = PackageManager.FEATURE_VOICE_RECOGNIZERS);
DefaultVoiceInputPicker.getCurrentService(mHelper);
final ComponentName currentAssist =
mAssistUtils.getAssistComponentForUser(mUserId);
return !DefaultVoiceInputPicker.isCurrentAssistVoiceService(
currentAssist, currentVoiceService);
} }
@Override @Override