Some minor additions (icons, sorting) to modes

Test: manually viewing pages
Flag: android.app.modes_ui
Fixes: 331429435
Fixes: 308819461
Bug: 322373473
Change-Id: I17e6df82e17a4cfadc2948258829746cdb5473db

src/com/android/settings/notification/modes/ZenModeFragment.java

@@ -41,6 +41,7 @@ public class ZenModeFragment extends ZenModeFragmentBase {
         // TODO: fill in with all the elements of this page. Each should be an instance of
         //       {@link AbstractZenModePreferenceController}.
         List<AbstractPreferenceController> prefControllers = new ArrayList<>();
+        prefControllers.add(new ZenModeHeaderController(context, "header", this, mBackend));
         return prefControllers;
     }
 
@@ -55,19 +56,6 @@ public class ZenModeFragment extends ZenModeFragmentBase {
             return;
         }
         getActivity().setTitle(azr.getName());
-
-        // TODO: b/308819292 - implement the real screen!
-        final PreferenceScreen screen = getPreferenceScreen();
-        if (screen == null) {
-            return;
-        }
-
-        Preference tmpPref = screen.findPreference("zen_mode_test");
-        if (tmpPref == null) {
-            return;
-        }
-        tmpPref.setTitle(azr.getTriggerDescription());
-        tmpPref.setSummary("active?: " + mode.isActive());
     }
 
     @Override