Merge "Camera lift settings are now default-on."

2017-06-06 23:26:05 +00:00
parent 62dded4453 dab739acce
commit 9cdd5d6ea2
2 changed files with 11 additions and 1 deletions
--- a/src/com/android/settings/gestures/CameraLiftTriggerPreferenceController.java
+++ b/src/com/android/settings/gestures/CameraLiftTriggerPreferenceController.java
@@ -61,7 +61,8 @@ public class CameraLiftTriggerPreferenceController extends GesturePreferenceCont
    @Override
    protected boolean isSwitchPrefEnabled() {
        final int triggerEnabled = Settings.Secure.getInt(mContext.getContentResolver(),
-                Settings.Secure.CAMERA_LIFT_TRIGGER_ENABLED, 0);
+                Settings.Secure.CAMERA_LIFT_TRIGGER_ENABLED,
+                Settings.Secure.CAMERA_LIFT_TRIGGER_ENABLED_DEFAULT);
        return triggerEnabled == 1;
    }
 }