Merge "add a global control for badging" into oc-dev

am: 1425b91bac

Change-Id: Iaf8eb302360f077b1629a170675ebc3f5e794fa6
This commit is contained in:
Chris Wren
2017-05-12 05:57:49 +00:00
committed by android-build-merger
5 changed files with 246 additions and 0 deletions

View File

@@ -6515,6 +6515,9 @@
<!-- Configure Notifications: Work profile section header [CHAR LIMIT=30] -->
<string name="profile_section_header">Work notifications</string>
<!-- Configure Notifications: Title for the notification badging option. [CHAR LIMIT=30] -->
<string name="notification_badging_title">Allow icon badges</string>
<!-- Configure Notifications: Title for the pulse notification light option. [CHAR LIMIT=30] -->
<string name="notification_pulse_title">Blink light</string>

View File

@@ -22,6 +22,11 @@
android:key="dashboard_tile_placeholder"
android:order="1"/>
<!-- Notification badging -->
<SwitchPreference
android:key="notification_badging"
android:title="@string/notification_badging_title"/>
<!-- Pulse notification light -->
<SwitchPreference
android:key="notification_pulse"