diff options
| -rwxr-xr-x | core/java/android/provider/Settings.java | 7 | ||||
| -rw-r--r-- | services/core/java/com/android/server/GestureLauncherService.java | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 172ba89bb3bf..e0abfb56c1b0 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -6781,6 +6781,13 @@ public final class Settings { public static final String CAMERA_LIFT_TRIGGER_ENABLED = "camera_lift_trigger_enabled"; /** + * The default enable state of the camera lift trigger. + * + * @hide + */ + public static final int CAMERA_LIFT_TRIGGER_ENABLED_DEFAULT = 1; + + /** * Whether the assist gesture should be enabled. * * @hide diff --git a/services/core/java/com/android/server/GestureLauncherService.java b/services/core/java/com/android/server/GestureLauncherService.java index 47f157da8790..b408da85425d 100644 --- a/services/core/java/com/android/server/GestureLauncherService.java +++ b/services/core/java/com/android/server/GestureLauncherService.java @@ -320,7 +320,8 @@ public class GestureLauncherService extends SystemService { public static boolean isCameraLiftTriggerSettingEnabled(Context context, int userId) { return isCameraLiftTriggerEnabled(context.getResources()) && (Settings.Secure.getIntForUser(context.getContentResolver(), - Settings.Secure.CAMERA_LIFT_TRIGGER_ENABLED, 0, userId) != 0); + Settings.Secure.CAMERA_LIFT_TRIGGER_ENABLED, + Settings.Secure.CAMERA_LIFT_TRIGGER_ENABLED_DEFAULT, userId) != 0); } /** |