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

Don't use screenshot if structure is disabled (2/2)

Browse Source 
Bug: 22674955
Change-Id: I78208a4c746e3a501fe264918607ef94f64a8034
This commit is contained in:
Jorim Jaggi
2015-07-27 17:48:02 -07:00
parent 32b96646ee
commit e32c17580e
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/applications/ManageAssist.java
View File

@@ -20,6 +20,7 @@ import android.app.AlertDialog;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler;
import android.preference.Preference; import android.preference.Preference;
import android.preference.SwitchPreference; import android.preference.SwitchPreference;
import android.provider.Settings; import android.provider.Settings;
@@ -45,6 +46,7 @@ public class ManageAssist extends SettingsPreferenceFragment
private SwitchPreference mContextPref; private SwitchPreference mContextPref;
private SwitchPreference mScreenshotPref; private SwitchPreference mScreenshotPref;
private VoiceInputListPreference mVoiceInputPref; private VoiceInputListPreference mVoiceInputPref;
private Handler mHandler = new Handler();
@Override @Override
public void onCreate(Bundle icicle) { public void onCreate(Bundle icicle) {
@@ -78,6 +80,7 @@ public class ManageAssist extends SettingsPreferenceFragment
if (preference == mContextPref) { if (preference == mContextPref) {
Settings.Secure.putInt(getContentResolver(), Settings.Secure.ASSIST_STRUCTURE_ENABLED, Settings.Secure.putInt(getContentResolver(), Settings.Secure.ASSIST_STRUCTURE_ENABLED,
(boolean) newValue ? 1 : 0); (boolean) newValue ? 1 : 0);
postUpdateUi();
return true; return true;
} }
if (preference == mScreenshotPref) { if (preference == mScreenshotPref) {
@@ -102,6 +105,15 @@ public class ManageAssist extends SettingsPreferenceFragment
return false; return false;
} }
private void postUpdateUi() {
mHandler.post(new Runnable() {
@Override
public void run() {
updateUi();
}
});
}
private void updateUi() { private void updateUi() {
mDefaultAssitPref.refreshAssistApps(); mDefaultAssitPref.refreshAssistApps();
mVoiceInputPref.refreshVoiceInputs(); mVoiceInputPref.refreshVoiceInputs();
@@ -122,6 +134,11 @@ public class ManageAssist extends SettingsPreferenceFragment
getPreferenceScreen().addPreference(mVoiceInputPref); getPreferenceScreen().addPreference(mVoiceInputPref);
mVoiceInputPref.setAssistRestrict(currentAssist); mVoiceInputPref.setAssistRestrict(currentAssist);
} }
mScreenshotPref.setEnabled(mContextPref.isChecked());
if (!mContextPref.isChecked()) {
mScreenshotPref.setChecked(false);
}
} }
private boolean isCurrentAssistVoiceService() { private boolean isCurrentAssistVoiceService() {