Add a Photo Size option in Advanced settings

MyTracks/res/values/arrays_do_not_translate.xml

@@ -15,7 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
-
   <!-- Do not translate any arrays in this file. -->
   <string-array name="activity_types">
     <item>@string/activity_type_airplane</item>
@@ -142,6 +141,12 @@ limitations under the License.
     <item>900</item>
     <item>1800</item>
   </string-array>
+  <string-array name="photo_size_values">
+    <item>500</item>
+    <item>1024</item>
+    <item>2048</item>
+    <item>-1</item>
+  </string-array>
   <string-array name="recording_distance_interval_values">
     <item>1</item>
     <item>2</item>
@@ -172,7 +177,7 @@ limitations under the License.
     <item>@string/sensor_type_value_polar</item>
     <item>@string/sensor_type_value_zephyr</item>
     <item>@string/sensor_type_value_ant</item>
-    <item>@string/sensor_type_value_none</item>    
+    <item>@string/sensor_type_value_none</item>
   </string-array>
   <string-array name="sensor_type_bluetooth_options">
     <item>@string/settings_sensor_type_polar</item>
@@ -195,7 +200,7 @@ limitations under the License.
   <string-array name="stats_rate_values">
     <item>@string/stats_rate_speed</item>
     <item>@string/stats_rate_pace</item>
-  </string-array>  
+  </string-array>
   <string-array name="stats_units_options">
     <item>@string/settings_stats_units_metric</item>
     <item>@string/settings_stats_units_imperial</item>
@@ -203,7 +208,7 @@ limitations under the License.
   <string-array name="stats_units_values">
     <item>@string/stats_units_metric</item>
     <item>@string/stats_units_imperial</item>
-  </string-array>  
+  </string-array>
   <string-array name="track_color_mode_options">
     <item>@string/settings_map_track_color_mode_single</item>
     <item>@string/settings_map_track_color_mode_fixed</item>
@@ -284,5 +289,4 @@ limitations under the License.
     <item>@string/waypoint_type_water_fountain</item>
     <item>@string/waypoint_type_waypoint</item>
   </string-array>
-
 </resources>

MyTracks/res/values/keys.xml

@@ -27,18 +27,19 @@ limitations under the License.
   <string name="default_activity_key">defaultActivity</string>
   <string name="export_external_storage_format_key">exportExternalStorageFormat</string>
   <string name="export_google_fusion_tables_public_key">exportGoogleFusionTablesPublic</string>
-  <string name="export_google_maps_public_key">exportGoogleMapsPublic</string>  
+  <string name="export_google_maps_public_key">exportGoogleMapsPublic</string>
   <string name="export_type_key">exportType</string>
   <string name="map_type_key">mapType</string>
   <string name="max_recording_distance_key">maxRecordingDistance</string>
   <string name="min_recording_interval_key">minRecordingInterval</string>
+  <string name="photo_size_key">photoSize</string>
   <string name="recording_distance_interval_key">recordingDistanceInterval</string>
   <string name="recording_gps_accuracy_key">recordingGpsAccuracy</string>
   <string name="sensor_type_key">sensorType</string>
   <string name="share_track_invite_key">shareTrackInvite</string>
   <string name="share_track_public_key">shareTrackPublic</string>
   <string name="split_frequency_key">splitFrequency</string>
-  <string name="stats_rate_key">statsRate</string>  
+  <string name="stats_rate_key">statsRate</string>
   <string name="stats_show_coordinate_key">statsShowCoordinate</string>
   <string name="stats_show_grade_elevation_key">statsShowGradeElevation</string>
   <string name="stats_show_calorie_key">statsShowCalorie</string>
@@ -70,6 +71,7 @@ limitations under the License.
   <string name="recording_track_id_key">recordingTrackId</string>
   <string name="recording_track_paused_key">recordingTrackPaused</string>
   <!-- Keys for non-persisted preferences. Sorted alphabetically. DO NOT TRANSLATE. -->
+  <string name="settings_advanced_key">settingsAdvanced</string>
   <string name="settings_backup_key">settingsBackup</string>
   <string name="settings_backup_reset_key">settingsBackupReset</string>
   <string name="settings_chart_key">settingsChart</string>
@@ -90,6 +92,5 @@ limitations under the License.
   <string name="settings_sensor_bluetooth_key">settingsSensorBluetooth</string>
   <string name="settings_sensor_bluetooth_pairing_key">settingsSensorBluetoothPairing</string>
   <string name="settings_sensor_root_key">settingsSensorRoot</string>
-  <string name="settings_sharing_key">settingsSharing</string>
   <string name="settings_stats_key">settingsStats</string>
 </resources>

MyTracks/res/values/strings.xml

@@ -777,7 +777,7 @@ limitations under the License.
   <string name="generic_delete_selected_confirm_title"
     translation_description="When deleting selected items, the title of the confirmation dialog.">
     Delete selected?
