Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f92211eb authored by Victoria Lestari's avatar Victoria Lestari Committed by Android (Google) Code Review
Browse files

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

parents f4bc3533 b0e707ee
Loading
Loading
Loading
Loading
+5 −7
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.settings.applications.assist;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.net.Uri;
import android.text.TextUtils;

@@ -45,9 +46,11 @@ public class DefaultVoiceInputPreferenceController extends DefaultAppPreferenceC
    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);
@@ -59,13 +62,8 @@ public class DefaultVoiceInputPreferenceController extends DefaultAppPreferenceC

    @Override
    public boolean isAvailable() {
        // If current assist is also voice service, don't show voice preference.
        final ComponentName currentVoiceService =
                DefaultVoiceInputPicker.getCurrentService(mHelper);
        final ComponentName currentAssist =
                mAssistUtils.getAssistComponentForUser(mUserId);
        return !DefaultVoiceInputPicker.isCurrentAssistVoiceService(
                currentAssist, currentVoiceService);
        return mContext.getPackageManager().hasSystemFeature(
                PackageManager.FEATURE_VOICE_RECOGNIZERS);
    }

    @Override