Merge "Cannot have badge only channels."
This commit is contained in:
committed by
Android (Google) Code Review
commit
d5e2bfcc7a
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user