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

Add default value to inline payloads

Browse Source 
If we try to set an inline result when it has not yet been
accessed in settings, nothing is read from Settings.
Thus, include a default value for a fallback.

Manual merge for: ag/2588219/

Change-Id: I3b8eea4f82764852cea642db4455ba57f10a7d37
Fixes: 63955012
Test: robotests
This commit is contained in:
Matthew Fritze
2017-07-24 14:58:36 -07:00
parent 96a14ff07e
commit 458bb887e1
17 changed files with 87 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/gestures/AssistGesturePreferenceController.java
View File

@@ -32,6 +32,8 @@ import com.android.settings.search.ResultPayload;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.events.OnResume;
import static android.provider.Settings.Secure.ASSIST_GESTURE_ENABLED;
public class AssistGesturePreferenceController extends GesturePreferenceController
implements OnResume {
@@ -41,6 +43,8 @@ public class AssistGesturePreferenceController extends GesturePreferenceControll
private static final String PREF_KEY_VIDEO = "gesture_assist_video";
private final String mAssistGesturePrefKey;
private final String SECURE_KEY = ASSIST_GESTURE_ENABLED;
private final AssistGestureFeatureProvider mFeatureProvider;
private boolean mWasAvailable;
@@ -142,8 +146,7 @@ public class AssistGesturePreferenceController extends GesturePreferenceControll
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
final boolean enabled = (boolean) newValue;
Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.ASSIST_GESTURE_ENABLED, enabled ? ON : OFF);
Settings.Secure.putInt(mContext.getContentResolver(), SECURE_KEY, enabled ? ON : OFF);
updateState(preference);
return true;
}
@@ -161,7 +164,7 @@ public class AssistGesturePreferenceController extends GesturePreferenceControll
@Override
protected boolean isSwitchPrefEnabled() {
final int assistGestureEnabled = Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.ASSIST_GESTURE_ENABLED, 1);
SECURE_KEY, ON);
return assistGestureEnabled != 0;
}
@@ -171,7 +174,7 @@ public class AssistGesturePreferenceController extends GesturePreferenceControll
AssistGestureSettings.class.getName(), mAssistGesturePrefKey,
mContext.getString(R.string.display_settings));
return new InlineSwitchPayload(Settings.Secure.ASSIST_GESTURE_ENABLED,
ResultPayload.SettingsSource.SECURE, ON, intent, isAvailable());
return new InlineSwitchPayload(SECURE_KEY, ResultPayload.SettingsSource.SECURE,
ON /* onValue */, intent, isAvailable(), ON /* defaultValue */);
}
}