Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add configuration possibilities for Emergency SOS" am: ee4ed8035b am: 5a81df5cd7

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2281068

Change-Id: Ifdecf9de41a55ebcdef0ae5efdc0d9aba175170b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Fan Zhang
2022-11-16 00:11:40 +00:00
committed by Automerger Merge Worker
parent 15a6074f17 5a81df5cd7
commit 03939123d0
3 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/res/res/values/config.xml
View File

@@ -3656,6 +3656,12 @@
experience while the device is non-interactive. -->
<bool name="config_emergencyGestureEnabled">true</bool>
<!-- Default value for Use Emergency SOS in Settings false = disabled, true = enabled -->
<bool name="config_defaultEmergencyGestureEnabled">true</bool>
<!-- Default value for Use Play countdown alarm in Settings false = disabled, true = enabled -->
<bool name="config_defaultEmergencyGestureSoundEnabled">false</bool>
<!-- Allow the gesture power + volume up to change the ringer mode while the device
is interactive. -->
<bool name="config_volumeHushGestureEnabled">true</bool>

2
core/res/res/values/symbols.xml
View File

@@ -3007,6 +3007,8 @@
<java-symbol type="integer" name="config_cameraLiftTriggerSensorType" />
<java-symbol type="string" name="config_cameraLiftTriggerSensorStringType" />
<java-symbol type="bool" name="config_emergencyGestureEnabled" />
<java-symbol type="bool" name="config_defaultEmergencyGestureEnabled" />
<java-symbol type="bool" name="config_defaultEmergencyGestureSoundEnabled" />
<java-symbol type="bool" name="config_volumeHushGestureEnabled" />
<java-symbol type="drawable" name="platlogo_m" />

8
services/core/java/com/android/server/GestureLauncherService.java
View File

@@ -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.
*/