Update Sound settings.

- change the summary to show the automatic rules info instead.
- removed ringtone preference category
- add dividers above DND and Emergency broadcast

Change-Id: Iee497d194b70af72cfd69b315d639ca62720643b
Fix: 34975939
Test: make RunSettingsRoboTests

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

@@ -16,22 +16,18 @@
 
 package com.android.settings.notification;
 
-import android.app.NotificationManager;
 import android.content.Context;
 import android.support.v7.preference.Preference;
-import com.android.settings.R;
 
 public class ZenModePreferenceController extends AdjustVolumeRestrictedPreferenceController {
 
     private static final String KEY_ZEN_MODE = "zen_mode";
-    private String mSummaryPrefix;
 
     private ZenModeSettings.SummaryBuilder mSummaryBuilder;
 
     public ZenModePreferenceController(Context context) {
         super(context);
         mSummaryBuilder = new ZenModeSettings.SummaryBuilder(context);
-        mSummaryPrefix = context.getString(R.string.zen_mode_priority_settings_title) + " ";
     }
 
     @Override
@@ -48,8 +44,7 @@ public class ZenModePreferenceController extends AdjustVolumeRestrictedPreferenc
     public void updateState(Preference preference) {
         super.updateState(preference);
         if (preference.isEnabled()) {
-            preference.setSummary(mSummaryPrefix + mSummaryBuilder.getPrioritySettingSummary(
-                NotificationManager.from(mContext).getNotificationPolicy()));
+            preference.setSummary(mSummaryBuilder.getAutomaticRulesSummary());
         }
     }
 }