Merge "Remove NAS adjustments related settings" into sc-dev am: 16dfec5d9c

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13500414

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I597a6cce00b88702398a3e54628e0d339b82aed1
This commit is contained in:
Chloris Kuo
2021-02-09 17:17:40 +00:00
committed by Automerger Merge Worker
5 changed files with 0 additions and 318 deletions

View File

@@ -115,12 +115,6 @@
android:title="@string/snooze_options_title"
settings:controller="com.android.settings.notification.SnoozeNotificationPreferenceController" />
<SwitchPreference
android:key="asst_capabilities_actions_replies"
android:title="@string/asst_capabilities_actions_replies_title"
android:summary="@string/asst_capabilities_actions_replies_summary"
settings:controller="com.android.settings.notification.AssistantCapabilityPreferenceController" />
<!-- Notification badging -->
<SwitchPreference
android:key="notification_badging"

View File

@@ -134,12 +134,6 @@
android:title="@string/snooze_options_title"
settings:controller="com.android.settings.notification.SnoozeNotificationPreferenceController" />
<SwitchPreference
android:key="asst_capabilities_actions_replies"
android:title="@string/asst_capabilities_actions_replies_title"
android:summary="@string/asst_capabilities_actions_replies_summary"
settings:controller="com.android.settings.notification.AssistantCapabilityPreferenceController" />
<!-- Notification badging -->
<SwitchPreference
android:key="notification_badging"

View File

@@ -592,16 +592,6 @@
android:title="@string/show_notification_channel_warnings"
android:summary="@string/show_notification_channel_warnings_summary" />
<SwitchPreference
android:key="asst_capability_prioritizer"
android:title="@string/asst_capability_prioritizer_title"
settings:controller="com.android.settings.notification.AssistantCapabilityPreferenceController" />
<SwitchPreference
android:key="asst_capability_ranking"
android:title="@string/asst_capability_ranking_title"
settings:controller="com.android.settings.notification.AssistantCapabilityPreferenceController" />
<SwitchPreference
android:key="asst_feedback_indicator"
android:title="@string/asst_feedback_indicator_title"