Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33d5a76c authored by Fan Zhang's avatar Fan Zhang
Browse files

Remove "emergency alert" from Sound settings 

It's already in "App & notification" page

Change-Id: I858999f8e097d5712eee1b8d34f47e0e900bf859
Fixes: 71813931
Test: rebuild/visual/atest UniquePreferenceTest
parent d6b0490d

res/xml/sound_settings.xml

+0 −12
Original line number Diff line number Diff line
@@ -149,18 +149,6 @@ 
          android:summary="%s" />

    </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

        android:key="sound_work_settings_section"

        android:title="@string/sound_work_settings"

src/com/android/settings/notification/SoundSettings.java

+0 −4
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ import java.util.List; 
public class SoundSettings extends DashboardFragment {

    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 int REQUEST_CODE = 200;
@@ -182,8 +181,6 @@ public class SoundSettings extends DashboardFragment { 
            Lifecycle lifecycle) {

        final List<AbstractPreferenceController> controllers = new ArrayList<>();

        controllers.add(new ZenModePreferenceController(context));

        controllers.add(new EmergencyBroadcastPreferenceController(

                context, KEY_CELL_BROADCAST_SETTINGS));

        controllers.add(new VibrateWhenRingPreferenceController(context));



        // === Volumes ===
@@ -268,7 +265,6 @@ public class SoundSettings extends DashboardFragment { 
                    List<String> keys = super.getNonIndexableKeys(context);

                    // Duplicate results

                    keys.add((new ZenModePreferenceController(context)).getPreferenceKey());

                    keys.add(KEY_CELL_BROADCAST_SETTINGS);

                    return keys;

                }

            };