[CellBroadcast] Enable reminder interval UI for wear
- This syncs from ag/15283316.
Bug: 194447314
Test: Manual test. see b/187240875#24
Change-Id: If6282a4625c279c020c3e6b78286906c4cb15705
diff --git a/res/xml/watch_preferences.xml b/res/xml/watch_preferences.xml
index d768cfa..96b2241 100644
--- a/res/xml/watch_preferences.xml
+++ b/res/xml/watch_preferences.xml
@@ -60,9 +60,6 @@
android:defaultValue="@string/alert_reminder_interval_in_min_default"
android:dialogTitle="@string/alert_reminder_interval_title" />
- <SwitchPreference android:key="watch_alert_reminder"
- android:title="@string/alert_reminder_interval_title" />
-
<SwitchPreference android:defaultValue="true"
android:key="enable_alert_vibrate"
android:title="@string/enable_alert_vibrate_title" />
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java b/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java
index 8b84bd1..7b15c2d 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java
@@ -45,7 +45,6 @@
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceFragment;
import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
import androidx.preference.TwoStatePreference;
import com.android.internal.annotations.VisibleForTesting;
@@ -149,9 +148,6 @@
// Preference key for emergency alerts history
public static final String KEY_EMERGENCY_ALERT_HISTORY = "emergency_alert_history";
- // For watch layout
- private static final String KEY_WATCH_ALERT_REMINDER = "watch_alert_reminder";
-
// Whether to receive alert in second language code
public static final String KEY_RECEIVE_CMAS_IN_SECOND_LANGUAGE =
"receive_cmas_in_second_language";
@@ -261,12 +257,9 @@
Log.d(TAG, "In not test harness mode. reset main toggle.");
e.remove(KEY_ENABLE_ALERTS_MASTER_TOGGLE);
}
- PackageManager pm = c.getPackageManager();
- if (pm.hasSystemFeature(PackageManager.FEATURE_WATCH)) {
- e.remove(KEY_WATCH_ALERT_REMINDER);
- }
e.commit();
+ PackageManager pm = c.getPackageManager();
if (pm.hasSystemFeature(PackageManager.FEATURE_WATCH)) {
PreferenceManager.setDefaultValues(c, R.xml.watch_preferences, true);
} else {
@@ -317,9 +310,6 @@
private PreferenceCategory mAlertPreferencesCategory;
private boolean mDisableSevereWhenExtremeDisabled = true;
- // WATCH
- private TwoStatePreference mAlertReminder;
-
// Show checkbox for Presidential alerts in settings
private TwoStatePreference mPresidentialCheckBox;
@@ -378,27 +368,7 @@
findPreference(KEY_ENABLE_CMAS_PRESIDENTIAL_ALERTS);
PackageManager pm = getActivity().getPackageManager();
- if (pm.hasSystemFeature(PackageManager.FEATURE_WATCH)) {
- mAlertReminder = (TwoStatePreference)
- findPreference(KEY_WATCH_ALERT_REMINDER);
- if (Integer.valueOf(mReminderInterval.getValue()) == 0) {
- mAlertReminder.setChecked(false);
- } else {
- mAlertReminder.setChecked(true);
- }
- mAlertReminder.setOnPreferenceChangeListener((p, newVal) -> {
- try {
- mReminderInterval.setValueIndex((Boolean) newVal ? 1 : 3);
- } catch (IndexOutOfBoundsException e) {
- mReminderInterval.setValue(String.valueOf(0));
- Log.w(TAG, "Setting default value");
- }
- return true;
- });
- PreferenceScreen watchScreen = (PreferenceScreen)
- findPreference(KEY_CATEGORY_ALERT_PREFERENCES);
- watchScreen.removePreference(mReminderInterval);
- } else {
+ if (!pm.hasSystemFeature(PackageManager.FEATURE_WATCH)) {
mAlertPreferencesCategory = (PreferenceCategory)
findPreference(KEY_CATEGORY_ALERT_PREFERENCES);
mAlertCategory = (PreferenceCategory)
