diff options
| author | lookshe <github@lookshe.org> | 2016-03-07 23:42:13 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-03-07 23:42:13 +0100 |
| commit | 5eda297b145558b4bcdbd0fb94f8a2675691971f (patch) | |
| tree | 684e9c2b287566c4c1ec001889b82e34a5ca29b3 /src/main/res/xml/preferences.xml | |
| parent | d620dcdc575ff1ce4cbdaf78e3182f3418e2142d (diff) | |
| parent | c8759af913b775645b5394eb3c1f08d8c5fe9238 (diff) | |
Merge branch 'trz/rebase' into trz/rename
Diffstat (limited to 'src/main/res/xml/preferences.xml')
| -rw-r--r-- | src/main/res/xml/preferences.xml | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index 0d19ea5a..7dac445a 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -133,13 +133,6 @@ android:title="@string/pref_led_notification_color" app:supportsAlpha="true" android:summary="@string/pref_led_notification_color_summary"/> - - <CheckBoxPreference - android:defaultValue="true" - android:dependency="show_notification" - android:key="always_notify_in_conference" - android:summary="@string/pref_conference_notifications_summary" - android:title="@string/pref_conference_notifications" /> </PreferenceScreen> </PreferenceCategory> <PreferenceCategory android:title="@string/pref_ui_options"> |