Rename panic gesture to emergency gesture in Settings

Bug: 171589858
Test: rebuild
Change-Id: I23847db82a397bdcd61501758e3ef66a4f088e22
This commit is contained in:
Fan Zhang
2020-10-27 12:01:03 -07:00
parent 167362d0ca
commit f797a48af6
9 changed files with 76 additions and 75 deletions

View File

@@ -31,36 +31,36 @@ import androidx.preference.Preference;
import com.android.settings.R;
/**
* Preference controller for emergency sos gesture setting
* Preference controller for emergency gesture setting
*/
public class PanicGesturePreferenceController extends GesturePreferenceController {
private static final String TAG = "PanicGesturePreferenceC";
public class EmergencyGesturePreferenceController extends GesturePreferenceController {
private static final String TAG = "EmergencyGesturePref";
@VisibleForTesting
static final int ON = 1;
@VisibleForTesting
static final int OFF = 0;
@VisibleForTesting
static final String ACTION_PANIC_SETTINGS =
"com.android.settings.action.panic_settings";
static final String ACTION_EMERGENCY_GESTURE_SETTINGS =
"com.android.settings.action.emergency_gesture_settings";
@VisibleForTesting
Intent mIntent;
private boolean mUseCustomIntent;
private static final String PREF_KEY_VIDEO = "panic_button_screen_video";
private static final String PREF_KEY_VIDEO = "emergency_gesture_screen_video";
private static final String SECURE_KEY = Settings.Secure.EMERGENCY_GESTURE_ENABLED;
public PanicGesturePreferenceController(Context context, String key) {
public EmergencyGesturePreferenceController(Context context, String key) {
super(context, key);
final String panicSettingsPackageName = context.getResources().getString(
R.string.panic_gesture_settings_package);
if (!TextUtils.isEmpty(panicSettingsPackageName)) {
final String emergencyGestureSettingsPackageName = context.getResources().getString(
R.string.emergency_gesture_settings_package);
if (!TextUtils.isEmpty(emergencyGestureSettingsPackageName)) {
mUseCustomIntent = true;
// Use custom intent if it's configured and system can resolve it.
final Intent intent = new Intent(ACTION_PANIC_SETTINGS)
.setPackage(panicSettingsPackageName);
final Intent intent = new Intent(ACTION_EMERGENCY_GESTURE_SETTINGS)
.setPackage(emergencyGestureSettingsPackageName);
if (canResolveIntent(intent)) {
mIntent = intent;
}
@@ -80,7 +80,7 @@ public class PanicGesturePreferenceController extends GesturePreferenceControlle
@Override
public int getAvailabilityStatus() {
final boolean isConfigEnabled = mContext.getResources()
.getBoolean(R.bool.config_show_panic_gesture_settings);
.getBoolean(R.bool.config_show_emergency_gesture_settings);
if (!isConfigEnabled) {
return UNSUPPORTED_ON_DEVICE;
@@ -90,7 +90,7 @@ public class PanicGesturePreferenceController extends GesturePreferenceControlle
@Override
public boolean isSliceable() {
return TextUtils.equals(getPreferenceKey(), "gesture_panic_button");
return TextUtils.equals(getPreferenceKey(), "gesture_emergency_button");
}
@Override
@@ -102,13 +102,13 @@ public class PanicGesturePreferenceController extends GesturePreferenceControlle
public CharSequence getSummary() {
if (mUseCustomIntent) {
final String packageName = mContext.getResources().getString(
R.string.panic_gesture_settings_package);
R.string.emergency_gesture_settings_package);
try {
final PackageManager pm = mContext.getPackageManager();
final ApplicationInfo appInfo = pm.getApplicationInfo(
packageName, PackageManager.MATCH_DISABLED_COMPONENTS
| PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS);
return mContext.getString(R.string.panic_gesture_entrypoint_summary,
return mContext.getString(R.string.emergency_gesture_entrypoint_summary,
appInfo.loadLabel(pm));
} catch (Exception e) {
Log.d(TAG, "Failed to get custom summary, falling back.");

View File

@@ -25,16 +25,16 @@ import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
/**
* Settings page for emergency sos gesture
* Settings page for emergency gesture
*/
@SearchIndexable
public class PanicGestureSettings extends DashboardFragment {
public class EmergencyGestureSettings extends DashboardFragment {
private static final String TAG = "PanicGestureSettings";
private static final String TAG = "EmergencyGestureSetting";
@Override
protected int getPreferenceScreenResId() {
return R.xml.panic_gesture_settings;
return R.xml.emergency_gesture_settings;
}
@Override
@@ -48,12 +48,12 @@ public class PanicGestureSettings extends DashboardFragment {
}
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.panic_gesture_settings) {
new BaseSearchIndexProvider(R.xml.emergency_gesture_settings) {
@Override
protected boolean isPageSearchEnabled(Context context) {
final PanicGesturePreferenceController controller =
new PanicGesturePreferenceController(context,
"dummy_panic_gesture_pref_key");
final EmergencyGesturePreferenceController controller =
new EmergencyGesturePreferenceController(context,
"dummy_emergency_gesture_pref_key");
return !controller.isAvailable()
|| controller.shouldSuppressFromSearch();
}

View File

@@ -27,7 +27,7 @@ import com.android.settings.core.TogglePreferenceController;
/**
* Preference controller for emergency sos gesture setting
*/
public class PanicGestureSoundPreferenceController extends TogglePreferenceController {
public class EmergencyGestureSoundPreferenceController extends TogglePreferenceController {
@VisibleForTesting
static final int ON = 1;
@@ -36,13 +36,13 @@ public class PanicGestureSoundPreferenceController extends TogglePreferenceContr
private static final String SECURE_KEY = Settings.Secure.EMERGENCY_GESTURE_SOUND_ENABLED;
public PanicGestureSoundPreferenceController(Context context, String key) {
public EmergencyGestureSoundPreferenceController(Context context, String key) {
super(context, key);
}
private static boolean isGestureAvailable(Context context) {
return context.getResources()
.getBoolean(R.bool.config_show_panic_gesture_settings);
.getBoolean(R.bool.config_show_emergency_gesture_settings);
}
@Override