diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 3a398096e0c07..3ac5df6ba9150 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -3656,6 +3656,12 @@ experience while the device is non-interactive. --> true + + true + + + false + true diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 05057702d2fb2..903901f4048bf 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -3007,6 +3007,8 @@ + + diff --git a/services/core/java/com/android/server/GestureLauncherService.java b/services/core/java/com/android/server/GestureLauncherService.java index e529010e6b7d4..7d2e2766fd0b8 100644 --- a/services/core/java/com/android/server/GestureLauncherService.java +++ b/services/core/java/com/android/server/GestureLauncherService.java @@ -466,7 +466,8 @@ public class GestureLauncherService extends SystemService { public static boolean isEmergencyGestureSettingEnabled(Context context, int userId) { return isEmergencyGestureEnabled(context.getResources()) && Settings.Secure.getIntForUser(context.getContentResolver(), - Settings.Secure.EMERGENCY_GESTURE_ENABLED, 1, userId) != 0; + Settings.Secure.EMERGENCY_GESTURE_ENABLED, + isDefaultEmergencyGestureEnabled(context.getResources()) ? 1 : 0, userId) != 0; } /** @@ -513,6 +514,11 @@ public class GestureLauncherService extends SystemService { return resources.getBoolean(com.android.internal.R.bool.config_emergencyGestureEnabled); } + private static boolean isDefaultEmergencyGestureEnabled(Resources resources) { + return resources.getBoolean( + com.android.internal.R.bool.config_defaultEmergencyGestureEnabled); + } + /** * Whether GestureLauncherService should be enabled according to system properties. */