Merge "Move NAS selection to 'special app access'" into qt-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
8bf3ab9d5c
@@ -19,13 +19,6 @@
|
||||
android:title="@string/configure_notification_settings"
|
||||
android:key="configure_notification_settings">
|
||||
|
||||
<com.android.settingslib.widget.apppreference.AppPreference
|
||||
android:key="notification_assistant"
|
||||
android:title="@string/notification_assistant_title"
|
||||
android:summary="@string/summary_placeholder"
|
||||
settings:fragment="com.android.settings.notification.NotificationAssistantPicker"
|
||||
settings:controller="com.android.settings.notification.NotificationAssistantPreferenceController"/>
|
||||
|
||||
<SwitchPreference
|
||||
android:key="asst_capability_prioritizer"
|
||||
android:title="@string/asst_capability_prioritizer_title"
|
||||
|
@@ -65,6 +65,13 @@
|
||||
android:value="com.android.settings.Settings$WriteSettingsActivity" />
|
||||
</Preference>
|
||||
|
||||
<com.android.settingslib.widget.apppreference.AppPreference
|
||||
android:key="notification_assistant"
|
||||
android:title="@string/notification_assistant_title"
|
||||
android:summary="@string/summary_placeholder"
|
||||
settings:fragment="com.android.settings.notification.NotificationAssistantPicker"
|
||||
settings:controller="com.android.settings.notification.NotificationAssistantPreferenceController"/>
|
||||
|
||||
<Preference
|
||||
android:key="notification_access"
|
||||
android:title="@string/manage_notification_access_title"
|
||||
|
Reference in New Issue
Block a user