Merge pull request #830 from gerhardol/feature/workout-improvements

workout improvements

app/res/layout/start_interval.xml

@@ -41,7 +41,7 @@
         <org.runnerup.widget.TitleSpinner
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:defaultValue="5"
+            android:defaultValue="8"
             android:inputType="number"
             android:key="@string/pref_interval_repetitions"
             android:prompt="@string/Type"
@@ -53,6 +53,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:entries="@array/types"
+            android:defaultValue="1"
             android:key="@string/pref_interval_type"
             android:prompt="@string/Type"
             android:text="@string/Interval_type" />

app/res/xml/audio_cue_settings.xml

@@ -19,22 +19,14 @@
 	android:layout_width="fill_parent"
 	android:layout_height="fill_parent" >
 
-	<!-- Doesn't work yet :-(
-            <CheckBoxPreference
-                android:defaultValue="false"
-                android:persistent="false"
-                android:key="cue_silence"
-                android:title="Silence"
-                android:summary="Clear all cues"/>
-    -->
 	<PreferenceCategory android:title="@string/Triggers" />
 
 	<CheckBoxPreference
 		android:defaultValue="false"
 		android:persistent="true"
 		android:key="@string/cue_time"
-		android:title="@string/Time_triggered_audio_cue" />
-
+		android:title="@string/Time_triggered_audio_cue"
+		android:summary="@string/Time_triggered_audio_cue_summary" />
 	<org.runnerup.widget.TextPreference
 		android:dependency="cue_time"
 		android:defaultValue="120"
@@ -47,8 +39,8 @@
 		android:defaultValue="false"
 		android:persistent="true"
 		android:key="@string/cue_distance"
-		android:title="@string/Distance_triggered_audio_cue" />
-
+		android:title="@string/Distance_triggered_audio_cue"
+		android:summary="@string/Distance_triggered_audio_cue_summary" />
 	<org.runnerup.widget.TextPreference
 		android:dependency="@string/cue_distance"
 		android:defaultValue="1000"
@@ -61,35 +53,17 @@
 		android:defaultValue="true"
 		android:persistent="true"
 		android:key="@string/cue_end_of_lap"
-		android:title="@string/End_of_lap_audio_cue" />
-
-	<CheckBoxPreference
-		android:dependency="@string/cue_end_of_lap"
-		android:defaultValue="true"
-		android:persistent="true"
-		android:key="@string/pref_lap_started"
-		android:title="@string/Lap_start" />
-
-	<CheckBoxPreference
-		android:defaultValue="false"
-		android:persistent="true"
-		android:key="@string/pref_mute_bool"
-		android:title="@string/Mute_music_during_audio_cues" />
-
-	<CheckBoxPreference
-		android:defaultValue="true"
-		android:persistent="true"
-		android:key="@string/pref_cue_hrm_connection"
-		android:title="@string/HRM_connection_audio_cue" />
-
-	<CheckBoxPreference
-		android:defaultValue="true"
-		android:persistent="true"
-		android:key="@string/cueinfo_units"
-		android:title="@string/Audio_cue_unit" />
+		android:title="@string/End_of_lap_audio_cue"
+		android:summary="@string/End_of_lap_audio_cue_summary" />
 
 	<PreferenceCategory android:key="cueinfo" android:title="@string/Cue_information">
-		<CheckBoxPreference
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:persistent="true"
+            android:key="@string/cueinfo_units"
+            android:title="@string/Audio_cue_unit" />
+
+        <CheckBoxPreference
 			android:defaultValue="false"
 			android:persistent="true"
 			android:key="@string/cueinfo_total_distance"
@@ -217,13 +191,32 @@
 			android:title="@string/Target_coaching"
 			android:summary="@string/Coach_to_help_you_reach_target_if_having_set_target"
 			/>
-		<CheckBoxPreference
+
+        <CheckBoxPreference
 			android:defaultValue="false"
 			android:persistent="true"
 			android:key="@string/cueinfo_skip_startstop"
 			android:title="@string/Skip_event_audio_cues"
 			android:summary="@string/Keep_silent_when_workout_startpauseresumestop"
 			/>
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:persistent="true"
+            android:key="@string/pref_lap_started"
+            android:title="@string/Lap_start"
+            android:summary="@string/Lap_start_summary" />
+
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:persistent="true"
+            android:key="@string/pref_cue_hrm_connection"
+            android:title="@string/HRM_connection_audio_cue" />
+
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:persistent="true"
+            android:key="@string/pref_mute_bool"
+            android:title="@string/Mute_music_during_audio_cues" />
 	</PreferenceCategory>
 
 	<PreferenceCategory android:title="@string/Test_audio_cue">