diff options
Diffstat (limited to 'res')
27 files changed, 47 insertions, 38 deletions
diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml index e32617c12..e9d96add6 100644 --- a/res/values-af/cm_strings.xml +++ b/res/values-af/cm_strings.xml @@ -372,7 +372,6 @@ <string name="navigation_bar_menu_locked">Gesluit</string> <string name="power_widget_title">Kraglegstukke</string> <string name="title_expanded_widget">Kraglegstukke</string> - <string name="power_widget_behavior">Legstukgedrag</string> <string name="title_expanded_hide_onchange">Maak die kennisgewingslaai toe na wisseling</string> <string name="title_expanded_hide_indicator">Steek aanwysers weg</string> <string name="title_expanded_hide_scrollbar">Steek rolstaaf weg</string> diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml index e4a3d2f5e..6167d1985 100644 --- a/res/values-cs/cm_strings.xml +++ b/res/values-cs/cm_strings.xml @@ -468,7 +468,6 @@ <string name="power_widget_title">Power widget</string> <string name="title_expanded_widget">Aktivovat Power widget</string> - <string name="power_widget_behavior">Chování widgetu</string> <string name="title_expanded_hide_onchange">Skrýt oblast po změně</string> <string name="title_expanded_hide_indicator">Skrýt zvýraznění</string> <string name="title_expanded_hide_scrollbar">Skrýt posuvník</string> diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml index 29535d666..8c3793494 100644 --- a/res/values-da/cm_strings.xml +++ b/res/values-da/cm_strings.xml @@ -388,7 +388,6 @@ <string name="navigation_bar_menu_locked">Låst</string> <string name="power_widget_title">Strømwidget</string> <string name="title_expanded_widget">Strømwidget</string> - <string name="power_widget_behavior">Widget-adfærd</string> <string name="title_expanded_hide_onchange">Luk panel ved ændring</string> <string name="title_expanded_hide_indicator">Skjul indikatorer</string> <string name="title_expanded_hide_scrollbar">Skjul rullepanel</string> diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml index 00daf21b6..92c9cd0ab 100644 --- a/res/values-de/cm_strings.xml +++ b/res/values-de/cm_strings.xml @@ -372,7 +372,6 @@ <string name="swap_volume_buttons_summary">Belegung der Lautstärketasten umkehren, wenn das Gerät gedreht wird</string> <string name="power_widget_title">Energie-Widget</string> <string name="title_expanded_widget">Energiesteuerung</string> - <string name="power_widget_behavior">Widget-Verhalten</string> <string name="title_expanded_hide_onchange">Nach Änd. schließen</string> <string name="title_expanded_hide_indicator">Indikator verbergen</string> <string name="title_expanded_hide_scrollbar">Scrollbar verbergen</string> diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml index 81c805da8..458a39678 100644 --- a/res/values-el/cm_strings.xml +++ b/res/values-el/cm_strings.xml @@ -392,8 +392,6 @@ <string name="navigation_bar_menu_locked">Κλειδωμένο</string> <string name="power_widget_title">Power widget</string> <string name="title_expanded_widget">Power widget</string> - <string name="power_widget_behavior">Συμπεριφορά widget</string> - <string name="title_expanded_hide_onchange">Απόκρυψη μετά από αλλαγή</string> <string name="title_expanded_hide_indicator">Απόκρυψη ένδειξης</string> <string name="title_expanded_hide_scrollbar">Απόκρυψη μπάρας ολίσθισης</string> <string name="title_widget_picker">Πλήκτρα widget</string> diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml index 8150e9a59..7e9a90877 100644 --- a/res/values-es/cm_strings.xml +++ b/res/values-es/cm_strings.xml @@ -402,7 +402,6 @@ <string name="navigation_bar_menu_locked">Bloqueada</string> <string name="power_widget_title">Controles de Energía</string> <string name="title_expanded_widget">Barra de energía</string> - <string name="power_widget_behavior">Comportamiento</string> <string name="title_expanded_hide_onchange">Ocultar al pulsar</string> <string name="title_expanded_hide_indicator">Ocultar indicadores</string> <string name="title_expanded_hide_scrollbar">Ocultar barra de desplazamiento</string> diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml index 21e4e681a..2724ef05e 100644 --- a/res/values-fi/cm_strings.xml +++ b/res/values-fi/cm_strings.xml @@ -328,7 +328,6 @@ <string name="hardware_keys_action_in_app_search">Haku sovelluksessa</string> <string name="power_widget_title">Pikanäppäimet</string> <string name="title_expanded_widget">Pikanäppäimet</string> - <string name="power_widget_behavior">Näppäimen käytös</string> <string name="title_expanded_hide_indicator">Piilota osoittimet</string> <string name="title_expanded_hide_onchange">Piilota muutettaessa</string> <string name="title_expanded_hide_scrollbar">Piilota vierityspalkki</string> diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml index 8fdffab26..8f226e89b 100644 --- a/res/values-fr/cm_strings.xml +++ b/res/values-fr/cm_strings.xml @@ -402,7 +402,6 @@ <string name="navigation_bar_menu_locked">Verrouillée</string> <string name="power_widget_title">Widget d\'alimentation</string> <string name="title_expanded_widget">Widget d\'alimentation</string> - <string name="power_widget_behavior">Comportement du widget</string> <string name="title_expanded_hide_onchange">Fermer après changement</string> <string name="title_expanded_hide_indicator">Cacher les notifications</string> <string name="title_expanded_hide_scrollbar">Cacher barre de défilement</string> diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml index e4b4d8ae8..635b0c09f 100644 --- a/res/values-hu/cm_strings.xml +++ b/res/values-hu/cm_strings.xml @@ -392,7 +392,6 @@ <string name="navigation_bar_menu_locked">Zárolt</string> <string name="power_widget_title">Energiagazdálkodás</string> <string name="title_expanded_widget">Engedélyezés</string> - <string name="power_widget_behavior">Viselkedés</string> <string name="title_expanded_hide_onchange">Elrejtés kapcsoló kiválasztásakor</string> <string name="title_expanded_hide_indicator">Jelölők elrejtése</string> <string name="title_expanded_hide_scrollbar">Görgetősáv elrejtése</string> diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml index 89aca38d7..b47b974f6 100644 --- a/res/values-it/cm_strings.xml +++ b/res/values-it/cm_strings.xml @@ -394,7 +394,6 @@ <string name="navigation_bar_menu_locked">Bloccata</string> <string name="power_widget_title">Widget alimentazione</string> <string name="title_expanded_widget">Widget alimentazione</string> - <string name="power_widget_behavior">Comportamento widget</string> <string name="title_expanded_hide_onchange">Nascondi dopo modifica</string> <string name="title_expanded_hide_indicator">Nascondi indicatori</string> <string name="title_expanded_hide_scrollbar">Nascondi barra scorrimento</string> diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml index 59ff82395..00b761e9d 100644 --- a/res/values-iw/cm_strings.xml +++ b/res/values-iw/cm_strings.xml @@ -358,7 +358,6 @@ <string name="navigation_bar_menu_locked">נעול</string> <string name="power_widget_title">Power widget</string> <string name="title_expanded_widget">Power widget</string> - <string name="power_widget_behavior">התנהגות ה-Wigdet</string> <string name="title_expanded_hide_onchange">סגור את המגירה בשינוי</string> <string name="title_expanded_hide_indicator">Hide indicators</string> <string name="title_expanded_hide_scrollbar">הסתר את פס הגלילה</string> diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml index 316743f57..53424acd5 100644 --- a/res/values-ja/cm_strings.xml +++ b/res/values-ja/cm_strings.xml @@ -150,7 +150,6 @@ <string name="navigation_bar_menu_locked">ロック中</string> <string name="power_widget_title">電源管理ウィジェット</string> <string name="title_expanded_widget">電源管理ウィジェットを表示</string> - <string name="power_widget_behavior">ウィジェットの挙動</string> <string name="title_expanded_hide_onchange">変更したら隠す</string> <string name="title_expanded_hide_scrollbar">スクロールバーを隠す</string> <string name="title_widget_picker">ウィジェットボタン</string> diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml index e25c0b743..de9d2986c 100644 --- a/res/values-ko/cm_strings.xml +++ b/res/values-ko/cm_strings.xml @@ -319,7 +319,6 @@ <string name="navigation_bar_menu_locked">잠김</string> <string name="power_widget_title">전원 위젯</string> <string name="title_expanded_widget">전원 위젯</string> - <string name="power_widget_behavior">위젯 설정</string> <string name="title_expanded_hide_onchange">상태 변경 후 서랍 닫기</string> <string name="title_expanded_hide_indicator">상태 표시 숨기기</string> <string name="title_expanded_hide_scrollbar">스크롤바 숨기기</string> diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml index e682992b8..9ec8e7cb1 100644 --- a/res/values-lt/cm_strings.xml +++ b/res/values-lt/cm_strings.xml @@ -357,7 +357,6 @@ <string name="navigation_bar_menu_locked">Užrakintas</string> <string name="power_widget_title">Valdiklis užuolaidoje</string> <string name="title_expanded_widget">Valdiklis užuolaidoje</string> - <string name="power_widget_behavior">Valdiklio elgsena</string> <string name="title_expanded_hide_onchange">Užverti užuolaidą pasirinkus</string> <string name="title_expanded_hide_indicator">Slepti indikatorius</string> <string name="title_expanded_hide_scrollbar">Slepti šliaužiklį</string> diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml index 9c833fffd..97d16e560 100644 --- a/res/values-nb/cm_strings.xml +++ b/res/values-nb/cm_strings.xml @@ -387,7 +387,6 @@ <string name="navigation_bar_menu_locked">Låst</string> <string name="power_widget_title">Strømkontroll</string> <string name="title_expanded_widget">Strømkontroll</string> - <string name="power_widget_behavior">Modul-oppførsel</string> <string name="title_expanded_hide_onchange">Lukk Varslingsskuffen ved endring</string> <string name="title_expanded_hide_indicator">Skjul indikator</string> <string name="title_expanded_hide_scrollbar">Skjul rullefelt</string> diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml index dd527b681..dc7ab8498 100644 --- a/res/values-nl/cm_strings.xml +++ b/res/values-nl/cm_strings.xml @@ -407,7 +407,6 @@ Let op:\nAangezien het beginvolume hoger is ingesteld dan het beltoonvolume, wor <string name="navigation_bar_menu_locked">Vergrendeld</string> <string name="power_widget_title">Energiewidget</string> <string name="title_expanded_widget">Energiewidget</string> - <string name="power_widget_behavior">Widgetgedrag</string> <string name="title_expanded_hide_onchange">Verbergen bij wijziging</string> <string name="title_expanded_hide_indicator">Indicatoren verbergen</string> <string name="title_expanded_hide_scrollbar">Schuifbalk verbergen</string> diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml index eabc4ea13..cd86ccd01 100644 --- a/res/values-pl/cm_strings.xml +++ b/res/values-pl/cm_strings.xml @@ -362,7 +362,6 @@ <string name="navigation_bar_menu_locked">Zablokowano</string> <string name="power_widget_title">Widżet zasilania</string> <string name="title_expanded_widget">Widżet zasilania</string> - <string name="power_widget_behavior">Zachowanie widżetu</string> <string name="title_expanded_hide_onchange">Zamknij szufladę aplikacji po zmianie</string> <string name="title_expanded_hide_indicator">Ukryj wskaźniki</string> <string name="title_expanded_hide_scrollbar">Ukryj paski przewijania</string> diff --git a/res/values-pt/cm_strings.xml b/res/values-pt/cm_strings.xml index 115a2f5f7..18ce21afb 100644 --- a/res/values-pt/cm_strings.xml +++ b/res/values-pt/cm_strings.xml @@ -354,7 +354,6 @@ <string name="hardware_keys_action_in_app_search">Busca dentro do app</string> <string name="power_widget_title">Widget de energia</string> <string name="title_expanded_widget">Mostrar widget de energia</string> - <string name="power_widget_behavior">Comportamendo de Widget</string> <string name="title_expanded_hide_onchange">Esconder ao mudar</string> <string name="title_expanded_hide_scrollbar">Esconder barra de rolagem</string> <string name="title_widget_picker">Botões do widget</string> @@ -746,4 +745,4 @@ controle adicionais. \'Remover\' apaga a linha selecionada. <string name="storage_rescan_media_complete">Varredura completada</string> <string name="notification_light_default_value">Padrão</string> <string name="display_lockscreen_rotation_title">Rotacionar tela de bloqueio</string> -</resources>
\ No newline at end of file +</resources> diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml index 3f827f7aa..c22a0ef10 100644 --- a/res/values-ro/cm_strings.xml +++ b/res/values-ro/cm_strings.xml @@ -345,7 +345,6 @@ <string name="hardware_keys_action_in_app_search">"Căutare în int. aplicaţiilor"</string> <string name="power_widget_title">"Power Widget"</string> <string name="title_expanded_widget">"Power widget"</string> - <string name="power_widget_behavior">"Comportament widget"</string> <string name="title_expanded_hide_onchange">"Închideţi sertarul la modificare"</string> <string name="title_expanded_hide_indicator">"Ascundeţi indicatorii"</string> <string name="title_expanded_hide_scrollbar">"Ascundeţi bara de defilare"</string> diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml index 7e0da3f10..8d18e0f88 100644 --- a/res/values-ru/cm_strings.xml +++ b/res/values-ru/cm_strings.xml @@ -494,7 +494,6 @@ <!-- Power Widget #CM --> <string name="power_widget_title">Кнопки в панели уведомлений</string> <string name="title_expanded_widget">Кнопки в панели уведомлений</string> - <string name="power_widget_behavior">Поведение виджета</string> <string name="title_expanded_hide_onchange">Скрывать при изменении</string> <string name="title_expanded_hide_indicator">Скрывать индикаторы</string> <string name="title_expanded_hide_scrollbar">Скрывать полосу прокрутки</string> @@ -927,4 +926,4 @@ <string name="privacy_guard_manager_show_system_apps">Системные приложения</string> <string name="privacy_guard_manager_filter_permissions">Фильтр разрешений</string> -</resources>
\ No newline at end of file +</resources> diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml index 2c30ee02d..2dba3e754 100644 --- a/res/values-tr/cm_strings.xml +++ b/res/values-tr/cm_strings.xml @@ -387,7 +387,6 @@ <string name="navigation_bar_menu_locked">Kilitli</string> <string name="power_widget_title">Power widget</string> <string name="title_expanded_widget">Power widget</string> - <string name="power_widget_behavior">Widget davranışı</string> <string name="title_expanded_hide_onchange">Değişiklikte çekmeceyi kapat</string> <string name="title_expanded_hide_indicator">Göstericileri gizle</string> <string name="title_expanded_hide_scrollbar">Kaydırma çubuğu gizle</string> diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml index 92d769381..4ebb13546 100644 --- a/res/values-uk/cm_strings.xml +++ b/res/values-uk/cm_strings.xml @@ -347,7 +347,6 @@ <string name="navigation_bar_menu_locked">Заблоковано</string> <string name="power_widget_title">Кнопки в панелі сповіщень</string> <string name="title_expanded_widget">Кнопки в панелі сповіщень</string> - <string name="power_widget_behavior">Поведінка віджета</string> <string name="title_expanded_hide_onchange">Приховувати при зміні</string> <string name="title_expanded_hide_indicator">Приховувати індикатори</string> <string name="title_expanded_hide_scrollbar">Приховувати полосу прокрутки</string> diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml index 662c31101..9ebe6b06a 100644 --- a/res/values-zh-rCN/cm_strings.xml +++ b/res/values-zh-rCN/cm_strings.xml @@ -387,7 +387,6 @@ <string name="navigation_bar_menu_locked">已锁定</string> <string name="power_widget_title">电控小部件</string> <string name="title_expanded_widget">电控小部件</string> - <string name="power_widget_behavior">小部件行为</string> <string name="title_expanded_hide_onchange">做出操作后关闭通知栏</string> <string name="title_expanded_hide_indicator">隐藏指示器</string> <string name="title_expanded_hide_scrollbar">隐藏滚动条</string> diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml index bc0ec04a4..4b2c9bb3c 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 cc507c354..400f82e26 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> diff --git a/res/xml/power_widget_settings.xml b/res/xml/notification_drawer.xml index 7b464d3e4..6b6d6890c 100644 --- a/res/xml/power_widget_settings.xml +++ b/res/xml/notification_drawer.xml @@ -17,6 +17,19 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> + <!-- Notification drawer behaviour --> + <PreferenceCategory + android:title="@string/notification_drawer_behaviour_title"> + + <ListPreference + android:key="notification_drawer_collapse_on_dismiss" + android:title="@string/notification_drawer_collapse_on_dismiss_title" + android:dialogTitle="@string/notification_drawer_collapse_on_dismiss_title" + android:entries="@array/notification_drawer_collapse_on_dismiss_entries" + android:entryValues="@array/notification_drawer_collapse_on_dismiss_values" /> + + </PreferenceCategory> + <!-- Notification drawer Power Widget --> <PreferenceCategory android:title="@string/power_widget_title"> @@ -31,7 +44,7 @@ android:title="@string/title_widget_picker" android:summary="@string/summary_widget_picker" android:dependency="expanded_widget" - android:fragment="com.android.settings.cyanogenmod.PowerWidget$PowerWidgetChooser"> + android:fragment="com.android.settings.cyanogenmod.NotificationDrawer$PowerWidgetChooser"> </PreferenceScreen> <PreferenceScreen @@ -39,14 +52,9 @@ android:title="@string/title_widget_order" android:summary="@string/summary_widget_order" android:dependency="expanded_widget" - android:fragment="com.android.settings.cyanogenmod.PowerWidget$PowerWidgetOrder"> + android:fragment="com.android.settings.cyanogenmod.NotificationDrawer$PowerWidgetOrder"> </PreferenceScreen> - </PreferenceCategory> - - <PreferenceCategory - android:title="@string/power_widget_behavior"> - <CheckBoxPreference android:key="expanded_hide_onchange" android:title="@string/title_expanded_hide_onchange" @@ -69,4 +77,4 @@ </PreferenceCategory> -</PreferenceScreen>
\ No newline at end of file +</PreferenceScreen> diff --git a/res/xml/system_settings.xml b/res/xml/system_settings.xml index c5ffb5d77..995cff26d 100644 --- a/res/xml/system_settings.xml +++ b/res/xml/system_settings.xml @@ -31,7 +31,7 @@ <PreferenceScreen android:key="notification_drawer" - android:fragment="com.android.settings.cyanogenmod.PowerWidget" + android:fragment="com.android.settings.cyanogenmod.NotificationDrawer" android:title="@string/notification_drawer_title" /> <ListPreference |