PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove "emergency alert" from Sound settings

Browse Source 
It's already in "App & notification" page

Change-Id: I858999f8e097d5712eee1b8d34f47e0e900bf859
Fixes: 71813931
Test: rebuild/visual/atest UniquePreferenceTest
This commit is contained in:
Fan Zhang
2018-01-16 14:01:23 -08:00
parent d6b0490dea
commit 33d5a76c6f
2 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
res/xml/sound_settings.xml
View File

@@ -149,18 +149,6 @@
android:summary="%s" /> android:summary="%s" />
</PreferenceCategory> </PreferenceCategory>
<com.android.settingslib.RestrictedPreference
android:key="cell_broadcast_settings"
android:title="@string/cell_broadcast_settings"
settings:useAdminDisabledSummary="true"
settings:allowDividerAbove="true"
android:order="-1">
<intent
android:action="android.intent.action.MAIN"
android:targetPackage="com.android.cellbroadcastreceiver"
android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings" />
</com.android.settingslib.RestrictedPreference>
<com.android.settings.widget.WorkOnlyCategory <com.android.settings.widget.WorkOnlyCategory
android:key="sound_work_settings_section" android:key="sound_work_settings_section"
android:title="@string/sound_work_settings" android:title="@string/sound_work_settings"

4
src/com/android/settings/notification/SoundSettings.java
View File

@@ -44,7 +44,6 @@ import java.util.List;
public class SoundSettings extends DashboardFragment { public class SoundSettings extends DashboardFragment {
private static final String TAG = "SoundSettings"; private static final String TAG = "SoundSettings";
private static final String KEY_CELL_BROADCAST_SETTINGS = "cell_broadcast_settings";
private static final String SELECTED_PREFERENCE_KEY = "selected_preference"; private static final String SELECTED_PREFERENCE_KEY = "selected_preference";
private static final int REQUEST_CODE = 200; private static final int REQUEST_CODE = 200;
@@ -182,8 +181,6 @@ public class SoundSettings extends DashboardFragment {
Lifecycle lifecycle) { Lifecycle lifecycle) {
final List<AbstractPreferenceController> controllers = new ArrayList<>(); final List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(new ZenModePreferenceController(context)); controllers.add(new ZenModePreferenceController(context));
controllers.add(new EmergencyBroadcastPreferenceController(
context, KEY_CELL_BROADCAST_SETTINGS));
controllers.add(new VibrateWhenRingPreferenceController(context)); controllers.add(new VibrateWhenRingPreferenceController(context));
// === Volumes === // === Volumes ===
@@ -268,7 +265,6 @@ public class SoundSettings extends DashboardFragment {
List<String> keys = super.getNonIndexableKeys(context); List<String> keys = super.getNonIndexableKeys(context);
// Duplicate results // Duplicate results
keys.add((new ZenModePreferenceController(context)).getPreferenceKey()); keys.add((new ZenModePreferenceController(context)).getPreferenceKey());
keys.add(KEY_CELL_BROADCAST_SETTINGS);
return keys; return keys;
} }
}; };