Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e6469d1 authored by Fan Zhang's avatar Fan Zhang Committed by Automerger Merge Worker
Browse files

Merge "Add configuration possibilities for Emergency SOS" am: ee4ed803 am:... 

Merge "Add configuration possibilities for Emergency SOS" am: ee4ed803 am: 5a81df5c am: 03939123

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



Change-Id: I983023d67a8dcd6de6355ea135f7171e4e28c5f6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c7da4476 03939123

core/res/res/values/config.xml

+6 −0
Original line number Original line Diff line number Diff line
@@ -3688,6 +3688,12 @@ 
         experience while the device is non-interactive. -->

         experience while the device is non-interactive. -->

    <bool name="config_emergencyGestureEnabled">true</bool>

    <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

    <!-- Allow the gesture power + volume up to change the ringer mode while the device

         is interactive. -->

         is interactive. -->

    <bool name="config_volumeHushGestureEnabled">true</bool>

    <bool name="config_volumeHushGestureEnabled">true</bool>

core/res/res/values/symbols.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -3015,6 +3015,8 @@ 
  <java-symbol type="integer" name="config_cameraLiftTriggerSensorType" />

  <java-symbol type="integer" name="config_cameraLiftTriggerSensorType" />

  <java-symbol type="string" name="config_cameraLiftTriggerSensorStringType" />

  <java-symbol type="string" name="config_cameraLiftTriggerSensorStringType" />

  <java-symbol type="bool" name="config_emergencyGestureEnabled" />

  <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="bool" name="config_volumeHushGestureEnabled" />





  <java-symbol type="drawable" name="platlogo_m" />

  <java-symbol type="drawable" name="platlogo_m" />

services/core/java/com/android/server/GestureLauncherService.java

+7 −1
Original line number Original line Diff line number Diff line
@@ -466,7 +466,8 @@ public class GestureLauncherService extends SystemService { 
    public static boolean isEmergencyGestureSettingEnabled(Context context, int userId) {

    public static boolean isEmergencyGestureSettingEnabled(Context context, int userId) {

        return isEmergencyGestureEnabled(context.getResources())

        return isEmergencyGestureEnabled(context.getResources())

                && Settings.Secure.getIntForUser(context.getContentResolver(),

                && 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);

        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.

     * Whether GestureLauncherService should be enabled according to system properties.

     */

     */