refactoring

1 files changed, 31 insertions, 24 deletions

diff --git a/vdrmanager/res/xml/vdr_prefs.xml b/vdrmanager/res/xml/vdr_prefs.xml
index 20d9823..0d56c8e 100644
--- a/vdrmanager/res/xml/vdr_prefs.xml
+++ b/vdrmanager/res/xml/vdr_prefs.xml
@@ -4,7 +4,7 @@
 	<PreferenceCategory android:title="@string/vdr_prefs_category">
 
 		<EditTextPreference android:inputType="textCapWords"
-			android:defaultValue="-" android:key="@string/vdr_name_key"
+			android:key="@string/vdr_name_key"
 			android:summary="@string/vdr_name_summary" android:title="@string/vdr_name_title" />
 
 	</PreferenceCategory>
@@ -13,10 +13,10 @@
 		android:title="@string/vdr_preferences">
 
 		<EditTextPreference android:inputType="textNoSuggestions"
-			android:defaultValue="0.0.0.0" android:key="@string/vdr_host_key"
+			android:key="@string/vdr_host_key"
 			android:summary="@string/vdr_host_summary" android:title="@string/vdr_host_title" />
 
-		<EditTextPreference android:defaultValue="@string/vdr_port_default"
+		<EditTextPreference
 			android:key="@string/vdr_port_key" android:inputType="number"
 			android:summary="@string/vdr_port_summary" android:title="@string/vdr_port_title" />
 
@@ -25,7 +25,7 @@
 			android:title="@string/vdr_password_title" />
 
 		<CheckBoxPreference android:key="@string/vdr_ssl_key"
-			android:defaultValue="false" android:enabled="false"
+			android:enabled="false"
 			android:summary="@string/vdr_ssl_summary" android:title="@string/vdr_ssl_title" />
 
 	</PreferenceCategory>
@@ -34,10 +34,10 @@
 		android:title="@string/channel_filter_preferences">
 
 		<CheckBoxPreference android:key="@string/channel_filter_filter_key"
-			android:defaultValue="false" android:summary="@string/channel_filter_filter_summary"
+            android:summary="@string/channel_filter_filter_summary"
 			android:title="@string/channel_filter_filter_title" />
 
-		<EditTextPreference android:defaultValue="1-100"
+		<EditTextPreference
 			android:dependency="@string/channel_filter_filter_key" android:key="@string/channel_filter_last_key"
 			android:summary="@string/channel_filter_last_summary" android:title="@string/channel_filter_last_title" />
 	</PreferenceCategory>
@@ -48,10 +48,10 @@
 		android:title="@string/wakeup_preferences">
 
 		<CheckBoxPreference android:key="@string/wakeup_enabled_key"
-			android:defaultValue="false" android:summary="@string/wakeup_enabled_summary"
+            android:summary="@string/wakeup_enabled_summary"
 			android:title="@string/wakeup_enabled_title" />
 
-		<ListPreference android:defaultValue="@string/default_wakeup_method"
+		<ListPreference
 			android:dependency="@string/wakeup_enabled_key" android:entries="@array/wakeup_methods"
 			android:entryValues="@array/wakeup_methods_values" android:key="@string/wakeup_method_key"
 			android:summary="@string/wakeup_method_summary" android:title="@string/wakeup_method_title" />
@@ -72,7 +72,7 @@
 			android:key="@string/wakeup_wol_mac_key" android:summary="@string/wakeup_wol_mac_summary"
 			android:title="@string/wakeup_wol_mac_title" />
 
-		<EditTextPreference android:defaultValue="255.255.255.255"
+		<EditTextPreference
 			android:dependency="@string/wakeup_enabled_key" android:key="@string/wakeup_wol_custom_broadcast_key"
 			android:summaryOn="@string/wakeup_wol_custom_boradcast_summary"
 			android:title="@string/wakeup_wol_custom_boradcast_title" />
@@ -81,26 +81,26 @@
 	<PreferenceCategory android:key="timer_preferences"
 		android:title="@string/timer_preferences">
 
-		<EditTextPreference android:defaultValue="5"
+		<EditTextPreference
 			android:key="@string/timer_pre_start_buffer_key" android:summary="@string/timer_pre_start_buffer_summary"
 			android:title="@string/timer_pre_start_buffer_title" />
 
