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

Commit 3ccc53d3 authored by Matthew Fritze's avatar Matthew Fritze Committed by android-build-merger
Browse files

Assist and Voice Input SwitchPreferences animate with talkback am: 91e3e434

am: c1e6a5fe

Change-Id: I7cc31d00719dac72711689abc2c8c149534a65cc
parents e83f3bbc c1e6a5fe
Loading
Loading
Loading
Loading
+12 −6
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ public class ManageAssist extends SettingsPreferenceFragment
        if (preference == mContextPref) {
            Settings.Secure.putInt(getContentResolver(), Settings.Secure.ASSIST_STRUCTURE_ENABLED,
                    (boolean) newValue ? 1 : 0);
            postUpdateUi();
            postGuardScreenshotPref();
            return true;
        }
        if (preference == mScreenshotPref) {
@@ -101,15 +101,23 @@ public class ManageAssist extends SettingsPreferenceFragment
        return false;
    }

    private void postUpdateUi() {
    private void postGuardScreenshotPref() {
        mHandler.post(new Runnable() {
            @Override
            public void run() {
                updateUi();
                guardScreenshotPref();
            }
        });
    }

    private void guardScreenshotPref() {
        boolean isChecked = mContextPref.isChecked();
        boolean screenshotPrefWasSet = Settings.Secure.getInt(
                getContentResolver(), Settings.Secure.ASSIST_SCREENSHOT_ENABLED, 1) != 0;
        mScreenshotPref.setEnabled(isChecked);
        mScreenshotPref.setChecked(isChecked && screenshotPrefWasSet);
    }

    private void updateUi() {
        mDefaultAssitPref.refreshAssistApps();
        mVoiceInputPref.refreshVoiceInputs();
@@ -131,9 +139,7 @@ public class ManageAssist extends SettingsPreferenceFragment
            mVoiceInputPref.setAssistRestrict(currentAssist);
        }

        mScreenshotPref.setEnabled(mContextPref.isChecked());
        mScreenshotPref.setChecked(mContextPref.isChecked() && Settings.Secure.getInt(
                getContentResolver(), Settings.Secure.ASSIST_SCREENSHOT_ENABLED, 1) != 0);
        guardScreenshotPref();
    }

    private boolean isCurrentAssistVoiceService() {