diff --git a/res/values/config.xml b/res/values/config.xml index 9272c5f3c15..be5abda4e90 100755 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -461,5 +461,5 @@ false - true + true diff --git a/res/values/strings.xml b/res/values/strings.xml index c861f1089bb..113fea0f50d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -10949,10 +10949,16 @@ To check time, notifications, and other info, tap your screen. - Panic button + Panic button - Start the emergency SOS actions by pressing the power button quickly 5 times. + Start the emergency SOS actions by pressing the power button quickly 5 times. + + + Warning sound + + + Alert before starting the actions Swipe fingerprint for notifications diff --git a/res/xml/gestures.xml b/res/xml/gestures.xml index 312a430e928..fb519d07a69 100644 --- a/res/xml/gestures.xml +++ b/res/xml/gestures.xml @@ -21,10 +21,10 @@ android:title="@string/gesture_preference_title"> + android:key="gesture_panic_button_summary" + android:title="@string/panic_gesture_screen_title" + android:fragment="com.android.settings.gestures.PanicGestureSettings" + settings:controller="com.android.settings.gestures.PanicGesturePreferenceController" /> + android:title="@string/panic_gesture_screen_title"> + + diff --git a/src/com/android/settings/gestures/EmergencySosGesturePreferenceController.java b/src/com/android/settings/gestures/PanicGesturePreferenceController.java similarity index 81% rename from src/com/android/settings/gestures/EmergencySosGesturePreferenceController.java rename to src/com/android/settings/gestures/PanicGesturePreferenceController.java index 842f19576b2..947cbb9f8a9 100644 --- a/src/com/android/settings/gestures/EmergencySosGesturePreferenceController.java +++ b/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 diff --git a/src/com/android/settings/gestures/EmergencySosGestureSettings.java b/src/com/android/settings/gestures/PanicGestureSettings.java similarity index 87% rename from src/com/android/settings/gestures/EmergencySosGestureSettings.java rename to src/com/android/settings/gestures/PanicGestureSettings.java index 5eac293e9dd..c29604776aa 100644 --- a/src/com/android/settings/gestures/EmergencySosGestureSettings.java +++ b/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); } diff --git a/src/com/android/settings/gestures/PanicGestureSoundPreferenceController.java b/src/com/android/settings/gestures/PanicGestureSoundPreferenceController.java new file mode 100644 index 00000000000..332636a047c --- /dev/null +++ b/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); + } +} diff --git a/tests/robotests/src/com/android/settings/gestures/EmergencySosGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PanicGesturePreferenceControllerTest.java similarity index 76% rename from tests/robotests/src/com/android/settings/gestures/EmergencySosGesturePreferenceControllerTest.java rename to tests/robotests/src/com/android/settings/gestures/PanicGesturePreferenceControllerTest.java index 605738d368c..d071681b05f 100644 --- a/tests/robotests/src/com/android/settings/gestures/EmergencySosGesturePreferenceControllerTest.java +++ b/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.EmergencySosGesturePreferenceController.ON; +import static com.android.settings.gestures.PanicGesturePreferenceController.OFF; +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 static final String PREF_KEY = "gesture_emergency_sos_button"; + private PanicGesturePreferenceController mController; + 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 = - new EmergencySosGesturePreferenceController(mContext, PREF_KEY); + final PanicGesturePreferenceController controller = + new PanicGesturePreferenceController(mContext, PREF_KEY); assertThat(controller.isSliceable()).isTrue(); } diff --git a/tests/robotests/src/com/android/settings/gestures/PanicGestureSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PanicGestureSoundPreferenceControllerTest.java new file mode 100644 index 00000000000..4967d7c2e9c --- /dev/null +++ b/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(); + } + +}