Merge "Cannot have badge only channels."

This commit is contained in:
Julia Reynolds
2017-01-09 14:59:47 +00:00
committed by Android (Google) Code Review
3 changed files with 14 additions and 47 deletions

View File

@@ -27,15 +27,6 @@
settings:useAdditionalSummary="true"
settings:restrictedSwitchSummary="@string/enabled_by_admin" />
<!-- Show notification -->
<com.android.settingslib.RestrictedSwitchPreference
android:key="show"
android:title="@string/notification_content_block_title"
android:summary="@string/notification_content_block_summary"
android:order="2"
settings:useAdditionalSummary="true"
settings:restrictedSwitchSummary="@string/enabled_by_admin" />
<!-- Show badge -->
<com.android.settingslib.RestrictedSwitchPreference
android:key="badge"