Merge "Flip default values of two gesture settings." into nyc-mr1-dev

This commit is contained in:
Andrew Sapperstein
2016-06-23 00:29:25 +00:00
committed by Android (Google) Code Review

View File

@@ -61,7 +61,7 @@ public class GestureSettings extends SettingsPreferenceFragment implements
// Double tap power for camera // Double tap power for camera
if (isCameraDoubleTapPowerGestureAvailable(getResources())) { if (isCameraDoubleTapPowerGestureAvailable(getResources())) {
int cameraDisabled = Secure.getInt( int cameraDisabled = Secure.getInt(
getContentResolver(), Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, 1); getContentResolver(), Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, 0);
GesturePreference preference = GesturePreference preference =
(GesturePreference) findPreference(PREF_KEY_DOUBLE_TAP_POWER); (GesturePreference) findPreference(PREF_KEY_DOUBLE_TAP_POWER);
preference.setChecked(cameraDisabled == 0); preference.setChecked(cameraDisabled == 0);
@@ -74,7 +74,7 @@ public class GestureSettings extends SettingsPreferenceFragment implements
if (isDozeAvailable(context)) { if (isDozeAvailable(context)) {
GesturePreference preference = GesturePreference preference =
(GesturePreference) findPreference(PREF_KEY_PICK_UP_AND_NUDGE); (GesturePreference) findPreference(PREF_KEY_PICK_UP_AND_NUDGE);
int dozeEnabled = Secure.getInt(getContentResolver(), Secure.DOZE_ENABLED, 0); int dozeEnabled = Secure.getInt(getContentResolver(), Secure.DOZE_ENABLED, 1);
preference.setChecked(dozeEnabled != 0); preference.setChecked(dozeEnabled != 0);
preference.setOnPreferenceChangeListener(this); preference.setOnPreferenceChangeListener(this);
} else { } else {