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

Browse Source 
am: cd9224a058

Change-Id: I22d96e1d02f9a5a19f0eae1db368ad71d9de9b7b
This commit is contained in:
Alison Cichowlas
2017-06-19 15:10:02 +00:00
committed by android-build-merger
parent 411e99a793 cd9224a058
commit eeda4ae540
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" android:title="@string/notification_vibrate_title"
settings:useAdditionalSummary="true" /> settings:useAdditionalSummary="true" />
<!-- Show badge --> <PreferenceCategory
<com.android.settingslib.RestrictedSwitchPreference android:title="@string/advanced_apps">
android:key="badge"
android:title="@string/notification_channel_badge_title"
settings:useAdditionalSummary="true"
settings:restrictedSwitchSummary="@string/enabled_by_admin" />
<!-- Lights --> <!-- Show badge -->
<com.android.settingslib.RestrictedSwitchPreference <com.android.settingslib.RestrictedSwitchPreference
android:key="lights" android:key="badge"
android:title="@string/notification_show_lights_title" android:title="@string/notification_channel_badge_title"
settings:useAdditionalSummary="true" /> settings:useAdditionalSummary="true"
settings:restrictedSwitchSummary="@string/enabled_by_admin" />
<!-- Visibility Override --> <!-- Lights -->
<com.android.settings.notification.RestrictedDropDownPreference <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:key="visibility_override"
android:title="@string/app_notification_visibility_override_title" /> android:title="@string/app_notification_visibility_override_title" />
<!-- Bypass DND --> <!-- Bypass DND -->
<com.android.settingslib.RestrictedSwitchPreference <com.android.settingslib.RestrictedSwitchPreference
android:key="bypass_dnd" android:key="bypass_dnd"
android:title="@string/app_notification_override_dnd_title" android:title="@string/app_notification_override_dnd_title"
android:summary="@string/app_notification_override_dnd_summary" android:summary="@string/app_notification_override_dnd_summary"
settings:useAdditionalSummary="true" /> settings:useAdditionalSummary="true" />
</PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>

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

@@ -338,15 +338,15 @@ public class AppNotificationSettings extends NotificationSettingsBase {
case NotificationManager.IMPORTANCE_NONE: case NotificationManager.IMPORTANCE_NONE:
return getContext().getString(R.string.notification_toggle_off); return getContext().getString(R.string.notification_toggle_off);
case NotificationManager.IMPORTANCE_MIN: 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: 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: 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_HIGH:
case NotificationManager.IMPORTANCE_MAX: case NotificationManager.IMPORTANCE_MAX:
default: default:
return getContext().getString(R.string.notification_channel_summary_high); return getContext().getString(R.string.notification_importance_high);
} }
} }