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

Commit 0493422d authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Always update value of screenshot preference" into nyc-dev

parents 7f6ba63f aa337e39

src/com/android/settings/applications/ManageAssist.java

+2 −5
Original line number Diff line number Diff line
@@ -60,8 +60,6 @@ public class ManageAssist extends SettingsPreferenceFragment 
        mContextPref.setOnPreferenceChangeListener(this);



        mScreenshotPref = (SwitchPreference) findPreference(KEY_SCREENSHOT);

        mScreenshotPref.setChecked(Settings.Secure.getInt(getContentResolver(),

                Settings.Secure.ASSIST_SCREENSHOT_ENABLED, 1) != 0);

        mScreenshotPref.setOnPreferenceChangeListener(this);



        mVoiceInputPref = (VoiceInputListPreference) findPreference(KEY_VOICE_INPUT);
@@ -134,9 +132,8 @@ public class ManageAssist extends SettingsPreferenceFragment 
        }



        mScreenshotPref.setEnabled(mContextPref.isChecked());

        if (!mContextPref.isChecked()) {

            mScreenshotPref.setChecked(false);

        }

        mScreenshotPref.setChecked(mContextPref.isChecked() && Settings.Secure.getInt(

                getContentResolver(), Settings.Secure.ASSIST_SCREENSHOT_ENABLED, 1) != 0);

    }



    private boolean isCurrentAssistVoiceService() {