From d9b0a1380416808e8d9f9aaf8f1bfed4a2434d94 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Mon, 2 May 2022 13:57:40 -0700 Subject: [PATCH] Simplify eSOS platform setting summary. Old: Managed by [app] New: On/Off Test: robotests Bug: 219103250 Change-Id: Ife77e0ff40cd6f1ef8fc01542b65b5a9881b4b9e --- res/values/strings.xml | 3 -- ...GestureEntrypointPreferenceController.java | 28 +++++-------------- 2 files changed, 7 insertions(+), 24 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 1fd2a425e57..4c503d58c03 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -11986,9 +11986,6 @@ Use Emergency SOS - - Managed by %1$s - Press the Power button quickly 5 times or more to start the actions below diff --git a/src/com/android/settings/emergency/EmergencyGestureEntrypointPreferenceController.java b/src/com/android/settings/emergency/EmergencyGestureEntrypointPreferenceController.java index ab2c473f17d..155efd37e4b 100644 --- a/src/com/android/settings/emergency/EmergencyGestureEntrypointPreferenceController.java +++ b/src/com/android/settings/emergency/EmergencyGestureEntrypointPreferenceController.java @@ -18,23 +18,20 @@ package com.android.settings.emergency; import android.content.Context; import android.content.Intent; -import android.content.pm.ApplicationInfo; -import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.text.TextUtils; -import android.util.Log; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; +import com.android.settingslib.emergencynumber.EmergencyNumberUtils; /** * Preference controller for emergency gesture setting's entyrpoint preference */ public class EmergencyGestureEntrypointPreferenceController extends BasePreferenceController { - private static final String TAG = "EmergencyGestureEntry"; @VisibleForTesting static final String ACTION_EMERGENCY_GESTURE_SETTINGS = @@ -42,10 +39,12 @@ public class EmergencyGestureEntrypointPreferenceController extends BasePreferen @VisibleForTesting Intent mIntent; + private final EmergencyNumberUtils mEmergencyNumberUtils; private boolean mUseCustomIntent; public EmergencyGestureEntrypointPreferenceController(Context context, String key) { super(context, key); + mEmergencyNumberUtils = new EmergencyNumberUtils(context); final String emergencyGestureSettingsPackageName = context.getResources().getString( R.string.emergency_gesture_settings_package); if (!TextUtils.isEmpty(emergencyGestureSettingsPackageName)) { @@ -94,23 +93,10 @@ public class EmergencyGestureEntrypointPreferenceController extends BasePreferen @Override public CharSequence getSummary() { - if (mUseCustomIntent) { - final String packageName = mContext.getResources().getString( - 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.emergency_gesture_entrypoint_summary, - appInfo.loadLabel(pm)); - } catch (Exception e) { - Log.d(TAG, "Failed to get custom summary, falling back."); - return super.getSummary(); - } - } - - return super.getSummary(); + return mContext.getText( + mEmergencyNumberUtils.getEmergencyGestureEnabled() + ? R.string.gesture_setting_on + : R.string.gesture_setting_off); } /**