Merge "Add Panic button sound preference to panic gesture settings page."

res/values/config.xml

@@ -461,5 +461,5 @@
     <bool name="config_show_smooth_display">false</bool>
 
     <!-- Whether to show panic button gesture in Settings -->
-    <bool name="config_show_emergency_sos_gesture_settings">true</bool>
+    <bool name="config_show_panic_gesture_settings">true</bool>
 </resources>

res/values/strings.xml

@@ -10943,10 +10943,16 @@
     <string name="ambient_display_tap_screen_summary">To check time, notifications, and other info, tap your screen.</string>
 
     <!-- Preference title to enable feature for calling emergency services at panic/distress moments[CHAR_LIMIT=60]-->
-    <string name="emergency_sos_gesture_screen_title">Panic button</string>
+    <string name="panic_gesture_screen_title">Panic button</string>
 
     <!-- Preference summary to enable feature for calling emergency services at panic/distress moments[CHAR_LIMIT=NONE]-->
-    <string name="emergency_sos_gesture_screen_summary">Start the emergency SOS actions by pressing the power button quickly 5 times.</string>
+    <string name="panic_gesture_screen_summary">Start the emergency SOS actions by pressing the power button quickly 5 times.</string>
+
+    <!-- Preference title to enable generating noisy sound before calling emergency services at panic/distress moments[CHAR_LIMIT=60]-->
+    <string name="panic_gesture_sound_setting_title">Warning sound</string>
+
+    <!-- Preference summary to enable generating noisy sound before calling emergency services at panic/distress moments[CHAR_LIMIT=NONE]-->
+    <string name="panic_gesture_sound_setting_summary">Alert before starting the actions</string>
 
     <!-- Title text for swiping downwards on fingerprint sensor for notifications [CHAR LIMIT=80]-->
     <string name="fingerprint_swipe_for_notifications_title">Swipe fingerprint for notifications</string>

res/xml/gestures.xml

@@ -21,10 +21,10 @@
     android:title="@string/gesture_preference_title">
 
     <Preference
-        android:key="emergency_sos_button_summary"
+        android:key="gesture_panic_button_summary"
-        android:title="@string/emergency_sos_gesture_screen_title"
+        android:title="@string/panic_gesture_screen_title"
-        android:fragment="com.android.settings.gestures.EmergencySosGestureSettings"
+        android:fragment="com.android.settings.gestures.PanicGestureSettings"
-        settings:controller="com.android.settings.gestures.EmergencySosGesturePreferenceController" />
+        settings:controller="com.android.settings.gestures.PanicGesturePreferenceController" />
 
     <Preference
         android:key="gesture_assist_input_summary"

res/xml/panic_gesture_settings.xml

@@ -18,19 +18,27 @@
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:title="@string/emergency_sos_gesture_screen_title">
+    android:title="@string/panic_gesture_screen_title">
 
     <com.android.settings.widget.VideoPreference
-        android:key="gesture_emergency_sos_button_screen_video"
+        android:key="panic_button_screen_video"
         app:animation="@raw/gesture_double_tap"
         app:preview="@drawable/gesture_double_tap" />
 
     <SwitchPreference
-        android:key="gesture_emergency_sos_button"
+        android:key="gesture_panic_button"
-        android:title="@string/emergency_sos_gesture_screen_title"
+        android:title="@string/panic_gesture_screen_title"
-        android:summary="@string/emergency_sos_gesture_screen_summary"
+        android:summary="@string/panic_gesture_screen_summary"
         app:keywords="@string/keywords_gesture"
-        app:controller="com.android.settings.gestures.EmergencySosGesturePreferenceController"
+        app:controller="com.android.settings.gestures.PanicGesturePreferenceController"
+        app:allowDividerAbove="true" />
+
+    <SwitchPreference
+        android:key="panic_gesture_sound"
+        android:title="@string/panic_gesture_sound_setting_title"
+        android:summary="@string/panic_gesture_sound_setting_summary"
+        app:keywords="@string/keywords_gesture"
+        app:controller="com.android.settings.gestures.PanicGestureSoundPreferenceController"
         app:allowDividerAbove="true" />
 
 </PreferenceScreen>

src/com/android/settings/gestures/PanicGesturePreferenceController.java

@@ -27,24 +27,24 @@ import com.android.settings.R;
 /**
  * Preference controller for emergency sos gesture setting
  */
