Merge "Hide Wireless Emergency Alerts on unsupported devices" into sc-dev

This commit is contained in:
TreeHugger Robot
2021-04-15 08:49:36 +00:00
committed by Android (Google) Code Review

View File

@@ -17,12 +17,18 @@
package com.android.settings.emergency; package com.android.settings.emergency;
import android.app.settings.SettingsEnums; import android.app.settings.SettingsEnums;
import android.content.Context;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.notification.EmergencyBroadcastPreferenceController;
import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.search.SearchIndexable; import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;
import java.util.List;
/** /**
* {@link DashboardFragment} that hosts emergency/safety related settings. * {@link DashboardFragment} that hosts emergency/safety related settings.
@@ -31,6 +37,7 @@ import com.android.settingslib.search.SearchIndexable;
public class EmergencyDashboardFragment extends DashboardFragment { public class EmergencyDashboardFragment extends DashboardFragment {
private static final String TAG = "EmergencyDashboard"; private static final String TAG = "EmergencyDashboard";
private static final String WEA_PREF_KEY = "app_and_notif_cell_broadcast_settings";
@Override @Override
protected int getPreferenceScreenResId() { protected int getPreferenceScreenResId() {
@@ -47,6 +54,17 @@ public class EmergencyDashboardFragment extends DashboardFragment {
return SettingsEnums.EMERGENCY_SETTINGS; return SettingsEnums.EMERGENCY_SETTINGS;
} }
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context);
}
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context) {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(new EmergencyBroadcastPreferenceController(context, WEA_PREF_KEY));
return controllers;
}
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.emergency_settings); new BaseSearchIndexProvider(R.xml.emergency_settings);
} }