-  </string>  
+  </string>
   <string name="generic_description"
     translation_description="The text label for entering a description.">
     Description
@@ -1002,7 +1002,7 @@ limitations under the License.
   </string>
   <string name="marker_delete_one_confirm_title"
     translation_description="When deleting one marker, the title of the confirmation dialog.">
-    Delete marker?    
+    Delete marker?
   </string>
   <string name="marker_delete_multiple_confirm_message"
     translation_description="When deleting multiple markers, the confirmation message.">
@@ -1475,6 +1475,29 @@ limitations under the License.
     Show
   </string>
 
+  <!-- Settings Advanced -->
+  <string name="settings_advanced"
+    translation_description="In the 'Settings' page, the 'Advanced' options.
+
+      Character limit: ~26 (1 line)">
+    Advanced
+  </string>
+  <string name="settings_advanced_photo_size_original"
+    translation_description="In the 'Advanced' settings, under the 'Photo size' option, the value to
+      use the original photo size.">
+    Original size
+  </string>
+  <string name="settings_advanced_photo_size_summary"
+    translation_description="In the 'Advanced' settings, the summary for the 'Photo size' option.
+
+      %1$s value. E.g., '1 MB'.">
+    Scale photo to %1$s for export.
+  </string>
+  <string name="settings_advanced_photo_size_title"
+    translation_description="In the 'Advanced' settings, the option to set the photo size.">
+    Photo size
+  </string>
+
   <!-- Settings Backup Reset -->
   <string name="settings_backup_reset"
     translation_description="In the 'Settings' page, the option backup and reset.
@@ -1494,7 +1517,7 @@ limitations under the License.
   <string name="settings_backup_confirm_message"
     translation_description="In the 'Backup and reset' settings, after pressing the 'Backup' option,
       the confirmation message.
-      
+
       %1$s the directory. E.g., '/MyTracks/backups'.">
     This will write a full copy of all your tracks and settings to &#8216;%1$s&#8217; on the
     external storage.
@@ -1955,13 +1978,6 @@ limitations under the License.
   </string>
 
   <!-- Settings Sharing -->
-  <string name="settings_sharing"
-    translation_description="In the 'Settings' page, the option to change the track sharing related
-      settings.
-
-      Character limit: ~26 (1 line)">
-    Sharing
-  </string>
   <string name="settings_sharing_allow_access"
     translation_description="In the 'Sharing' settings, the checkbox option to allow third party
       apps access to the My Tracks data.
@@ -2137,13 +2153,13 @@ limitations under the License.
   </string>
   <string name="stats_calorie"
     translation_description="In the 'Stats' page, the calorie burned.
-    
+
       Character limit: ~23 (1 line)">
     Calories
   </string>
   <string name="stats_calorie_setup"
     translation_description="In the 'Stats' page, the button to setup calorie.
-    
+
       Character limit: ~23 (1 line)">
     Setup Activity Type
   </string>
@@ -2238,11 +2254,11 @@ limitations under the License.
   </string>
   <string name="track_markers"
     translation_description="Title indicating a particular track's markers.
-      
+
       %1$s track name. E.g., 'Grand Canyon trail'.">
     %1$s Markers
   </string>
-  
+
   <!-- Track Delete -->
   <string name="track_delete_all_confirm_message"
     translation_description="When deleting all the tracks, the confirmation message.">
@@ -2492,12 +2508,11 @@ limitations under the License.
       %1$d an integer value. E.g., '2'.">
     %1$d ft (recommended)
   </string>
-  <string name="value_integer_kilometer"
-    translation_description="In a setting picker, the string format to display an integer value in
-      kilometers (km).
+  <string name="value_integer_kilobyte"
+    translation_description="Display an integer value in kilobyte (kB).
 
       %1$d an integer value. E.g., '2'.">
-    %1$d km
+    %1$d kB
   </string>
   <string name="value_integer_kilogram"
     translation_description="Display an integer value in kilogram (kg).
@@ -2505,12 +2520,25 @@ limitations under the License.
       %1$d an integer value. E.g., '2'.">
     %1$d kg
   </string>
+  <string name="value_integer_kilometer"
+    translation_description="In a setting picker, the string format to display an integer value in
+      kilometers (km).
+
+      %1$d an integer value. E.g., '2'.">
+    %1$d km
+  </string>
   <string name="value_integer_kilometer_hour"
     translation_description="Display an integer value in kilometers per hour (km/h).
 
       %1$d an integer value. E.g., '2'.">
     %1$d km/h
   </string>
+  <string name="value_integer_megabyte"
+    translation_description="Display an integer value in megabyte (MB).
+
+      %1$d an integer value. E.g., '2'.">
+    %1$d MB
+  </string>
   <string name="value_integer_meter"
     translation_description="In a setting picker, the string format to display an integer value in
       meters (m).