-public class EmergencySosGesturePreferenceController extends GesturePreferenceController {
+public class PanicGesturePreferenceController extends GesturePreferenceController {
 
     @VisibleForTesting
     static final int ON = 1;
     @VisibleForTesting
     static final int OFF = 0;
 
-    private static final String PREF_KEY_VIDEO = "gesture_emergency_sos_button_screen_video";
+    private static final String PREF_KEY_VIDEO = "panic_button_screen_video";
 
     private static final String SECURE_KEY = Settings.Secure.PANIC_GESTURE_ENABLED;
 
-    public EmergencySosGesturePreferenceController(Context context, String key) {
+    public PanicGesturePreferenceController(Context context, String key) {
         super(context, key);
     }
 
     private static boolean isGestureAvailable(Context context) {
         return context.getResources()
-                .getBoolean(R.bool.config_show_emergency_sos_gesture_settings);
+                .getBoolean(R.bool.config_show_panic_gesture_settings);
     }
 
     @Override
@@ -54,7 +54,7 @@ public class EmergencySosGesturePreferenceController extends GesturePreferenceCo
 
     @Override
     public boolean isSliceable() {
-        return TextUtils.equals(getPreferenceKey(), "gesture_emergency_sos_button");
+        return TextUtils.equals(getPreferenceKey(), "gesture_panic_button");
     }
 
     @Override

src/com/android/settings/gestures/PanicGestureSettings.java

@@ -27,13 +27,13 @@ import com.android.settingslib.search.SearchIndexable;
  * Settings page for emergency sos gesture
  */
 @SearchIndexable
-public class EmergencySosGestureSettings extends DashboardFragment {
+public class PanicGestureSettings extends DashboardFragment {
 
     private static final String TAG = "PanicGestureSettings";
 
     @Override
     protected int getPreferenceScreenResId() {
-        return R.xml.emergency_sos_gesture_settings;
+        return R.xml.panic_gesture_settings;
     }
 
     @Override
@@ -47,5 +47,5 @@ public class EmergencySosGestureSettings extends DashboardFragment {
     }
 
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.emergency_sos_gesture_settings);
+            new BaseSearchIndexProvider(R.xml.panic_gesture_settings);
 }

src/com/android/settings/gestures/PanicGestureSoundPreferenceController.java

@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.annotation.VisibleForTesting;
+
+import com.android.settings.R;
+import com.android.settings.core.TogglePreferenceController;
+
+/**
+ * Preference controller for emergency sos gesture setting
+ */
+public class PanicGestureSoundPreferenceController extends TogglePreferenceController {
+
+    @VisibleForTesting
+    static final int ON = 1;
+    @VisibleForTesting
+    static final int OFF = 0;
+
+    private static final String SECURE_KEY = Settings.Secure.PANIC_SOUND_ENABLED;
+
+    public PanicGestureSoundPreferenceController(Context context, String key) {
+        super(context, key);
+    }
+
+    private static boolean isGestureAvailable(Context context) {
+        return context.getResources()
+                .getBoolean(R.bool.config_show_panic_gesture_settings);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return isGestureAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+    }
+
+    @Override
+    public boolean isSliceable() {
+        return false;
+    }
+
+    @Override
+    public boolean isChecked() {
+        return Settings.Secure.getInt(mContext.getContentResolver(), SECURE_KEY, ON) == ON;
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        return Settings.Secure.putInt(mContext.getContentResolver(), SECURE_KEY,
+                isChecked ? ON : OFF);
+    }
+}

tests/robotests/src/com/android/settings/gestures/PanicGesturePreferenceControllerTest.java

@@ -16,8 +16,8 @@
 
 package com.android.settings.gestures;
 
-import static com.android.settings.gestures.EmergencySosGesturePreferenceController.OFF;
+import static com.android.settings.gestures.PanicGesturePreferenceController.OFF;
-import static com.android.settings.gestures.EmergencySosGesturePreferenceController.ON;
+import static com.android.settings.gestures.PanicGesturePreferenceController.ON;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -39,19 +39,19 @@ import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = SettingsShadowResources.class)
-public class EmergencySosGesturePreferenceControllerTest {
+public class PanicGesturePreferenceControllerTest {
 
 
     private Context mContext;
     private ContentResolver mContentResolver;
-    private EmergencySosGesturePreferenceController mController;
+    private PanicGesturePreferenceController mController;
-    private static final String PREF_KEY = "gesture_emergency_sos_button";
+    private static final String PREF_KEY = "gesture_panic_button";
 
     @Before
     public void setUp() {
         mContext = ApplicationProvider.getApplicationContext();
         mContentResolver = mContext.getContentResolver();
-        mController = new EmergencySosGesturePreferenceController(mContext, PREF_KEY);
+        mController = new PanicGesturePreferenceController(mContext, PREF_KEY);
     }
 
     @After
@@ -62,7 +62,7 @@ public class EmergencySosGesturePreferenceControllerTest {
     @Test
     public void isAvailable_configIsTrue_shouldReturnTrue() {
         SettingsShadowResources.overrideResource(
-                R.bool.config_show_emergency_sos_gesture_settings,
+                R.bool.config_show_panic_gesture_settings,
                 Boolean.TRUE);
 
         assertThat(mController.isAvailable()).isTrue();
@@ -71,7 +71,7 @@ public class EmergencySosGesturePreferenceControllerTest {
     @Test
     public void isAvailable_configIsTrue_shouldReturnFalse() {
         SettingsShadowResources.overrideResource(
-                R.bool.config_show_emergency_sos_gesture_settings,
+                R.bool.config_show_panic_gesture_settings,
                 Boolean.FALSE);
 
         assertThat(mController.isAvailable()).isFalse();
@@ -81,7 +81,7 @@ public class EmergencySosGesturePreferenceControllerTest {
     public void isChecked_configIsNotSet_shouldReturnTrue() {
         // Set the setting to be enabled.
         Settings.Secure.putInt(mContentResolver, Settings.Secure.PANIC_GESTURE_ENABLED, ON);
-        mController = new EmergencySosGesturePreferenceController(mContext, PREF_KEY);
+        mController = new PanicGesturePreferenceController(mContext, PREF_KEY);
 
         assertThat(mController.isChecked()).isTrue();
     }
@@ -90,15 +90,15 @@ public class EmergencySosGesturePreferenceControllerTest {
     public void isChecked_configIsSet_shouldReturnFalse() {
         // Set the setting to be disabled.
         Settings.Secure.putInt(mContentResolver, Settings.Secure.PANIC_GESTURE_ENABLED, OFF);
-        mController = new EmergencySosGesturePreferenceController(mContext, PREF_KEY);
+        mController = new PanicGesturePreferenceController(mContext, PREF_KEY);
 
         assertThat(mController.isChecked()).isFalse();
     }
 
     @Test
     public void isSliceableCorrectKey_returnsTrue() {
-        final EmergencySosGesturePreferenceController controller =
+        final PanicGesturePreferenceController controller =
-                new EmergencySosGesturePreferenceController(mContext, PREF_KEY);
+                new PanicGesturePreferenceController(mContext, PREF_KEY);
         assertThat(controller.isSliceable()).isTrue();
     }
 

tests/robotests/src/com/android/settings/gestures/PanicGestureSoundPreferenceControllerTest.java

@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import static com.android.settings.gestures.PanicGesturePreferenceController.OFF;
+import static com.android.settings.gestures.PanicGesturePreferenceController.ON;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.R;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = SettingsShadowResources.class)
+public class PanicGestureSoundPreferenceControllerTest {
+
+    private Context mContext;
+    private ContentResolver mContentResolver;
+    private PanicGestureSoundPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mContentResolver = mContext.getContentResolver();
+        mController = new PanicGestureSoundPreferenceController(mContext, "test_key");
+    }
+
+    @After
+    public void tearDown() {
+        SettingsShadowResources.reset();
+    }
+
+    @Test
+    public void isAvailable_configIsTrue_shouldReturnTrue() {
+        SettingsShadowResources.overrideResource(
+                R.bool.config_show_panic_gesture_settings,
+                Boolean.TRUE);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_configIsTrue_shouldReturnFalse() {
+        SettingsShadowResources.overrideResource(
+                R.bool.config_show_panic_gesture_settings,
+                Boolean.FALSE);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isChecked_configIsSet_shouldReturnTrue() {
+        // Set the setting to be enabled.
+        Settings.Secure.putInt(mContentResolver, Settings.Secure.PANIC_SOUND_ENABLED, ON);
+
+        assertThat(mController.isChecked()).isTrue();
+    }
+
+    @Test
+    public void isChecked_configIsSetToFalse_shouldReturnFalse() {
+        // Set the setting to be disabled.
+        Settings.Secure.putInt(mContentResolver, Settings.Secure.PANIC_SOUND_ENABLED, OFF);
+
+        assertThat(mController.isChecked()).isFalse();
+    }
+
+    @Test
+    public void isSliceable_returnsFalse() {
+        assertThat(mController.isSliceable()).isFalse();
+    }
+
+}