PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Notification settings update." into oc-dr1-dev am: cd9224a058

Browse Source 
am: eeda4ae540

Change-Id: I3139992a754e69e8ef1e2da858403a0e3b3f3b79
This commit is contained in:
Alison Cichowlas
2017-06-19 15:15:31 +00:00
committed by android-build-merger
parent 88a25b76d1 eeda4ae540
commit 1a74eefb54
2 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
res/xml/upgraded_channel_notification_settings.xml
View File

@@ -37,28 +37,34 @@
android:title="@string/notification_vibrate_title"
settings:useAdditionalSummary="true" />
<!-- Show badge -->
<com.android.settingslib.RestrictedSwitchPreference
android:key="badge"
android:title="@string/notification_channel_badge_title"
settings:useAdditionalSummary="true"
settings:restrictedSwitchSummary="@string/enabled_by_admin" />
<PreferenceCategory
android:title="@string/advanced_apps">
<!-- Lights -->
<com.android.settingslib.RestrictedSwitchPreference
android:key="lights"
android:title="@string/notification_show_lights_title"
settings:useAdditionalSummary="true" />
<!-- Show badge -->
<com.android.settingslib.RestrictedSwitchPreference
android:key="badge"
android:title="@string/notification_channel_badge_title"
settings:useAdditionalSummary="true"
settings:restrictedSwitchSummary="@string/enabled_by_admin" />
<!-- Visibility Override -->
<com.android.settings.notification.RestrictedDropDownPreference
<!-- Lights -->
<com.android.settingslib.RestrictedSwitchPreference
android:key="lights"
android:title="@string/notification_show_lights_title"
settings:useAdditionalSummary="true" />
<!-- Visibility Override -->
<com.android.settings.notification.RestrictedDropDownPreference
android:key="visibility_override"
android:title="@string/app_notification_visibility_override_title" />
<!-- Bypass DND -->
<com.android.settingslib.RestrictedSwitchPreference
<!-- Bypass DND -->
<com.android.settingslib.RestrictedSwitchPreference
android:key="bypass_dnd"
android:title="@string/app_notification_override_dnd_title"
android:summary="@string/app_notification_override_dnd_summary"
settings:useAdditionalSummary="true" />
</PreferenceCategory>
</PreferenceScreen>

8
src/com/android/settings/notification/AppNotificationSettings.java
View File

@@ -338,15 +338,15 @@ public class AppNotificationSettings extends NotificationSettingsBase {
case NotificationManager.IMPORTANCE_NONE:
return getContext().getString(R.string.notification_toggle_off);
case NotificationManager.IMPORTANCE_MIN:
return getContext().getString(R.string.notification_channel_summary_min);
return getContext().getString(R.string.notification_importance_min);
case NotificationManager.IMPORTANCE_LOW:
return getContext().getString(R.string.notification_channel_summary_low);
return getContext().getString(R.string.notification_importance_low);
case NotificationManager.IMPORTANCE_DEFAULT:
return getContext().getString(R.string.notification_channel_summary_default);
return getContext().getString(R.string.notification_importance_default);
case NotificationManager.IMPORTANCE_HIGH:
case NotificationManager.IMPORTANCE_MAX:
default:
return getContext().getString(R.string.notification_channel_summary_high);
return getContext().getString(R.string.notification_importance_high);
}
}