-		<EditTextPreference android:defaultValue="30"
+		<EditTextPreference
 			android:key="@string/timer_post_end_buffer_key" android:summary="@string/timer_post_end_buffer_summary"
 			android:title="@string/timer_post_end_buffer_title" />
 
-		<EditTextPreference android:defaultValue="99"
+		<EditTextPreference
 			android:key="@string/timer_default_lifetime_key" android:summary="@string/timer_default_lifetime_summary"
 			android:title="@string/timer_default_lifetime_title" />
 
-		<EditTextPreference android:defaultValue="50"
+		<EditTextPreference
 			android:key="@string/timer_default_priority_key" android:summary="@string/timer_default_priority_summary"
 			android:title="@string/timer_default_priority_title" />
 	</PreferenceCategory>
 
 	<PreferenceCategory android:title="@string/livetv">
 
-		<EditTextPreference android:defaultValue="3000"
+		<EditTextPreference
 			android:inputType="number" android:key="streamingport"
 			android:summary="@string/settings_livetv_port_summary" android:title="@string/settings_livetv_port" />
 
@@ -111,20 +111,21 @@
 			android:password="true" android:summary="@string/streaming_password_sum"
 			android:title="@string/streaming_password_title" />
 
-		<ListPreference android:defaultValue="TS"
+		<ListPreference
 			android:entries="@array/livetv_streamformat" android:entryValues="@array/livetv_streamformat_values"
 			android:key="livetv_streamformat" android:title="@string/settings_livetv_streamformat" />
 
 		<CheckBoxPreference android:key="remux_enable"
-			android:defaultValue="false" android:summary="@string/remux_enable_summary"
+
+            android:summary="@string/remux_enable_summary"
 			android:title="@string/remux_enable_title" />
 
-		<ListPreference android:defaultValue="EXT"
+		<ListPreference
 			android:entries="@array/remux_entries" android:entryValues="@array/remux_entry_values"
 			android:dependency="remux_enable" android:key="remux_command"
 			android:summary="@string/remux_command_summary" android:title="@string/remux_command_title" />
 
-		<EditTextPreference android:defaultValue="QUALITY=DSL1000"
+		<EditTextPreference
 			android:dependency="remux_enable" android:key="remux_parameter"
 			android:summary="@string/remux_parameter_summary" android:title="@string/remux_parameter_title" />
 	</PreferenceCategory>
@@ -132,10 +133,10 @@
 	<PreferenceCategory android:title="@string/recstream" android:key="key_streaming_category">
 
 		<CheckBoxPreference android:key="key_rec_stream_enable"
-			android:defaultValue="false" android:summary="@string/recstream_enable_summary"
+			android:summary="@string/recstream_enable_summary"
 			android:title="@string/recstream_enable_title" />
 
-		<ListPreference android:defaultValue="vdr-live"
+		<ListPreference
 			android:dependency="key_rec_stream_enable" android:entries="@array/recstream_entries"
 			android:entryValues="@array/recstream_entry_values" android:key="key_recstream_method"
 			android:summary="@string/recstream_method_summary" android:title="@string/recstream_method_title" />
@@ -147,25 +148,31 @@
 
 	</PreferenceCategory>
 
+
+
 	<PreferenceScreen android:title="Advanced">
 
-		<EditTextPreference android:defaultValue="10"
+
+		<EditTextPreference
 			android:inputType="number" android:key="@string/vdr_conntimeout_key"
 			android:summary="@string/vdr_conntimeout_sum" android:title="@string/vdr_conntimeout_title" />
 
-		<EditTextPreference android:defaultValue="10"
+		<EditTextPreference
 			android:inputType="number" android:key="@string/vdr_readtimeout_key"
 			android:summary="@string/vdr_readtimeout_sum" android:title="@string/vdr_readtimeout_title" />
 
-		<EditTextPreference android:defaultValue="120"
+		<EditTextPreference
 			android:inputType="number" android:key="@string/vdr_timeout_key"
 			android:summary="@string/vdr_timeout_sum" android:title="@string/vdr_timeout_title" />
 
 
-		<EditTextPreference android:defaultValue="utf-8"
+		<EditTextPreference
 			android:key="@string/vdr_encoding_key" android:summary="@string/vdr_encoding_summary"
 			android:title="@string/vdr_encoding_title" />
 
+
+
+
 	</PreferenceScreen>
 
 </PreferenceScreen>
\ No newline at end of file