diff options
| author | Chen Xu <fionaxu@google.com> | 2020-06-11 18:22:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-11 18:22:27 +0000 |
| commit | db65ea3a8ff23a64f4f8270ce3acc24fff2d4b3a (patch) | |
| tree | df8a5285e4abd1092c1c05db495e6bb95e5496f8 /src | |
| parent | 643a07a6038a6272c4ef4f784520dfbc08187d95 (diff) | |
| parent | d21c91b2df1a46dc41f5e3de9f02f87581d042ca (diff) | |
| download | CellBroadcastReceiver-db65ea3a8ff23a64f4f8270ce3acc24fff2d4b3a.tar.gz | |
Merge "Support IT-Alert: display a preference header" into rvc-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java b/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java index 679e75437..8702f25d2 100644 --- a/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java +++ b/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java @@ -59,6 +59,9 @@ public class CellBroadcastSettings extends Activity { private static final boolean DBG = false; + // Preference key for alert header (A text view, not clickable). + public static final String KEY_ALERTS_HEADER = "alerts_header"; + // Preference key for a master toggle to enable/disable all alerts message (default enabled). public static final String KEY_ENABLE_ALERTS_MASTER_TOGGLE = "enable_alerts_master_toggle"; @@ -197,6 +200,7 @@ public class CellBroadcastSettings extends Activity { private TwoStatePreference mStateLocalTestCheckBox; private TwoStatePreference mEnableVibrateCheckBox; private Preference mAlertHistory; + private Preference mAlertsHeader; private PreferenceCategory mAlertCategory; private PreferenceCategory mAlertPreferencesCategory; private boolean mDisableSevereWhenExtremeDisabled = true; @@ -261,6 +265,7 @@ public class CellBroadcastSettings extends Activity { mStateLocalTestCheckBox = (TwoStatePreference) findPreference(KEY_ENABLE_STATE_LOCAL_TEST_ALERTS); mAlertHistory = findPreference(KEY_EMERGENCY_ALERT_HISTORY); + mAlertsHeader = findPreference(KEY_ALERTS_HEADER); mReceiveCmasInSecondLanguageCheckBox = (TwoStatePreference) findPreference (KEY_RECEIVE_CMAS_IN_SECOND_LANGUAGE); mEnableVibrateCheckBox = findPreference(KEY_ENABLE_ALERT_VIBRATE); @@ -502,6 +507,10 @@ public class CellBroadcastSettings extends Activity { res.getBoolean(R.bool.show_override_dnd_settings) || !res.getBoolean(R.bool.override_dnd_default)); } + if (mAlertsHeader != null) { + mAlertsHeader.setVisible( + !getContext().getString(R.string.alerts_header_summary).isEmpty()); + } } private void initReminderIntervalList() { |