karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Improve the startup sequence.

Browse Source 
- new welcome dialog message.
- new check units text.
- for US and UK, default to imperial.
- for fragments, fix handling of onCancel. No need
  to handle onCancel at the dialog level.
This commit is contained in:
Jimmy Shih
2012-04-25 17:30:56 -07:00
parent 1e4a6c04c2
commit 2b6309f7c1
29 changed files with 393 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/layout/help.xml
+96 -1
View File
@@ -19,7 +19,102 @@ limitations under the License.
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:orientation="vertical" > android:orientation="vertical" >
<ScrollView style="@style/ScrollView.WithBottomButtons" > <ScrollView style="@style/ScrollView.WithBottomButtons" >
<include layout="@layout/help_content" /> <LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="vertical"
android:padding="8dp" >
<ImageView
android:contentDescription="@string/my_tracks_app_name"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:scaleType="fitStart"
android:src="@drawable/arrow_icon" />
<TextView
android:text="@string/help_my_tracks_question"
style="@style/HelpQuestion" />
<TextView
android:text="@string/help_my_tracks_answer"
style="@style/HelpAnswer" />
<TextView
android:text="@string/help_location_precision_question"
style="@style/HelpQuestion" />
<TextView
android:text="@string/help_location_precision_answer"
style="@style/HelpAnswer" />
<TextView
android:text="@string/help_gps_fix_question"
style="@style/HelpQuestion" />
<TextView
android:text="@string/help_gps_fix_answer"
style="@style/HelpAnswer" />
<TextView
android:text="@string/help_data_connection_question"
style="@style/HelpQuestion" />
<TextView
android:text="@string/help_data_connection_answer"
style="@style/HelpAnswer" />
<TextView
android:text="@string/help_elevation_precision_question"
style="@style/HelpQuestion" />
<TextView
android:text="@string/help_elevation_precision_answer"
style="@style/HelpAnswer" />
<TextView
android:text="@string/help_battery_life_question"
style="@style/HelpQuestion" />
<TextView
android:text="@string/help_battery_life_answer"
style="@style/HelpAnswer" />
<TextView
android:text="@string/help_share_friends_question"
style="@style/HelpQuestion" />
<TextView
android:text="@string/help_share_friends_answer"
style="@style/HelpAnswer" />
<TextView
android:text="@string/help_share_visibility_question"
style="@style/HelpQuestion" />
<TextView
android:text="@string/help_share_visibility_answer"
style="@style/HelpAnswer" />
<TextView
android:text="@string/help_split_track_question"
style="@style/HelpQuestion" />
<TextView
android:text="@string/help_split_track_answer"
style="@style/HelpAnswer" />
<TextView
android:text="@string/help_saved_files_question"
style="@style/HelpQuestion" />
<TextView
android:text="@string/help_saved_files_answer"
style="@style/HelpAnswer" />
<TextView
android:text="@string/help_waypoint_marker_question"
style="@style/HelpQuestion" />
<TextView
android:text="@string/help_waypoint_marker_answer"
style="@style/HelpAnswer" />
<TextView
android:text="@string/help_statistics_marker_question"
style="@style/HelpQuestion" />
<TextView
android:text="@string/help_statistics_marker_answer"
style="@style/HelpAnswer" />
<TextView
android:text="@string/help_delete_tracks_question"
style="@style/HelpQuestion" />
<TextView
android:text="@string/help_delete_tracks_answer"
style="@style/HelpAnswer" />
<TextView
android:text="@string/help_edit_tracks_question"
style="@style/HelpQuestion" />
<TextView
android:text="@string/help_edit_tracks_answer"
style="@style/HelpAnswer" />
</LinearLayout>
</ScrollView> </ScrollView>
<LinearLayout style="@style/BottomButtonBar" > <LinearLayout style="@style/BottomButtonBar" >
<include layout="@layout/help_buttons" /> <include layout="@layout/help_buttons" />
MyTracks/res/layout/help_content.xml
-114
View File
@@ -1,114 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2012 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<merge xmlns:android="http://schemas.android.com/apk/res/android" >
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="vertical"
android:padding="8dp" >
<ImageView
android:contentDescription="@string/my_tracks_app_name"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:scaleType="fitStart"
android:src="@drawable/arrow_icon" />
<TextView
android:text="@string/help_my_tracks_question"
style="@style/WelcomeQuestionTextView" />
<TextView
android:text="@string/help_my_tracks_answer"
style="@style/WelcomeAnswerTextView" />
<TextView
android:text="@string/help_location_precision_question"
style="@style/WelcomeQuestionTextView" />
<TextView
android:text="@string/help_location_precision_answer"
style="@style/WelcomeAnswerTextView" />
<TextView
android:text="@string/help_gps_fix_question"
style="@style/WelcomeQuestionTextView" />
<TextView
android:text="@string/help_gps_fix_answer"
style="@style/WelcomeAnswerTextView" />
<TextView
android:text="@string/help_data_connection_question"
style="@style/WelcomeQuestionTextView" />
<TextView
android:text="@string/help_data_connection_answer"
style="@style/WelcomeAnswerTextView" />
<TextView
android:text="@string/help_elevation_precision_question"
style="@style/WelcomeQuestionTextView" />
<TextView
android:text="@string/help_elevation_precision_answer"
style="@style/WelcomeAnswerTextView" />
<TextView
android:text="@string/help_battery_life_question"
style="@style/WelcomeQuestionTextView" />
<TextView
android:text="@string/help_battery_life_answer"
style="@style/WelcomeAnswerTextView" />
<TextView
android:text="@string/help_share_friends_question"
style="@style/WelcomeQuestionTextView" />
<TextView
android:text="@string/help_share_friends_answer"
style="@style/WelcomeAnswerTextView" />
<TextView
android:text="@string/help_share_visibility_question"
style="@style/WelcomeQuestionTextView" />
<TextView
android:text="@string/help_share_visibility_answer"
style="@style/WelcomeAnswerTextView" />
<TextView
android:text="@string/help_split_track_question"
style="@style/WelcomeQuestionTextView" />
<TextView
android:text="@string/help_split_track_answer"
style="@style/WelcomeAnswerTextView" />
<TextView
android:text="@string/help_saved_files_question"
style="@style/WelcomeQuestionTextView" />
<TextView
android:text="@string/help_saved_files_answer"
style="@style/WelcomeAnswerTextView" />
<TextView
android:text="@string/help_waypoint_marker_question"
style="@style/WelcomeQuestionTextView" />
<TextView
android:text="@string/help_waypoint_marker_answer"
style="@style/WelcomeAnswerTextView" />
<TextView
android:text="@string/help_statistics_marker_question"
style="@style/WelcomeQuestionTextView" />
<TextView
android:text="@string/help_statistics_marker_answer"
style="@style/WelcomeAnswerTextView" />
<TextView
android:text="@string/help_delete_tracks_question"
style="@style/WelcomeQuestionTextView" />
<TextView
android:text="@string/help_delete_tracks_answer"
style="@style/WelcomeAnswerTextView" />
<TextView
android:text="@string/help_edit_tracks_question"
style="@style/WelcomeQuestionTextView" />
<TextView
android:text="@string/help_edit_tracks_answer"
style="@style/WelcomeAnswerTextView" />
</LinearLayout>
</merge>
MyTracks/res/layout/welcome.xml
-20
View File
@@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2010 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/ScrollView" >
<include layout="@layout/help_content" />
</ScrollView>
MyTracks/res/values/keys.xml
+11 -14
View File
@@ -15,13 +15,15 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<resources> <resources>
<!-- Keys for application preferences. Sorted alphabetically. - DO NOT TRANSLATE -->
<!-- Keys for persisted preferences. Sorted alphabetically. - DO NOT TRANSLATE -->
<string name="allow_access_key">allowAccess</string> <string name="allow_access_key">allowAccess</string>
<string name="announcement_frequency_key">announcementFrequency</string> <string name="announcement_frequency_key">announcementFrequency</string>
<string name="ant_cadence_sensor_id_key">antCadenceSensorId</string> <string name="ant_cadence_sensor_id_key">antCadenceSensorId</string>
<string name="ant_cadence_speed_sensor_id_key">antCadenceSpeedSensorId</string> <string name="ant_cadence_speed_sensor_id_key">antCadenceSpeedSensorId</string>
<string name="ant_heart_rate_sensor_id_key">antHeartRateSensorId</string> <string name="ant_heart_rate_sensor_id_key">antHeartRateSensorId</string>
<string name="ant_srm_bridge_sensor_id_key">antSRMBridgeSensorId</string> <string name="ant_srm_bridge_sensor_id_key">antSRMBridgeSensorId</string>
<string name="auto_resume_track_current_retry_key">autoResumeTrackCurrentRetry</string>
<string name="auto_resume_track_timeout_key">autoResumeTrackTimeout</string> <string name="auto_resume_track_timeout_key">autoResumeTrackTimeout</string>
<string name="bluetooth_pairing_key">bluetoothPairing</string> <string name="bluetooth_pairing_key">bluetoothPairing</string>
<string name="bluetooth_sensor_key">bluetoothSensor</string> <string name="bluetooth_sensor_key">bluetoothSensor</string>
@@ -34,30 +36,25 @@ limitations under the License.
<string name="min_required_accuracy_key">minRequiredAccuracy</string> <string name="min_required_accuracy_key">minRequiredAccuracy</string>
<string name="pick_existing_map_key">pickExistingMap</string> <string name="pick_existing_map_key">pickExistingMap</string>
<string name="preferred_account_key">preferredAccount</string> <string name="preferred_account_key">preferredAccount</string>
<string name="recording_track_id_key">recordingTrackId</string>
<string name="report_speed_key">reportSpeed</string> <string name="report_speed_key">reportSpeed</string>
<string name="selected_track_id_key">selectedTrackId</string>
<string name="send_to_docs_key">sendToDocs</string> <string name="send_to_docs_key">sendToDocs</string>
<string name="send_to_fusion_tables_key">sendToFusionTables</string> <string name="send_to_fusion_tables_key">sendToFusionTables</string>
<string name="send_to_maps_key">sendToMaps</string> <string name="send_to_maps_key">sendToMaps</string>
<string name="sensor_type_key">sensorType</string> <string name="sensor_type_key">sensorType</string>
<string name="share_url_only_key">shareUrlOnly</string> <string name="share_url_only_key">shareUrlOnly</string>
<string name="show_check_units_dialog_key">showCheckUnitsDialog</string>
<string name="show_welcome_dialog_key">showWelcomeDialog</string>
<string name="split_frequency_key">splitFrequency</string> <string name="split_frequency_key">splitFrequency</string>
<string name="track_color_mode_dynamic_speed_variation_key">trackColorModeDynamicVariation <string name="track_color_mode_dynamic_speed_variation_key">trackColorModeDynamicVariation</string>
</string> <string name="track_color_mode_fixed_speed_medium_display_key">trackColorModeFixedMediumDisplay</string>
<string name="track_color_mode_fixed_speed_medium_display_key">trackColorModeFixedMediumDisplay
</string>
<string name="track_color_mode_fixed_speed_medium_key">trackColorModeFixedMedium</string> <string name="track_color_mode_fixed_speed_medium_key">trackColorModeFixedMedium</string>
<string name="track_color_mode_fixed_speed_slow_display_key">trackColorModeFixedSlowDisplay <string name="track_color_mode_fixed_speed_slow_display_key">trackColorModeFixedSlowDisplay</string>
</string>
<string name="track_color_mode_fixed_speed_slow_key">trackColorModeFixedSlow</string> <string name="track_color_mode_fixed_speed_slow_key">trackColorModeFixedSlow</string>
<string name="track_color_mode_key">trackColorMode</string> <string name="track_color_mode_key">trackColorMode</string>
<string name="track_name_key">trackName</string> <string name="track_name_key">trackName</string>
<!-- Preference keys which keep transient state (not user preferences). Sorted alphabetically.
- DO NOT TRANSLATE -->
<string name="auto_resume_track_current_retry_key">autoResumeTrackCurrentRetry</string>
<string name="recording_track_id_key">recordingTrackId</string>
<string name="selected_track_id_key">selectedTrackId</string>
<!-- Keys for non-persisted preferences. Sorted alphabetically. - DO NOT TRANSLATE --> <!-- Keys for non-persisted preferences. Sorted alphabetically. - DO NOT TRANSLATE -->
<string name="ant_options_key">antOptions</string> <string name="ant_options_key">antOptions</string>
<string name="backup_to_sd_key">backupToSd</string> <string name="backup_to_sd_key">backupToSd</string>
@@ -65,4 +62,4 @@ limitations under the License.
<string name="restore_from_sd_key">restoreFromSd</string> <string name="restore_from_sd_key">restoreFromSd</string>
<string name="sensor_options_key">sensorOptions</string> <string name="sensor_options_key">sensorOptions</string>
<string name="track_color_mode_fixed_speed_options_key">trackColorModeFixedOptions</string> <string name="track_color_mode_fixed_speed_options_key">trackColorModeFixedOptions</string>
</resources> </resources>
MyTracks/res/values/strings.xml
+11 -3
View File
@@ -1226,17 +1226,17 @@ limitations under the License.
<string name="preferred_units_imperial" <string name="preferred_units_imperial"
translation_description="In the dialog asking the user to choose a preferred units, the option translation_description="In the dialog asking the user to choose a preferred units, the option
to choose the imperial units."> to choose the imperial units.">
Imperial Imperial (mi, ft)
</string> </string>
<string name="preferred_units_metric" <string name="preferred_units_metric"
translation_description="In the dialog asking the user to choose a preferred units, the option translation_description="In the dialog asking the user to choose a preferred units, the option
to choose the metric units."> to choose the metric units.">
Metric Metric (km, m)
</string> </string>
<string name="preferred_units_title" <string name="preferred_units_title"
translation_description="The title of the dialog asking the user to choose a preferred units, translation_description="The title of the dialog asking the user to choose a preferred units,
metric or imperial."> metric or imperial.">
Preferred units Preferred Units
</string> </string>
<!-- SD Card --> <!-- SD Card -->
@@ -2924,6 +2924,14 @@ limitations under the License.
</string> </string>
<!-- Welcome --> <!-- Welcome -->
<string name="welcome_message"
translation_description="The message of the welcome dialog.">
Use My Tracks while you run, bike, hike, or do anything outdoor to record your path. While
recording, you can visualize your track and watch live statistics. You can also add
markers, have markers inserted periodically, or hear automatic voice announcements of
your progress. For recorded tracks, you can play them on Google Earth, share with friends, or
upload to Google Maps, Google Fusion Tables, or Google Docs.
</string>
<string name="welcome_title" <string name="welcome_title"
translation_description="The title of the welcome dialog."> translation_description="The title of the welcome dialog.">
Welcome to My Tracks Welcome to My Tracks
MyTracks/res/values/styles.xml
+9 -9
View File
@@ -52,6 +52,15 @@ limitations under the License.
<item name="android:selectAllOnFocus">true</item> <item name="android:selectAllOnFocus">true</item>
<item name="android:singleLine">true</item> <item name="android:singleLine">true</item>
</style> </style>
<!-- The style for the help answer -->
<style name="HelpAnswer" parent="@style/TextSmall">
<item name="android:paddingBottom">8dp</item>
</style>
<!-- The style for help question -->
<style name="HelpQuestion" parent="@style/TextMedium">
<item name="android:paddingTop">8dp</item>
<item name="android:textStyle">bold</item>
</style>
<!-- The style for the list empty text view --> <!-- The style for the list empty text view -->
<style name="ListEmptyTextView" parent="@style/TextLarge"> <style name="ListEmptyTextView" parent="@style/TextLarge">
<item name="android:gravity">center</item> <item name="android:gravity">center</item>
@@ -147,13 +156,4 @@ limitations under the License.
<item name="android:layout_height">wrap_content</item> <item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">wrap_content</item> <item name="android:layout_width">wrap_content</item>
</style> </style>
<!-- The style for the welcome page answer -->
<style name="WelcomeAnswerTextView" parent="@style/TextSmall">
<item name="android:paddingBottom">8dp</item>
</style>
<!-- The style for welcome page question -->
<style name="WelcomeQuestionTextView" parent="@style/TextMedium">
<item name="android:paddingTop">8dp</item>
<item name="android:textStyle">bold</item>
</style>
</resources> </resources>
MyTracks/src/com/google/android/apps/mytracks/AggregatedStatsActivity.java
+3 -6
View File
@@ -19,11 +19,10 @@ package com.google.android.apps.mytracks;
import com.google.android.apps.mytracks.content.MyTracksProviderUtils; import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
import com.google.android.apps.mytracks.content.Track; import com.google.android.apps.mytracks.content.Track;
import com.google.android.apps.mytracks.stats.TripStatistics; import com.google.android.apps.mytracks.stats.TripStatistics;
import com.google.android.apps.mytracks.util.PreferencesUtils;
import com.google.android.apps.mytracks.util.StatsUtils; import com.google.android.apps.mytracks.util.StatsUtils;
import com.google.android.maps.mytracks.R; import com.google.android.maps.mytracks.R;
import android.content.Context;
import android.content.SharedPreferences;
import android.os.Bundle; import android.os.Bundle;
import java.util.List; import java.util.List;
@@ -40,10 +39,8 @@ public class AggregatedStatsActivity extends AbstractMyTracksActivity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.aggregated_stats); setContentView(R.layout.aggregated_stats);
SharedPreferences preferences = getSharedPreferences( boolean metricUnits = PreferencesUtils.isMetricUnits(this);
Constants.SETTINGS_NAME, Context.MODE_PRIVATE); boolean reportSpeed = PreferencesUtils.isReportSpeed(this);
boolean metricUnits = preferences.getBoolean(getString(R.string.metric_units_key), true);
boolean reportSpeed = preferences.getBoolean(getString(R.string.report_speed_key), true);
StatsUtils.setStats(this, StatsUtils.setStats(this,
getTripStatistics(), getTripStatistics(),
MyTracks/src/com/google/android/apps/mytracks/MarkerDetailActivity.java
+4 -7
View File
@@ -20,12 +20,11 @@ import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
import com.google.android.apps.mytracks.content.Waypoint; import com.google.android.apps.mytracks.content.Waypoint;
import com.google.android.apps.mytracks.fragments.DeleteOneMarkerDialogFragment; import com.google.android.apps.mytracks.fragments.DeleteOneMarkerDialogFragment;
import com.google.android.apps.mytracks.util.IntentUtils; import com.google.android.apps.mytracks.util.IntentUtils;
import com.google.android.apps.mytracks.util.PreferencesUtils;
import com.google.android.apps.mytracks.util.StatsUtils; import com.google.android.apps.mytracks.util.StatsUtils;
import com.google.android.maps.mytracks.R; import com.google.android.maps.mytracks.R;
import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log; import android.util.Log;
import android.view.Menu; import android.view.Menu;
@@ -83,11 +82,9 @@ public class MarkerDetailActivity extends AbstractMyTracksActivity {
waypointSection.setVisibility(View.GONE); waypointSection.setVisibility(View.GONE);
statisticsSection.setVisibility(View.VISIBLE); statisticsSection.setVisibility(View.VISIBLE);
SharedPreferences preferences = getSharedPreferences( boolean metricUnits = PreferencesUtils.isMetricUnits(this);
Constants.SETTINGS_NAME, Context.MODE_PRIVATE); boolean reportSpeed = PreferencesUtils.isReportSpeed(this);
boolean metricUnits = preferences.getBoolean(getString(R.string.metric_units_key), true);
boolean reportSpeed = preferences.getBoolean(getString(R.string.report_speed_key), true);
StatsUtils.setStats(this, StatsUtils.setStats(this,
waypoint.getStatistics(), waypoint.getStatistics(),
null, null,
MyTracks/src/com/google/android/apps/mytracks/SearchListActivity.java
+3 -3
View File
@@ -105,7 +105,6 @@ public class SearchListActivity extends AbstractMyTracksActivity {
private SearchEngine searchEngine; private SearchEngine searchEngine;
private SearchRecentSuggestions searchRecentSuggestions; private SearchRecentSuggestions searchRecentSuggestions;
private LocationManager locationManager; private LocationManager locationManager;
private SharedPreferences sharedPreferences;
private long recordingTrackId; private long recordingTrackId;
private boolean metricUnits; private boolean metricUnits;
private ArrayAdapter<Map<String, Object>> arrayAdapter; private ArrayAdapter<Map<String, Object>> arrayAdapter;
@@ -124,7 +123,8 @@ public class SearchListActivity extends AbstractMyTracksActivity {
searchEngine = new SearchEngine(myTracksProviderUtils); searchEngine = new SearchEngine(myTracksProviderUtils);
searchRecentSuggestions = SearchEngineProvider.newHelper(this); searchRecentSuggestions = SearchEngineProvider.newHelper(this);
locationManager = (LocationManager) getSystemService(LOCATION_SERVICE); locationManager = (LocationManager) getSystemService(LOCATION_SERVICE);
sharedPreferences = getSharedPreferences(Constants.SETTINGS_NAME, Context.MODE_PRIVATE); SharedPreferences sharedPreferences = getSharedPreferences(
Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
sharedPreferences.registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener); sharedPreferences.registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener);
recordingTrackId = PreferencesUtils.getRecordingTrackId(this); recordingTrackId = PreferencesUtils.getRecordingTrackId(this);
@@ -185,7 +185,7 @@ public class SearchListActivity extends AbstractMyTracksActivity {
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
metricUnits = sharedPreferences.getBoolean(getString(R.string.metric_units_key), true); metricUnits = PreferencesUtils.isMetricUnits(this);
} }
@Override @Override
MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java
+5 -10
View File
@@ -131,8 +131,7 @@ public class SettingsActivity extends PreferenceActivity {
// Hook up switching of displayed list entries between metric and imperial // Hook up switching of displayed list entries between metric and imperial
// units // units
CheckBoxPreference metricUnitsPreference = CheckBoxPreference metricUnitsPreference =
(CheckBoxPreference) findPreference( (CheckBoxPreference) findPreference(PreferencesUtils.getMetricUnitsKey(this));
getString(R.string.metric_units_key));
metricUnitsPreference.setOnPreferenceChangeListener( metricUnitsPreference.setOnPreferenceChangeListener(
new OnPreferenceChangeListener() { new OnPreferenceChangeListener() {
@Override @Override
@@ -643,9 +642,7 @@ public class SettingsActivity extends PreferenceActivity {
* If the units are not metric convert the value before displaying. * If the units are not metric convert the value before displaying.
*/ */
private void viewTrackColorModeSettings(EditTextPreference preference, int id) { private void viewTrackColorModeSettings(EditTextPreference preference, int id) {
CheckBoxPreference metricUnitsPreference = (CheckBoxPreference) findPreference( if (PreferencesUtils.isMetricUnits(this)) {
getString(R.string.metric_units_key));
if(metricUnitsPreference.isChecked()) {
return; return;
} }
// Convert miles/h to km/h // Convert miles/h to km/h
@@ -665,10 +662,10 @@ public class SettingsActivity extends PreferenceActivity {
* If the units are not metric convert the value before saving. * If the units are not metric convert the value before saving.
*/ */
private void validateTrackColorModeSettings(String newValue, int id) { private void validateTrackColorModeSettings(String newValue, int id) {
CheckBoxPreference metricUnitsPreference = (CheckBoxPreference) findPreference(
getString(R.string.metric_units_key));
String metricspeed; String metricspeed;
if(!metricUnitsPreference.isChecked()) { if (PreferencesUtils.isMetricUnits(this)) {
metricspeed = newValue;
} else {
// Convert miles/h to km/h // Convert miles/h to km/h
try { try {
metricspeed = String.valueOf( metricspeed = String.valueOf(
@@ -676,8 +673,6 @@ public class SettingsActivity extends PreferenceActivity {
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
metricspeed = "0"; metricspeed = "0";
} }
} else {
metricspeed = newValue;
} }
SharedPreferences prefs = getPreferenceManager().getSharedPreferences(); SharedPreferences prefs = getPreferenceManager().getSharedPreferences();
Editor editor = prefs.edit(); Editor editor = prefs.edit();
MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
+32 -11
View File
@@ -17,14 +17,15 @@
package com.google.android.apps.mytracks; package com.google.android.apps.mytracks;
import com.google.android.apps.mytracks.content.TracksColumns; import com.google.android.apps.mytracks.content.TracksColumns;
import com.google.android.apps.mytracks.fragments.CheckUnitsDialogFragment;
import com.google.android.apps.mytracks.fragments.DeleteAllTrackDialogFragment; import com.google.android.apps.mytracks.fragments.DeleteAllTrackDialogFragment;
import com.google.android.apps.mytracks.fragments.DeleteOneTrackDialogFragment; import com.google.android.apps.mytracks.fragments.DeleteOneTrackDialogFragment;
import com.google.android.apps.mytracks.fragments.EulaDialogFragment; import com.google.android.apps.mytracks.fragments.EulaDialogFragment;
import com.google.android.apps.mytracks.fragments.WelcomeDialogFragment;
import com.google.android.apps.mytracks.io.file.TrackWriterFactory.TrackFileFormat; import com.google.android.apps.mytracks.io.file.TrackWriterFactory.TrackFileFormat;
import com.google.android.apps.mytracks.services.ITrackRecordingService; import com.google.android.apps.mytracks.services.ITrackRecordingService;
import com.google.android.apps.mytracks.services.TrackRecordingServiceConnection; import com.google.android.apps.mytracks.services.TrackRecordingServiceConnection;
import com.google.android.apps.mytracks.util.ApiAdapterFactory; import com.google.android.apps.mytracks.util.ApiAdapterFactory;
import com.google.android.apps.mytracks.util.CheckUnitsUtils;
import com.google.android.apps.mytracks.util.EulaUtils; import com.google.android.apps.mytracks.util.EulaUtils;
import com.google.android.apps.mytracks.util.IntentUtils; import com.google.android.apps.mytracks.util.IntentUtils;
import com.google.android.apps.mytracks.util.ListItemUtil; import com.google.android.apps.mytracks.util.ListItemUtil;
@@ -118,8 +119,8 @@ public class TrackListActivity extends FragmentActivity {
@Override @Override
public void onSharedPreferenceChanged(SharedPreferences preferences, String key) { public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
// Note that key can be null // Note that key can be null
if (getString(R.string.metric_units_key).equals(key)) { if (PreferencesUtils.getMetricUnitsKey(TrackListActivity.this).equals(key)) {
metricUnits = preferences.getBoolean(getString(R.string.metric_units_key), true); metricUnits = PreferencesUtils.isMetricUnits(TrackListActivity.this);
} }
if (PreferencesUtils.getRecordingTrackIdKey(TrackListActivity.this).equals(key)) { if (PreferencesUtils.getRecordingTrackIdKey(TrackListActivity.this).equals(key)) {
recordingTrackId = PreferencesUtils.getRecordingTrackId(TrackListActivity.this); recordingTrackId = PreferencesUtils.getRecordingTrackId(TrackListActivity.this);
@@ -171,7 +172,7 @@ public class TrackListActivity extends FragmentActivity {
SharedPreferences sharedPreferences = getSharedPreferences( SharedPreferences sharedPreferences = getSharedPreferences(
Constants.SETTINGS_NAME, Context.MODE_PRIVATE); Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
sharedPreferences.registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener); sharedPreferences.registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener);
metricUnits = sharedPreferences.getBoolean(getString(R.string.metric_units_key), true); metricUnits = PreferencesUtils.isMetricUnits(this);
recordingTrackId = PreferencesUtils.getRecordingTrackId(this); recordingTrackId = PreferencesUtils.getRecordingTrackId(this);
ImageButton recordImageButton = (ImageButton) findViewById(R.id.track_list_record_button); ImageButton recordImageButton = (ImageButton) findViewById(R.id.track_list_record_button);
@@ -255,29 +256,49 @@ public class TrackListActivity extends FragmentActivity {
} }
}); });
showStartupDialogs();
}
/**
* Shows start up dialogs.
*/
public void showStartupDialogs() {
if (!EulaUtils.getEulaValue(this)) { if (!EulaUtils.getEulaValue(this)) {
Fragment fragment = getSupportFragmentManager() Fragment fragment = getSupportFragmentManager()
.findFragmentByTag(EulaDialogFragment.EULA_DIALOG_TAG); .findFragmentByTag(EulaDialogFragment.EULA_DIALOG_TAG);
if (fragment == null) { if (fragment == null) {
EulaDialogFragment.newInstance(false).show( EulaDialogFragment.newInstance(false)
getSupportFragmentManager(), EulaDialogFragment.EULA_DIALOG_TAG); .show(getSupportFragmentManager(), EulaDialogFragment.EULA_DIALOG_TAG);
} }
} } else if (PreferencesUtils.isShowWelcomeDialog(this)) {
if (CheckUnitsUtils.getCheckUnitsValue(this)) { Fragment fragment = getSupportFragmentManager()
.findFragmentByTag(WelcomeDialogFragment.WELCOME_DIALOG_TAG);
if (fragment == null) {
new WelcomeDialogFragment().show(
getSupportFragmentManager(), WelcomeDialogFragment.WELCOME_DIALOG_TAG);
}
} else if (PreferencesUtils.isShowCheckUnitsDialog(this)) {
Fragment fragment = getSupportFragmentManager()
.findFragmentByTag(CheckUnitsDialogFragment.CHECK_UNITS_DIALOG_TAG);
if (fragment == null) {
new CheckUnitsDialogFragment().show(
getSupportFragmentManager(), CheckUnitsDialogFragment.CHECK_UNITS_DIALOG_TAG);
}
} else {
enableEmptyView(); enableEmptyView();
} }
} }
/** /**
* Enables the content of the empty view. * Enables the content of the empty view.
*/ */
public void enableEmptyView() { private void enableEmptyView() {
View emptyMessage = findViewById(R.id.track_list_empty_message); View emptyMessage = findViewById(R.id.track_list_empty_message);
emptyMessage.setVisibility(View.VISIBLE); emptyMessage.setVisibility(View.VISIBLE);
View recordButton = findViewById(R.id.track_list_record_button); View recordButton = findViewById(R.id.track_list_record_button);
recordButton.setVisibility(View.VISIBLE); recordButton.setVisibility(View.VISIBLE);
} }
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
MyTracks/src/com/google/android/apps/mytracks/content/TrackDataHub.java
+10 -14
View File
@@ -60,8 +60,6 @@ public class TrackDataHub {
// Preference keys // Preference keys
private final String MIN_REQUIRED_ACCURACY_KEY; private final String MIN_REQUIRED_ACCURACY_KEY;
private final String METRIC_UNITS_KEY;
private final String SPEED_REPORTING_KEY;
// Overridable constants // Overridable constants
private final int targetNumPoints; private final int targetNumPoints;
@@ -171,7 +169,7 @@ public class TrackDataHub {
// Cached preference values // Cached preference values
private int minRequiredAccuracy; private int minRequiredAccuracy;
private boolean useMetricUnits; private boolean metricUnits;
private boolean reportSpeed; private boolean reportSpeed;
// Cached sensor readings // Cached sensor readings
@@ -222,8 +220,6 @@ public class TrackDataHub {
this.locationFactory = new DoubleBufferedLocationFactory(); this.locationFactory = new DoubleBufferedLocationFactory();
MIN_REQUIRED_ACCURACY_KEY = context.getString(R.string.min_required_accuracy_key); MIN_REQUIRED_ACCURACY_KEY = context.getString(R.string.min_required_accuracy_key);
METRIC_UNITS_KEY = context.getString(R.string.metric_units_key);
SPEED_REPORTING_KEY = context.getString(R.string.report_speed_key);
resetState(); resetState();
} }
@@ -299,8 +295,8 @@ public class TrackDataHub {
private void loadSharedPreferences() { private void loadSharedPreferences() {
selectedTrackId = PreferencesUtils.getSelectedTrackId(context); selectedTrackId = PreferencesUtils.getSelectedTrackId(context);
useMetricUnits = preferences.getBoolean(METRIC_UNITS_KEY, true); metricUnits = PreferencesUtils.isMetricUnits(context);
reportSpeed = preferences.getBoolean(SPEED_REPORTING_KEY, true); reportSpeed = PreferencesUtils.isReportSpeed(context);
minRequiredAccuracy = preferences.getInt(MIN_REQUIRED_ACCURACY_KEY, minRequiredAccuracy = preferences.getInt(MIN_REQUIRED_ACCURACY_KEY,
DEFAULT_MIN_REQUIRED_ACCURACY); DEFAULT_MIN_REQUIRED_ACCURACY);
} }
@@ -495,7 +491,7 @@ public class TrackDataHub {
Set<TrackDataListener> listenerSet = Collections.singleton(listener); Set<TrackDataListener> listenerSet = Collections.singleton(listener);
if (registration.isInterestedIn(ListenerDataType.DISPLAY_PREFERENCES)) { if (registration.isInterestedIn(ListenerDataType.DISPLAY_PREFERENCES)) {
reloadAll |= listener.onUnitsChanged(useMetricUnits); reloadAll |= listener.onUnitsChanged(metricUnits);
reloadAll |= listener.onReportSpeedChanged(reportSpeed); reloadAll |= listener.onReportSpeedChanged(reportSpeed);
} }
@@ -577,7 +573,7 @@ public class TrackDataHub {
// Ignore the return values here, we're already sending the full data set anyway // Ignore the return values here, we're already sending the full data set anyway
for (TrackDataListener listener : for (TrackDataListener listener :
getListenersFor(ListenerDataType.DISPLAY_PREFERENCES)) { getListenersFor(ListenerDataType.DISPLAY_PREFERENCES)) {
listener.onUnitsChanged(useMetricUnits); listener.onUnitsChanged(metricUnits);
listener.onReportSpeedChanged(reportSpeed); listener.onReportSpeedChanged(reportSpeed);
} }
@@ -616,11 +612,11 @@ public class TrackDataHub {
if (MIN_REQUIRED_ACCURACY_KEY.equals(key)) { if (MIN_REQUIRED_ACCURACY_KEY.equals(key)) {
minRequiredAccuracy = preferences.getInt(MIN_REQUIRED_ACCURACY_KEY, minRequiredAccuracy = preferences.getInt(MIN_REQUIRED_ACCURACY_KEY,
DEFAULT_MIN_REQUIRED_ACCURACY); DEFAULT_MIN_REQUIRED_ACCURACY);
} else if (METRIC_UNITS_KEY.equals(key)) { } else if (PreferencesUtils.getMetricUnitsKey(context).equals(key)) {
useMetricUnits = preferences.getBoolean(METRIC_UNITS_KEY, true); metricUnits = PreferencesUtils.isMetricUnits(context);
notifyUnitsChanged(); notifyUnitsChanged();
} else if (SPEED_REPORTING_KEY.equals(key)) { } else if (PreferencesUtils.getReportSpeedKey(context).equals(key)) {
reportSpeed = preferences.getBoolean(SPEED_REPORTING_KEY, true); reportSpeed = PreferencesUtils.isReportSpeed(context);
notifySpeedReportingChanged(); notifySpeedReportingChanged();
} else if (PreferencesUtils.getSelectedTrackIdKey(context).equals(key)) { } else if (PreferencesUtils.getSelectedTrackIdKey(context).equals(key)) {
loadTrack(PreferencesUtils.getSelectedTrackId(context)); loadTrack(PreferencesUtils.getSelectedTrackId(context));
@@ -659,7 +655,7 @@ public class TrackDataHub {
Set<TrackDataListener> displayListeners = getListenersFor(ListenerDataType.DISPLAY_PREFERENCES); Set<TrackDataListener> displayListeners = getListenersFor(ListenerDataType.DISPLAY_PREFERENCES);
for (TrackDataListener listener : displayListeners) { for (TrackDataListener listener : displayListeners) {
if (listener.onUnitsChanged(useMetricUnits)) { if (listener.onUnitsChanged(metricUnits)) {
synchronized (dataListeners) { synchronized (dataListeners) {
reloadDataForListener(listener); reloadDataForListener(listener);
} }
MyTracks/src/com/google/android/apps/mytracks/fragments/AboutDialogFragment.java
-1
View File
@@ -42,7 +42,6 @@ public class AboutDialogFragment extends DialogFragment {
TextView aboutVersion = (TextView) view.findViewById(R.id.about_version); TextView aboutVersion = (TextView) view.findViewById(R.id.about_version);
aboutVersion.setText(SystemUtils.getMyTracksVersion(getActivity())); aboutVersion.setText(SystemUtils.getMyTracksVersion(getActivity()));
return new AlertDialog.Builder(getActivity()) return new AlertDialog.Builder(getActivity())
.setCancelable(true)
.setNegativeButton(R.string.about_license, new DialogInterface.OnClickListener() { .setNegativeButton(R.string.about_license, new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
MyTracks/src/com/google/android/apps/mytracks/fragments/ChartSettingsDialogFragment.java
-1
View File
@@ -64,7 +64,6 @@ public class ChartSettingsDialogFragment extends DialogFragment {
? R.string.stats_speed : R.string.stats_pace); ? R.string.stats_speed : R.string.stats_pace);
return new AlertDialog.Builder(getActivity()) return new AlertDialog.Builder(getActivity())
.setCancelable(true)
.setNegativeButton(R.string.generic_cancel, null) .setNegativeButton(R.string.generic_cancel, null)
.setPositiveButton(R.string.generic_ok, new DialogInterface.OnClickListener() { .setPositiveButton(R.string.generic_ok, new DialogInterface.OnClickListener() {
@Override @Override
MyTracks/src/com/google/android/apps/mytracks/fragments/CheckUnitsDialogFragment.java
+27 -30
View File
@@ -16,20 +16,18 @@
package com.google.android.apps.mytracks.fragments; package com.google.android.apps.mytracks.fragments;
import com.google.android.apps.mytracks.Constants;
import com.google.android.apps.mytracks.TrackListActivity; import com.google.android.apps.mytracks.TrackListActivity;
import com.google.android.apps.mytracks.util.ApiAdapterFactory; import com.google.android.apps.mytracks.util.PreferencesUtils;
import com.google.android.apps.mytracks.util.CheckUnitsUtils;
import com.google.android.maps.mytracks.R; import com.google.android.maps.mytracks.R;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.Dialog; import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.SharedPreferences;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.DialogFragment; import android.support.v4.app.DialogFragment;
import java.util.Locale;
/** /**
* A DialogFragment to check preferred units. * A DialogFragment to check preferred units.
* *
@@ -38,41 +36,40 @@ import android.support.v4.app.DialogFragment;
public class CheckUnitsDialogFragment extends DialogFragment { public class CheckUnitsDialogFragment extends DialogFragment {
public static final String CHECK_UNITS_DIALOG_TAG = "checkUnitsDialog"; public static final String CHECK_UNITS_DIALOG_TAG = "checkUnitsDialog";
@Override @Override
public Dialog onCreateDialog(Bundle savedInstanceState) { public void onCancel(DialogInterface arg0) {
onDone();
}
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
Locale defaultLocale = Locale.getDefault();
boolean defaultMetric = !defaultLocale.equals(Locale.US) && !defaultLocale.equals(Locale.UK);
PreferencesUtils.setMetricUnits(getActivity(), defaultMetric);
final String metric = getString(R.string.preferred_units_metric);
final String imperial = getString(R.string.preferred_units_imperial);
final CharSequence[] items = defaultMetric ? new CharSequence[] { metric, imperial }
: new CharSequence[] { imperial, metric };
return new AlertDialog.Builder(getActivity()) return new AlertDialog.Builder(getActivity())
.setCancelable(true)
.setOnCancelListener(new DialogInterface.OnCancelListener() {
@Override
public void onCancel(DialogInterface dialog) {
handleButtonClicked();
}
})
.setPositiveButton(R.string.generic_ok, new DialogInterface.OnClickListener() { .setPositiveButton(R.string.generic_ok, new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
int position = ((AlertDialog) dialog).getListView().getSelectedItemPosition(); int position = ((AlertDialog) dialog).getListView().getCheckedItemPosition();
SharedPreferences sharedPreferences = getActivity() PreferencesUtils.setMetricUnits(getActivity(), items[position].equals(metric));
.getSharedPreferences(Constants.SETTINGS_NAME, Context.MODE_PRIVATE); onDone();
ApiAdapterFactory.getApiAdapter().applyPreferenceChanges(sharedPreferences.edit()
.putBoolean(getString(R.string.metric_units_key), position == 0));
handleButtonClicked();
} }
}) })
.setSingleChoiceItems(new CharSequence[] { getString(R.string.preferred_units_metric), .setSingleChoiceItems(items, 0, null)
getString(R.string.preferred_units_imperial) }, 0, null) .setTitle(R.string.preferred_units_title).create();
.setTitle(R.string.preferred_units_title)
.create();
} }
/** /**
* Handles a button click. * Tasks to perform when done.
*/ */
private void handleButtonClicked() { private void onDone() {
CheckUnitsUtils.setCheckUnitsValue(getActivity()); PreferencesUtils.setShowCheckUnitsDialog(getActivity());
TrackListActivity trackListActivity = (TrackListActivity) getActivity(); TrackListActivity trackListActivity = (TrackListActivity) getActivity();
trackListActivity.enableEmptyView(); trackListActivity.showStartupDialogs();
} }
} }
MyTracks/src/com/google/android/apps/mytracks/fragments/EulaDialogFragment.java
+18 -10
View File
@@ -16,6 +16,7 @@
package com.google.android.apps.mytracks.fragments; package com.google.android.apps.mytracks.fragments;
import com.google.android.apps.mytracks.TrackListActivity;
import com.google.android.apps.mytracks.util.EulaUtils; import com.google.android.apps.mytracks.util.EulaUtils;
import com.google.android.maps.mytracks.R; import com.google.android.maps.mytracks.R;
@@ -49,11 +50,17 @@ public class EulaDialogFragment extends DialogFragment {
return eulaDialogFragment; return eulaDialogFragment;
} }
@Override
public void onCancel(DialogInterface arg0) {
if (!getArguments().getBoolean(KEY_HAS_ACCEPTED)) {
exitApp();
}
}
@Override @Override
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
boolean hasAccepted = getArguments().getBoolean(KEY_HAS_ACCEPTED); boolean hasAccepted = getArguments().getBoolean(KEY_HAS_ACCEPTED);
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()) AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
.setCancelable(true)
.setMessage(EulaUtils.getEulaMessage(getActivity())) .setMessage(EulaUtils.getEulaMessage(getActivity()))
.setTitle(R.string.eula_title); .setTitle(R.string.eula_title);
@@ -63,24 +70,25 @@ public class EulaDialogFragment extends DialogFragment {
builder.setNegativeButton(R.string.eula_decline, new DialogInterface.OnClickListener() { builder.setNegativeButton(R.string.eula_decline, new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
getActivity().finish(); exitApp();
}
})
.setOnCancelListener(new DialogInterface.OnCancelListener() {
@Override
public void onCancel(DialogInterface dialog) {
getActivity().finish();
} }
}) })
.setPositiveButton(R.string.eula_accept, new DialogInterface.OnClickListener() { .setPositiveButton(R.string.eula_accept, new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
EulaUtils.setEulaValue(getActivity()); EulaUtils.setEulaValue(getActivity());
new WelcomeDialogFragment().show( TrackListActivity trackListActivity = (TrackListActivity) getActivity();
getActivity().getSupportFragmentManager(), WelcomeDialogFragment.WELCOME_DIALOG_TAG); trackListActivity.showStartupDialogs();
} }
}); });
} }
return builder.create(); return builder.create();
} }
/**
* Exits the application.
*/
private void exitApp() {
getActivity().finish();
}
} }
MyTracks/src/com/google/android/apps/mytracks/fragments/InstallEarthDialogFragment.java
-1
View File
@@ -39,7 +39,6 @@ public class InstallEarthDialogFragment extends DialogFragment {
@Override @Override
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
return new AlertDialog.Builder(getActivity()) return new AlertDialog.Builder(getActivity())
.setCancelable(true)
.setMessage(R.string.track_detail_install_earth_message) .setMessage(R.string.track_detail_install_earth_message)
.setNegativeButton(android.R.string.cancel, null) .setNegativeButton(android.R.string.cancel, null)
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
MyTracks/src/com/google/android/apps/mytracks/fragments/StatsFragment.java
+2 -7
View File
@@ -16,7 +16,6 @@
package com.google.android.apps.mytracks.fragments; package com.google.android.apps.mytracks.fragments;
import com.google.android.apps.mytracks.Constants;
import com.google.android.apps.mytracks.MyTracksApplication; import com.google.android.apps.mytracks.MyTracksApplication;
import com.google.android.apps.mytracks.content.Track; import com.google.android.apps.mytracks.content.Track;
import com.google.android.apps.mytracks.content.TrackDataHub; import com.google.android.apps.mytracks.content.TrackDataHub;
@@ -28,8 +27,6 @@ import com.google.android.apps.mytracks.util.PreferencesUtils;
import com.google.android.apps.mytracks.util.StatsUtils; import com.google.android.apps.mytracks.util.StatsUtils;
import com.google.android.maps.mytracks.R; import com.google.android.maps.mytracks.R;
import android.content.Context;
import android.content.SharedPreferences;
import android.location.Location; import android.location.Location;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
@@ -101,10 +98,8 @@ public class StatsFragment extends Fragment implements TrackDataListener {
@Override @Override
public void onActivityCreated(Bundle savedInstanceState) { public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState); super.onActivityCreated(savedInstanceState);
SharedPreferences preferences = getActivity().getSharedPreferences( metricUnits = PreferencesUtils.isMetricUnits(getActivity());
Constants.SETTINGS_NAME, Context.MODE_PRIVATE); reportSpeed = PreferencesUtils.isReportSpeed(getActivity());
metricUnits = preferences.getBoolean(getString(R.string.metric_units_key), true);
reportSpeed = preferences.getBoolean(getString(R.string.report_speed_key), true);
updateUi(); updateUi();
} }
MyTracks/src/com/google/android/apps/mytracks/fragments/WelcomeDialogFragment.java
+13 -14
View File
@@ -16,6 +16,8 @@
package com.google.android.apps.mytracks.fragments; package com.google.android.apps.mytracks.fragments;
import com.google.android.apps.mytracks.TrackListActivity;
import com.google.android.apps.mytracks.util.PreferencesUtils;
import com.google.android.maps.mytracks.R; import com.google.android.maps.mytracks.R;
import android.app.AlertDialog; import android.app.AlertDialog;
@@ -23,7 +25,6 @@ import android.app.Dialog;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.DialogFragment; import android.support.v4.app.DialogFragment;
import android.view.View;
/** /**
* A DialogFrament to show the welcome info. * A DialogFrament to show the welcome info.
@@ -34,30 +35,28 @@ public class WelcomeDialogFragment extends DialogFragment {
public static final String WELCOME_DIALOG_TAG = "welcomeDialog"; public static final String WELCOME_DIALOG_TAG = "welcomeDialog";
@Override
public void onCancel(DialogInterface arg0) {
onDone();
}
@Override @Override
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
View view = getActivity().getLayoutInflater().inflate(R.layout.welcome, null);
return new AlertDialog.Builder(getActivity()) return new AlertDialog.Builder(getActivity())
.setCancelable(true)
.setOnCancelListener(new DialogInterface.OnCancelListener() {
@Override
public void onCancel(DialogInterface dialog) {
checkUnits();
}
})
.setPositiveButton(R.string.generic_ok, new DialogInterface.OnClickListener() { .setPositiveButton(R.string.generic_ok, new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
checkUnits(); onDone();
} }
}) })
.setTitle(R.string.welcome_title) .setTitle(R.string.welcome_title)
.setView(view) .setMessage(R.string.welcome_message)
.create(); .create();
} }
private void checkUnits() { private void onDone() {
new CheckUnitsDialogFragment().show( PreferencesUtils.setShowWelcome(getActivity());
getActivity().getSupportFragmentManager(), CheckUnitsDialogFragment.CHECK_UNITS_DIALOG_TAG); TrackListActivity trackListActivity = (TrackListActivity) getActivity();
trackListActivity.showStartupDialogs();
} }
} }
MyTracks/src/com/google/android/apps/mytracks/io/docs/SendDocsUtils.java
+2 -5
View File
@@ -21,6 +21,7 @@ import com.google.android.apps.mytracks.io.gdata.docs.DocumentsClient;
import com.google.android.apps.mytracks.io.gdata.docs.SpreadsheetsClient; import com.google.android.apps.mytracks.io.gdata.docs.SpreadsheetsClient;
import com.google.android.apps.mytracks.io.gdata.docs.SpreadsheetsClient.WorksheetEntry; import com.google.android.apps.mytracks.io.gdata.docs.SpreadsheetsClient.WorksheetEntry;
import com.google.android.apps.mytracks.stats.TripStatistics; import com.google.android.apps.mytracks.stats.TripStatistics;
import com.google.android.apps.mytracks.util.PreferencesUtils;
import com.google.android.apps.mytracks.util.ResourceUtils; import com.google.android.apps.mytracks.util.ResourceUtils;
import com.google.android.apps.mytracks.util.StringUtils; import com.google.android.apps.mytracks.util.StringUtils;
import com.google.android.apps.mytracks.util.UnitConversions; import com.google.android.apps.mytracks.util.UnitConversions;
@@ -33,7 +34,6 @@ import com.google.wireless.gdata.parser.ParseException;
import com.google.wireless.gdata2.client.AuthenticationException; import com.google.wireless.gdata2.client.AuthenticationException;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences;
import android.util.Log; import android.util.Log;
import java.io.BufferedReader; import java.io.BufferedReader;
@@ -270,10 +270,7 @@ public class SendDocsUtils {
Track track, String spreadsheetId, String worksheetId, String authToken, Context context) Track track, String spreadsheetId, String worksheetId, String authToken, Context context)
throws IOException { throws IOException {
String worksheetUri = String.format(GET_WORKSHEET_URI, spreadsheetId, worksheetId); String worksheetUri = String.format(GET_WORKSHEET_URI, spreadsheetId, worksheetId);
SharedPreferences prefs = context.getSharedPreferences( boolean metricUnits = PreferencesUtils.isMetricUnits(context);
Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
boolean metricUnits = prefs.getBoolean(context.getString(R.string.metric_units_key), true);
addRow(worksheetUri, getRowContent(track, metricUnits, context), authToken); addRow(worksheetUri, getRowContent(track, metricUnits, context), authToken);
} }
MyTracks/src/com/google/android/apps/mytracks/io/fusiontables/SendFusionTablesAsyncTask.java
+2 -4
View File
@@ -14,6 +14,7 @@ import com.google.android.apps.mytracks.stats.DoubleBuffer;
import com.google.android.apps.mytracks.stats.TripStatisticsBuilder; import com.google.android.apps.mytracks.stats.TripStatisticsBuilder;
import com.google.android.apps.mytracks.util.ApiAdapterFactory; import com.google.android.apps.mytracks.util.ApiAdapterFactory;
import com.google.android.apps.mytracks.util.LocationUtils; import com.google.android.apps.mytracks.util.LocationUtils;
import com.google.android.apps.mytracks.util.PreferencesUtils;
import com.google.android.apps.mytracks.util.SystemUtils; import com.google.android.apps.mytracks.util.SystemUtils;
import com.google.android.apps.mytracks.util.UnitConversions; import com.google.android.apps.mytracks.util.UnitConversions;
import com.google.android.maps.mytracks.R; import com.google.android.maps.mytracks.R;
@@ -32,7 +33,6 @@ import android.accounts.AccountManager;
import android.accounts.AuthenticatorException; import android.accounts.AuthenticatorException;
import android.accounts.OperationCanceledException; import android.accounts.OperationCanceledException;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences;
import android.database.Cursor; import android.database.Cursor;
import android.location.Location; import android.location.Location;
import android.util.Log; import android.util.Log;
@@ -205,9 +205,7 @@ public class SendFusionTablesAsyncTask extends AbstractSendAsyncTask {
private boolean uploadAllTrackPoints(Track track) { private boolean uploadAllTrackPoints(Track track) {
Cursor locationsCursor = null; Cursor locationsCursor = null;
try { try {
SharedPreferences prefs = context.getSharedPreferences( boolean metricUnits = PreferencesUtils.isMetricUnits(context);
Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
boolean metricUnits = prefs.getBoolean(context.getString(R.string.metric_units_key), true);
locationsCursor = myTracksProviderUtils.getLocationsCursor(trackId, 0, -1, false); locationsCursor = myTracksProviderUtils.getLocationsCursor(trackId, 0, -1, false);
if (locationsCursor == null) { if (locationsCursor == null) {
MyTracks/src/com/google/android/apps/mytracks/io/maps/SendMapsAsyncTask.java
+2 -3
View File
@@ -31,6 +31,7 @@ import com.google.android.apps.mytracks.io.sendtogoogle.SendToGoogleUtils;
import com.google.android.apps.mytracks.stats.DoubleBuffer; import com.google.android.apps.mytracks.stats.DoubleBuffer;
import com.google.android.apps.mytracks.stats.TripStatisticsBuilder; import com.google.android.apps.mytracks.stats.TripStatisticsBuilder;
import com.google.android.apps.mytracks.util.LocationUtils; import com.google.android.apps.mytracks.util.LocationUtils;
import com.google.android.apps.mytracks.util.PreferencesUtils;
import com.google.android.apps.mytracks.util.UnitConversions; import com.google.android.apps.mytracks.util.UnitConversions;
import com.google.android.common.gdata.AndroidXmlParserFactory; import com.google.android.common.gdata.AndroidXmlParserFactory;
import com.google.android.maps.mytracks.R; import com.google.android.maps.mytracks.R;
@@ -257,9 +258,7 @@ public class SendMapsAsyncTask extends AbstractSendAsyncTask {
boolean uploadAllTrackPoints(Track track) { boolean uploadAllTrackPoints(Track track) {
Cursor locationsCursor = null; Cursor locationsCursor = null;
try { try {
SharedPreferences prefs = context.getSharedPreferences( boolean metricUnits = PreferencesUtils.isMetricUnits(context);
Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
boolean metricUnits = prefs.getBoolean(context.getString(R.string.metric_units_key), true);
locationsCursor = myTracksProviderUtils.getLocationsCursor(trackId, 0, -1, false); locationsCursor = myTracksProviderUtils.getLocationsCursor(trackId, 0, -1, false);
if (locationsCursor == null) { if (locationsCursor == null) {
MyTracks/src/com/google/android/apps/mytracks/services/PreferenceManager.java
+2 -6
View File
@@ -38,7 +38,6 @@ public class PreferenceManager implements OnSharedPreferenceChangeListener {
private final String autoResumeTrackCurrentRetryKey; private final String autoResumeTrackCurrentRetryKey;
private final String autoResumeTrackTimeoutKey; private final String autoResumeTrackTimeoutKey;
private final String maxRecordingDistanceKey; private final String maxRecordingDistanceKey;
private final String metricUnitsKey;
private final String minRecordingDistanceKey; private final String minRecordingDistanceKey;
private final String minRecordingIntervalKey; private final String minRecordingIntervalKey;
private final String minRequiredAccuracyKey; private final String minRequiredAccuracyKey;
@@ -63,8 +62,6 @@ public class PreferenceManager implements OnSharedPreferenceChangeListener {
service.getString(R.string.auto_resume_track_timeout_key); service.getString(R.string.auto_resume_track_timeout_key);
maxRecordingDistanceKey = maxRecordingDistanceKey =
service.getString(R.string.max_recording_distance_key); service.getString(R.string.max_recording_distance_key);
metricUnitsKey =
service.getString(R.string.metric_units_key);
minRecordingDistanceKey = minRecordingDistanceKey =
service.getString(R.string.min_recording_distance_key); service.getString(R.string.min_recording_distance_key);
minRecordingIntervalKey = minRecordingIntervalKey =
@@ -160,9 +157,8 @@ public class PreferenceManager implements OnSharedPreferenceChangeListener {
service.setSplitFrequency( service.setSplitFrequency(
sharedPreferences.getInt(splitFrequencyKey, 0)); sharedPreferences.getInt(splitFrequencyKey, 0));
} }
if (key == null || key.equals(metricUnitsKey)) { if (key == null || key.equals(PreferencesUtils.getMetricUnitsKey(service))) {
service.setMetricUnits( service.setMetricUnits(PreferencesUtils.isMetricUnits(service));
sharedPreferences.getBoolean(metricUnitsKey, true));
} }
} }
MyTracks/src/com/google/android/apps/mytracks/services/tasks/StatusAnnouncerTask.java
+3 -10
View File
@@ -21,13 +21,13 @@ import static com.google.android.apps.mytracks.Constants.TAG;
import com.google.android.apps.mytracks.Constants; import com.google.android.apps.mytracks.Constants;
import com.google.android.apps.mytracks.services.TrackRecordingService; import com.google.android.apps.mytracks.services.TrackRecordingService;
import com.google.android.apps.mytracks.stats.TripStatistics; import com.google.android.apps.mytracks.stats.TripStatistics;
import com.google.android.apps.mytracks.util.PreferencesUtils;
import com.google.android.apps.mytracks.util.StringUtils; import com.google.android.apps.mytracks.util.StringUtils;
import com.google.android.apps.mytracks.util.UnitConversions; import com.google.android.apps.mytracks.util.UnitConversions;
import com.google.android.maps.mytracks.R; import com.google.android.maps.mytracks.R;
import com.google.common.annotations.VisibleForTesting; import com.google.common.annotations.VisibleForTesting;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences;
import android.speech.tts.TextToSpeech; import android.speech.tts.TextToSpeech;
import android.speech.tts.TextToSpeech.OnInitListener; import android.speech.tts.TextToSpeech.OnInitListener;
import android.telephony.PhoneStateListener; import android.telephony.PhoneStateListener;
@@ -150,15 +150,8 @@ public class StatusAnnouncerTask implements PeriodicTask {
*/ */
// @VisibleForTesting // @VisibleForTesting
protected String getAnnouncement(TripStatistics stats) { protected String getAnnouncement(TripStatistics stats) {
boolean metricUnits = true; boolean metricUnits = PreferencesUtils.isMetricUnits(context);
boolean reportSpeed = true; boolean reportSpeed = PreferencesUtils.isReportSpeed(context);
SharedPreferences preferences = context.getSharedPreferences(
Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
if (preferences != null) {
metricUnits = preferences.getBoolean(context.getString(R.string.metric_units_key), true);
reportSpeed = preferences.getBoolean(context.getString(R.string.report_speed_key), true);
}
double d = stats.getTotalDistance() * UnitConversions.M_TO_KM; double d = stats.getTotalDistance() * UnitConversions.M_TO_KM;
double s = stats.getAverageMovingSpeed() * UnitConversions.MS_TO_KMH; double s = stats.getAverageMovingSpeed() * UnitConversions.MS_TO_KMH;
MyTracks/src/com/google/android/apps/mytracks/util/ChartURLGenerator.java
+5 -14
View File
@@ -16,13 +16,11 @@
package com.google.android.apps.mytracks.util; package com.google.android.apps.mytracks.util;
import com.google.android.apps.mytracks.Constants;
import com.google.android.apps.mytracks.content.Track; import com.google.android.apps.mytracks.content.Track;
import com.google.android.apps.mytracks.stats.TripStatistics; import com.google.android.apps.mytracks.stats.TripStatistics;
import com.google.android.maps.mytracks.R; import com.google.android.maps.mytracks.R;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences;
import java.util.Vector; import java.util.Vector;
@@ -47,18 +45,11 @@ public class ChartURLGenerator {
* @param track The track for this chart * @param track The track for this chart
* @param context The current appplication context * @param context The current appplication context
*/ */
public static String getChartUrl(Vector<Double> distances, public static String getChartUrl(
Vector<Double> elevations, Track track, Context context) { Vector<Double> distances, Vector<Double> elevations, Track track, Context context) {
SharedPreferences preferences = context.getSharedPreferences( boolean metricUnits = PreferencesUtils.isMetricUnits(context);
Constants.SETTINGS_NAME, Context.MODE_PRIVATE); return getChartUrl(
boolean metricUnits = true; distances, elevations, track, context.getString(R.string.stats_elevation), metricUnits);
if (preferences != null) {
metricUnits = preferences.getBoolean(
context.getString(R.string.metric_units_key), true);
}
return getChartUrl(distances, elevations, track,
context.getString(R.string.stats_elevation), metricUnits);
} }
/** /**
MyTracks/src/com/google/android/apps/mytracks/util/CheckUnitsUtils.java
-47
View File
@@ -1,47 +0,0 @@
/*
* Copyright 2012 Google Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/
package com.google.android.apps.mytracks.util;
import android.content.Context;
import android.content.SharedPreferences;
import android.content.SharedPreferences.Editor;
/**
* Utilities for checking units.
*
* @author Jimmy Shih
*/
public class CheckUnitsUtils {
private static final String CHECK_UNITS_PREFERENCE_FILE = "checkunits";
private static final String CHECK_UNITS_PREFERENCE_KEY = "checkunits.checked";
private CheckUnitsUtils() {}
public static boolean getCheckUnitsValue(Context context) {
SharedPreferences sharedPreferences = context.getSharedPreferences(
CHECK_UNITS_PREFERENCE_FILE, Context.MODE_PRIVATE);
return sharedPreferences.getBoolean(CHECK_UNITS_PREFERENCE_KEY, false);
}
public static void setCheckUnitsValue(Context context) {
SharedPreferences sharedPreferences = context.getSharedPreferences(
CHECK_UNITS_PREFERENCE_FILE, Context.MODE_PRIVATE);
Editor editor = sharedPreferences.edit().putBoolean(CHECK_UNITS_PREFERENCE_KEY, true);
ApiAdapterFactory.getApiAdapter().applyPreferenceChanges(editor);
}
}
MyTracks/src/com/google/android/apps/mytracks/util/PreferencesUtils.java
+120
View File
@@ -32,6 +32,34 @@ public class PreferencesUtils {
private PreferencesUtils() {} private PreferencesUtils() {}
/**
* Gets the metric units key.
*
* @param context the context
*/
public static String getMetricUnitsKey(Context context) {
return getKey(context, R.string.metric_units_key);
}
/**
* Returns the metric units value.
*
* @param context the context
*/
public static boolean isMetricUnits(Context context) {
return getBoolean(context, R.string.metric_units_key, true);
}
/**
* Sets the metric units value.
*
* @param context the context
* @param value the value
*/
public static void setMetricUnits(Context context, boolean value) {
setBoolean(context, R.string.metric_units_key, value);
}
/** /**
* Gets the recording track id key. * Gets the recording track id key.
* *
@@ -60,6 +88,34 @@ public class PreferencesUtils {
setLong(context, R.string.recording_track_id_key, trackId); setLong(context, R.string.recording_track_id_key, trackId);
} }
/**
* Gets the report speed key.
*
* @param context the context
*/
public static String getReportSpeedKey(Context context) {
return getKey(context, R.string.report_speed_key);
}
/**
* Returns the report speed value.
*
* @param context the context
*/
public static boolean isReportSpeed(Context context) {
return getBoolean(context, R.string.report_speed_key, true);
}
/**
* Sets the report speed value.
*
* @param context the context
* @param value the value
*/
public static void setReportSpeed(Context context, boolean value) {
setBoolean(context, R.string.report_speed_key, value);
}
/** /**
* Gets the selected track id key. * Gets the selected track id key.
* *
@@ -88,6 +144,42 @@ public class PreferencesUtils {
setLong(context, R.string.selected_track_id_key, trackId); setLong(context, R.string.selected_track_id_key, trackId);
} }
/**
* Returns the show check units dialog value.
*
* @param context the context
*/
public static boolean isShowCheckUnitsDialog(Context context) {
return getBoolean(context, R.string.show_check_units_dialog_key, true);
}
/**
* Sets the show check units dialog value to false.
*
* @param context the context
*/
public static void setShowCheckUnitsDialog(Context context) {
setBoolean(context, R.string.show_check_units_dialog_key, false);
}
/**
* Returns the show welcomes dialog value.
*
* @param context the context
*/
public static boolean isShowWelcomeDialog(Context context) {
return getBoolean(context, R.string.show_welcome_dialog_key, true);
}
/**
* Sets the show welcome dialog value to false.
*
* @param context the context
*/
public static void setShowWelcome(Context context) {
setBoolean(context, R.string.show_welcome_dialog_key, false);
}
/** /**
* Gets a preference key * Gets a preference key
* *
@@ -98,6 +190,34 @@ public class PreferencesUtils {
return context.getString(keyId); return context.getString(keyId);
} }
/**
* Gets a boolean preference value.
*
* @param context the context
* @param keyId the key id
* @param defaultValue the default value
*/
private static boolean getBoolean(Context context, int keyId, boolean defaultValue) {
SharedPreferences sharedPreferences = context.getSharedPreferences(
Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
return sharedPreferences.getBoolean(getKey(context, keyId), defaultValue);
}
/**
* Sets a boolean preference value.
*
* @param context the context
* @param keyId the key id
* @param value the value
*/
private static void setBoolean(Context context, int keyId, boolean value) {
SharedPreferences sharedPreferences = context.getSharedPreferences(
Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
Editor editor = sharedPreferences.edit();
editor.putBoolean(getKey(context, keyId), value);
ApiAdapterFactory.getApiAdapter().applyPreferenceChanges(editor);
}
/** /**
* Gets a long preference value. * Gets a long preference value.
* *
MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java
+7 -9
View File
@@ -71,7 +71,7 @@ public class TrackWidgetProvider
private Context context; private Context context;
private String unknown; private String unknown;
private TrackObserver trackObserver; private TrackObserver trackObserver;
private boolean isMetric; private boolean metricUnits;
private boolean reportSpeed; private boolean reportSpeed;
private long selectedTrackId; private long selectedTrackId;
private SharedPreferences sharedPreferences; private SharedPreferences sharedPreferences;
@@ -218,10 +218,10 @@ public class TrackWidgetProvider
} }
TripStatistics stats = track.getStatistics(); TripStatistics stats = track.getStatistics();
String distance = StringUtils.formatDistance(context, stats.getTotalDistance(), isMetric); String distance = StringUtils.formatDistance(context, stats.getTotalDistance(), metricUnits);
String time = StringUtils.formatElapsedTime(stats.getMovingTime()); String time = StringUtils.formatElapsedTime(stats.getMovingTime());
String speed = StringUtils.formatSpeed( String speed = StringUtils.formatSpeed(
context, stats.getAverageMovingSpeed(), isMetric, reportSpeed); context, stats.getAverageMovingSpeed(), metricUnits, reportSpeed);
views.setTextViewText(R.id.appwidget_distance_text, distance); views.setTextViewText(R.id.appwidget_distance_text, distance);
views.setTextViewText(R.id.appwidget_time_text, time); views.setTextViewText(R.id.appwidget_time_text, time);
@@ -230,14 +230,12 @@ public class TrackWidgetProvider
@Override @Override
public void onSharedPreferenceChanged(SharedPreferences prefs, String key) { public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
String metricUnitsKey = context.getString(R.string.metric_units_key); if (key == null || key.equals(PreferencesUtils.getMetricUnitsKey(context))) {
if (key == null || key.equals(metricUnitsKey)) { metricUnits = PreferencesUtils.isMetricUnits(context);
isMetric = prefs.getBoolean(metricUnitsKey, true);
} }
String reportSpeedKey = context.getString(R.string.report_speed_key); if (key == null || key.equals(PreferencesUtils.getReportSpeedKey(context))) {
if (key == null || key.equals(reportSpeedKey)) { reportSpeed = PreferencesUtils.isReportSpeed(context);
reportSpeed = prefs.getBoolean(reportSpeedKey, true);
} }
if (key == null || key.equals(PreferencesUtils.getSelectedTrackIdKey(context))) { if (key == null || key.equals(PreferencesUtils.getSelectedTrackIdKey(context))) {
MyTracksTest/src/com/google/android/apps/mytracks/content/TrackDataHubTest.java
+6 -7
View File
@@ -30,7 +30,6 @@ import com.google.android.apps.mytracks.content.TrackDataHub.ListenerDataType;
import com.google.android.apps.mytracks.content.TrackDataListener.ProviderState; import com.google.android.apps.mytracks.content.TrackDataListener.ProviderState;
import com.google.android.apps.mytracks.services.TrackRecordingServiceTest.MockContext; import com.google.android.apps.mytracks.services.TrackRecordingServiceTest.MockContext;
import com.google.android.apps.mytracks.util.PreferencesUtils; import com.google.android.apps.mytracks.util.PreferencesUtils;
import com.google.android.maps.mytracks.R;
import com.google.android.testing.mocking.AndroidMock; import com.google.android.testing.mocking.AndroidMock;
import android.content.Context; import android.content.Context;
@@ -798,12 +797,12 @@ public class TrackDataHubTest extends AndroidTestCase {
} }
public void testDisplayPreferencesListen() throws Exception { public void testDisplayPreferencesListen() throws Exception {
String metricUnitsKey = context.getString(R.string.metric_units_key); String metricUnitsKey = PreferencesUtils.getMetricUnitsKey(context);
String speedKey = context.getString(R.string.report_speed_key); String reportSpeedKey = PreferencesUtils.getReportSpeedKey(context);
prefs.edit() prefs.edit()
.putBoolean(metricUnitsKey, true) .putBoolean(metricUnitsKey, true)
.putBoolean(speedKey, true) .putBoolean(reportSpeedKey, true)
.apply(); .apply();
Capture<OnSharedPreferenceChangeListener> listenerCapture = Capture<OnSharedPreferenceChangeListener> listenerCapture =
@@ -829,10 +828,10 @@ public class TrackDataHubTest extends AndroidTestCase {
replay(); replay();
prefs.edit() prefs.edit()
.putBoolean(speedKey, false) .putBoolean(reportSpeedKey, false)
.apply(); .apply();
OnSharedPreferenceChangeListener listener = listenerCapture.getValue(); OnSharedPreferenceChangeListener listener = listenerCapture.getValue();
listener.onSharedPreferenceChanged(prefs, speedKey); listener.onSharedPreferenceChanged(prefs, reportSpeedKey);
AndroidMock.verify(dataSources, providerUtils, listener1, listener2); AndroidMock.verify(dataSources, providerUtils, listener1, listener2);
AndroidMock.reset(dataSources, providerUtils, listener1, listener2); AndroidMock.reset(dataSources, providerUtils, listener1, listener2);