Add panic gesture settings page.
Ui is not final, the strings and video are placeholder only. Bug: 161394591 Test: robotests Change-Id: I8ada396506363e4711a1544e2c7ba1cd0e5d2dda
This commit is contained in:
@@ -462,4 +462,7 @@
|
|||||||
|
|
||||||
<!-- Whether to show Smooth Display feature in Settings Options -->
|
<!-- Whether to show Smooth Display feature in Settings Options -->
|
||||||
<bool name="config_show_smooth_display">false</bool>
|
<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>
|
||||||
</resources>
|
</resources>
|
||||||
|
@@ -10949,6 +10949,12 @@
|
|||||||
<!-- Summary text for ambient display tap [CHAR LIMIT=NONE]-->
|
<!-- Summary text for ambient display tap [CHAR LIMIT=NONE]-->
|
||||||
<string name="ambient_display_tap_screen_summary">To check time, notifications, and other info, tap your screen.</string>
|
<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>
|
||||||
|
|
||||||
|
<!-- 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>
|
||||||
|
|
||||||
<!-- Title text for swiping downwards on fingerprint sensor for notifications [CHAR LIMIT=80]-->
|
<!-- 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>
|
<string name="fingerprint_swipe_for_notifications_title">Swipe fingerprint for notifications</string>
|
||||||
<!-- Title text for fingerprint gesture preference screen [CHAR LIMIT=25] -->
|
<!-- Title text for fingerprint gesture preference screen [CHAR LIMIT=25] -->
|
||||||
|
36
res/xml/emergency_sos_gesture_settings.xml
Normal file
36
res/xml/emergency_sos_gesture_settings.xml
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!--
|
||||||
|
~ 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
|
||||||
|
-->
|
||||||
|
|
||||||
|
<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">
|
||||||
|
|
||||||
|
<com.android.settings.widget.VideoPreference
|
||||||
|
android:key="gesture_emergency_sos_button_screen_video"
|
||||||
|
app:animation="@raw/gesture_double_tap"
|
||||||
|
app:preview="@drawable/gesture_double_tap" />
|
||||||
|
|
||||||
|
<SwitchPreference
|
||||||
|
android:key="gesture_emergency_sos_button"
|
||||||
|
android:title="@string/emergency_sos_gesture_screen_title"
|
||||||
|
android:summary="@string/emergency_sos_gesture_screen_summary"
|
||||||
|
app:keywords="@string/keywords_gesture"
|
||||||
|
app:controller="com.android.settings.gestures.EmergencySosGesturePreferenceController"
|
||||||
|
app:allowDividerAbove="true" />
|
||||||
|
|
||||||
|
</PreferenceScreen>
|
@@ -20,6 +20,12 @@
|
|||||||
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
||||||
android:title="@string/gesture_preference_title">
|
android:title="@string/gesture_preference_title">
|
||||||
|
|
||||||
|
<Preference
|
||||||
|
android:key="emergency_sos_button_summary"
|
||||||
|
android:title="@string/emergency_sos_gesture_screen_title"
|
||||||
|
android:fragment="com.android.settings.gestures.EmergencySosGestureSettings"
|
||||||
|
settings:controller="com.android.settings.gestures.EmergencySosGesturePreferenceController" />
|
||||||
|
|
||||||
<Preference
|
<Preference
|
||||||
android:key="gesture_assist_input_summary"
|
android:key="gesture_assist_input_summary"
|
||||||
android:title="@string/assist_gesture_title"
|
android:title="@string/assist_gesture_title"
|
||||||
|
@@ -35,7 +35,7 @@ public class DoubleTapScreenPreferenceController extends GesturePreferenceContro
|
|||||||
|
|
||||||
private static final String PREF_KEY_VIDEO = "gesture_double_tap_screen_video";
|
private static final String PREF_KEY_VIDEO = "gesture_double_tap_screen_video";
|
||||||
|
|
||||||
private final String SECURE_KEY = DOZE_DOUBLE_TAP_GESTURE;
|
private static final String SECURE_KEY = DOZE_DOUBLE_TAP_GESTURE;
|
||||||
|
|
||||||
private AmbientDisplayConfiguration mAmbientConfig;
|
private AmbientDisplayConfiguration mAmbientConfig;
|
||||||
@UserIdInt
|
@UserIdInt
|
||||||
|
@@ -0,0 +1,75 @@
|
|||||||
|
/*
|
||||||
|
* 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 android.text.TextUtils;
|
||||||
|
|
||||||
|
import androidx.annotation.VisibleForTesting;
|
||||||
|
|
||||||
|
import com.android.settings.R;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Preference controller for emergency sos gesture setting
|
||||||
|
*/
|
||||||
|
public class EmergencySosGesturePreferenceController 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 SECURE_KEY = Settings.Secure.PANIC_GESTURE_ENABLED;
|
||||||
|
|
||||||
|
public EmergencySosGesturePreferenceController(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);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getAvailabilityStatus() {
|
||||||
|
return isGestureAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isSliceable() {
|
||||||
|
return TextUtils.equals(getPreferenceKey(), "gesture_emergency_sos_button");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected String getVideoPrefKey() {
|
||||||
|
return PREF_KEY_VIDEO;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isChecked() {
|
||||||
|
return Settings.Secure.getInt(mContext.getContentResolver(), SECURE_KEY, OFF) == ON;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean setChecked(boolean isChecked) {
|
||||||
|
return Settings.Secure.putInt(mContext.getContentResolver(), SECURE_KEY,
|
||||||
|
isChecked ? ON : OFF);
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,51 @@
|
|||||||
|
/*
|
||||||
|
* 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.app.settings.SettingsEnums;
|
||||||
|
|
||||||
|
import com.android.settings.R;
|
||||||
|
import com.android.settings.dashboard.DashboardFragment;
|
||||||
|
import com.android.settings.search.BaseSearchIndexProvider;
|
||||||
|
import com.android.settingslib.search.SearchIndexable;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Settings page for emergency sos gesture
|
||||||
|
*/
|
||||||
|
@SearchIndexable
|
||||||
|
public class EmergencySosGestureSettings extends DashboardFragment {
|
||||||
|
|
||||||
|
private static final String TAG = "PanicGestureSettings";
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected int getPreferenceScreenResId() {
|
||||||
|
return R.xml.emergency_sos_gesture_settings;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected String getLogTag() {
|
||||||
|
return TAG;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getMetricsCategory() {
|
||||||
|
return SettingsEnums.EMERGENCY_SOS_GESTURE_SETTINGS;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
|
||||||
|
new BaseSearchIndexProvider(R.xml.emergency_sos_gesture_settings);
|
||||||
|
}
|
@@ -0,0 +1,112 @@
|
|||||||
|
/*
|
||||||
|
* 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.EmergencySosGesturePreferenceController.OFF;
|
||||||
|
import static com.android.settings.gestures.EmergencySosGesturePreferenceController.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 EmergencySosGesturePreferenceControllerTest {
|
||||||
|
|
||||||
|
|
||||||
|
private Context mContext;
|
||||||
|
private ContentResolver mContentResolver;
|
||||||
|
private EmergencySosGesturePreferenceController mController;
|
||||||
|
private static final String PREF_KEY = "gesture_emergency_sos_button";
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void setUp() {
|
||||||
|
mContext = ApplicationProvider.getApplicationContext();
|
||||||
|
mContentResolver = mContext.getContentResolver();
|
||||||
|
mController = new EmergencySosGesturePreferenceController(mContext, PREF_KEY);
|
||||||
|
}
|
||||||
|
|
||||||
|
@After
|
||||||
|
public void tearDown() {
|
||||||
|
SettingsShadowResources.reset();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void isAvailable_configIsTrue_shouldReturnTrue() {
|
||||||
|
SettingsShadowResources.overrideResource(
|
||||||
|
R.bool.config_show_emergency_sos_gesture_settings,
|
||||||
|
Boolean.TRUE);
|
||||||
|
|
||||||
|
assertThat(mController.isAvailable()).isTrue();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void isAvailable_configIsTrue_shouldReturnFalse() {
|
||||||
|
SettingsShadowResources.overrideResource(
|
||||||
|
R.bool.config_show_emergency_sos_gesture_settings,
|
||||||
|
Boolean.FALSE);
|
||||||
|
|
||||||
|
assertThat(mController.isAvailable()).isFalse();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
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);
|
||||||
|
|
||||||
|
assertThat(mController.isChecked()).isTrue();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
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);
|
||||||
|
|
||||||
|
assertThat(mController.isChecked()).isFalse();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void isSliceableCorrectKey_returnsTrue() {
|
||||||
|
final EmergencySosGesturePreferenceController controller =
|
||||||
|
new EmergencySosGesturePreferenceController(mContext, PREF_KEY);
|
||||||
|
assertThat(controller.isSliceable()).isTrue();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void isSliceableIncorrectKey_returnsFalse() {
|
||||||
|
final DoubleTapPowerPreferenceController controller =
|
||||||
|
new DoubleTapPowerPreferenceController(mContext, "bad_key");
|
||||||
|
assertThat(controller.isSliceable()).isFalse();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
Reference in New Issue
Block a user