Add Panic button sound preference to panic gesture settings page.

Also renamed emergency_sos_* to panic_*. "emergency sos" is used by
other OEMs.

https://screenshot.googleplex.com/66097f3e-6aa0-4e2f-afb8-22f278bb0ed7.png

Bug: 161394591
Test: robotests
Change-Id: I14a59399fe7192d305d89a86dc93380c1e4c8a1c
This commit is contained in:
Fan Zhang
2020-08-17 14:19:26 -07:00
parent c8b21a36e2
commit 67d3454265
9 changed files with 214 additions and 33 deletions

View File

@@ -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

View File

@@ -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);
}

View File

@@ -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);
}
}