diff options
| author | Danny Baumann <dannybaumann@web.de> | 2013-07-30 07:24:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-07-30 07:24:14 +0000 |
| commit | bd78e709b2f9460db82d11005b99072202ac56f9 (patch) | |
| tree | 7bf96437ca8dfeb8284973e2618c604a1e027ba4 /res/values | |
| parent | 45f91746746bbce85017b533aae61dd52fa60365 (diff) | |
| parent | b55f7fa4641aff0fb837f4cd81dc1e66b1e885be (diff) | |
| download | packages_apps_Settings-bd78e709b2f9460db82d11005b99072202ac56f9.zip packages_apps_Settings-bd78e709b2f9460db82d11005b99072202ac56f9.tar.gz packages_apps_Settings-bd78e709b2f9460db82d11005b99072202ac56f9.tar.bz2 | |
Merge "Make notification-shade-collapse-after-dismiss behaviour configurable." into cm-10.1
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/cm_arrays.xml | 20 | ||||
| -rw-r--r-- | res/values/cm_strings.xml | 11 |
2 files changed, 28 insertions, 3 deletions
diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml index bc0ec04..4b2c9bb 100644 --- a/res/values/cm_arrays.xml +++ b/res/values/cm_arrays.xml @@ -597,5 +597,25 @@ <item>50</item> <item>25</item> </integer-array> + + <!-- Status bar auto-collapse behaviour --> + <string-array name="notification_drawer_collapse_on_dismiss_entries" translatable="false"> + <item>@string/collapse_on_dismiss_never</item> + <item>@string/collapse_on_dismiss_if_empty</item> + <item>@string/collapse_on_dismiss_if_no_clearable</item> + </string-array> + + <string-array name="notification_drawer_collapse_on_dismiss_summaries" translatable="false"> + <item>@string/collapse_on_dismiss_never_summary</item> + <item>@string/collapse_on_dismiss_if_empty_summary</item> + <item>@string/collapse_on_dismiss_if_no_clearable_summary</item> + </string-array> + + <string-array name="notification_drawer_collapse_on_dismiss_values" translatable="false"> + <item>0</item> + <item>1</item> + <item>2</item> + </string-array> + </resources> diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index cc507c3..400f82e 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -164,6 +164,14 @@ <!-- Notification Drawer --> <string name="notification_drawer_title">Notification drawer</string> + <string name="notification_drawer_behaviour_title">Behaviour</string> + <string name="notification_drawer_collapse_on_dismiss_title">Auto-close drawer</string> + <string name="collapse_on_dismiss_never">Disabled</string> + <string name="collapse_on_dismiss_if_empty">If none remaining</string> + <string name="collapse_on_dismiss_if_no_clearable">If no removable remaining</string> + <string name="collapse_on_dismiss_never_summary">Leave notification tray open when removing notifications</string> + <string name="collapse_on_dismiss_if_empty_summary">Close notification tray when removing the last notification</string> + <string name="collapse_on_dismiss_if_no_clearable_summary">Close notification tray when removing the last removable notification</string> <string name="lock_screen_title">Lock screen</string> @@ -570,7 +578,6 @@ <!-- Power Widget --> <string name="power_widget_title">Power widget</string> <string name="title_expanded_widget">Power widget</string> - <string name="power_widget_behavior">Widget behavior</string> <string name="title_expanded_hide_onchange">Close drawer on change</string> <string name="title_expanded_hide_indicator">Hide indicators</string> <string name="title_expanded_hide_scrollbar">Hide scrollbar</string> @@ -668,8 +675,6 @@ <string name="status_bar_battery_status_percentage">Percentage</string> <string name="status_bar_battery_status_circle">Circle</string> <string name="status_bar_battery_status_circle_percentage">Circle with percentage</string> - - <!-- Status bar notification count --> <string name="status_bar_notif_count_title">Show notification count</string> <string name="status_bar_notif_count_summary">Display number of pending notifications</string> |