Merge "Cosmetic changes to zen mode people & sound/vibration screens"

    setting page -->

    <string name="zen_mode_people_calls_messages_section_title" translatable="false">Who can reach you</string>

    <!-- [CHAR LIMIT=NONE] Zen mode settings: people screen footer -->

    <string name="zen_mode_people_footer" translatable="false">Even if messaging or calling apps can\u0027t notify you, people you choose here can still reach you through those apps</string>

    <!-- [CHAR LIMIT=40] Zen mode settings: Allow calls toggle title -->

    <string name="zen_mode_calls_title">Calls</string>

    <!-- [CHAR LIMIT=20] Zen mode settings: Calls option -->

   </PreferenceCategory>

   <!-- Footer that shows if user is put into alarms only or total silence mode by an app -->

   <com.android.settingslib.widget.FooterPreference/>

</PreferenceScreen>

    android:title="@string/zen_category_exceptions" >

    <PreferenceCategory

        android:title="@string/zen_mode_settings_category"

        android:key="zen_mode_settings_category_sound_vibration">

        <!-- Alarms -->

                "zen_mode_people_calls"));

        controllers.add(new ZenModeMessagesPreferenceController(context, lifecycle,

                "zen_mode_people_messages"));

        controllers.add(new ZenModeSettingsFooterPreferenceController(context, lifecycle,

                fragmentManager));

        controllers.add(new ZenModeBehaviorFooterPreferenceController(context, lifecycle,

                R.string.zen_mode_people_footer));

        return controllers;

    }