diff --git a/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java b/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java
index 68386fb58..1be4ac22e 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java
@@ -187,53 +187,49 @@ public class ChartActivity extends Activity implements TrackDataListener {
@Override
protected Dialog onCreateDialog(int id) {
- switch (id) {
- case DIALOG_CHART_SETTINGS_ID:
- View view = getLayoutInflater().inflate(R.layout.chart_settings, null);
- final RadioGroup radioGroup = (RadioGroup) view.findViewById(R.id.chart_settings_x);
- radioGroup.check(chartView.getMode() == Mode.BY_DISTANCE
- ? R.id.chart_settings_by_distance : R.id.chart_settings_by_time);
-
- final CheckBox[] checkBoxes = new CheckBox[ChartView.NUM_SERIES];
- checkBoxes[ChartView.ELEVATION_SERIES] = (CheckBox) view.findViewById(
- R.id.chart_settings_elevation);
- checkBoxes[ChartView.SPEED_SERIES] = (CheckBox) view.findViewById(
- R.id.chart_settings_speed);
- checkBoxes[ChartView.POWER_SERIES] = (CheckBox) view.findViewById(
- R.id.chart_settings_power);
- checkBoxes[ChartView.CADENCE_SERIES] = (CheckBox) view.findViewById(
- R.id.chart_settings_cadence);
- checkBoxes[ChartView.HEART_RATE_SERIES] = (CheckBox) view.findViewById(
- R.id.chart_settings_heart_rate);
-
- // set checkboxes values
- for (int i = 0; i < ChartView.NUM_SERIES; i++) {
- checkBoxes[i].setChecked(chartView.isChartValueSeriesEnabled(i));
- }
- checkBoxes[ChartView.SPEED_SERIES]
- .setText(reportSpeed ? R.string.stat_speed : R.string.stat_pace);
-
- return new AlertDialog.Builder(this)
- .setCancelable(true)
- .setNegativeButton(R.string.generic_cancel, null)
- .setPositiveButton(R.string.generic_ok, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- setMode(radioGroup.getCheckedRadioButtonId() == R.id.chart_settings_by_distance
- ? Mode.BY_DISTANCE
- : Mode.BY_TIME);
- for (int i = 0; i < ChartView.NUM_SERIES; i++) {
- chartView.setChartValueSeriesEnabled(i, checkBoxes[i].isChecked());
- }
- chartView.postInvalidate();
- }
- })
- .setTitle(R.string.menu_chart_view_chart_settings)
- .setView(view)
- .create();
- default:
- return null;
+ if (id != DIALOG_CHART_SETTINGS_ID) {
+ return null;
}
+ View view = getLayoutInflater().inflate(R.layout.chart_settings, null);
+ final RadioGroup radioGroup = (RadioGroup) view.findViewById(R.id.chart_settings_x);
+ radioGroup.check(chartView.getMode() == Mode.BY_DISTANCE
+ ? R.id.chart_settings_by_distance : R.id.chart_settings_by_time);
+
+ final CheckBox[] checkBoxes = new CheckBox[ChartView.NUM_SERIES];
+ checkBoxes[ChartView.ELEVATION_SERIES] = (CheckBox) view.findViewById(
+ R.id.chart_settings_elevation);
+ checkBoxes[ChartView.SPEED_SERIES] = (CheckBox) view.findViewById(R.id.chart_settings_speed);
+ checkBoxes[ChartView.POWER_SERIES] = (CheckBox) view.findViewById(R.id.chart_settings_power);
+ checkBoxes[ChartView.CADENCE_SERIES] = (CheckBox) view.findViewById(
+ R.id.chart_settings_cadence);
+ checkBoxes[ChartView.HEART_RATE_SERIES] = (CheckBox) view.findViewById(
+ R.id.chart_settings_heart_rate);
+
+ // set checkboxes values
+ for (int i = 0; i < ChartView.NUM_SERIES; i++) {
+ checkBoxes[i].setChecked(chartView.isChartValueSeriesEnabled(i));
+ }
+ checkBoxes[ChartView.SPEED_SERIES].setText(reportSpeed
+ ? R.string.stat_speed : R.string.stat_pace);
+
+ return new AlertDialog.Builder(this)
+ .setCancelable(true)
+ .setNegativeButton(R.string.generic_cancel, null)
+ .setPositiveButton(R.string.generic_ok, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ setMode(radioGroup.getCheckedRadioButtonId() == R.id.chart_settings_by_distance
+ ? Mode.BY_DISTANCE
+ : Mode.BY_TIME);
+ for (int i = 0; i < ChartView.NUM_SERIES; i++) {
+ chartView.setChartValueSeriesEnabled(i, checkBoxes[i].isChecked());
+ }
+ chartView.postInvalidate();
+ }
+ })
+ .setTitle(R.string.menu_chart_view_chart_settings)
+ .setView(view)
+ .create();
}
/**
diff --git a/MyTracks/src/com/google/android/apps/mytracks/ExportActivity.java b/MyTracks/src/com/google/android/apps/mytracks/ExportActivity.java
index 6a76e85d1..ba58d4cb4 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/ExportActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/ExportActivity.java
@@ -66,20 +66,18 @@ public class ExportActivity extends Activity {
@Override
protected Dialog onCreateDialog(int id) {
- switch (id) {
- case DIALOG_PROGRESS_ID:
- progressDialog = DialogUtils.createHorizontalProgressDialog(this,
- getString(R.string.export_progress_message), new DialogInterface.OnCancelListener() {
- @Override
- public void onCancel(DialogInterface dialog) {
- exportAsyncTask.cancel(true);
- finish();
- }
- });
- return progressDialog;
- default:
- return null;
+ if (id != DIALOG_PROGRESS_ID) {
+ return null;
}
+ progressDialog = DialogUtils.createHorizontalProgressDialog(
+ this, R.string.export_progress_message, new DialogInterface.OnCancelListener() {
+ @Override
+ public void onCancel(DialogInterface dialog) {
+ exportAsyncTask.cancel(true);
+ finish();
+ }
+ });
+ return progressDialog;
}
/**
diff --git a/MyTracks/src/com/google/android/apps/mytracks/ImportActivity.java b/MyTracks/src/com/google/android/apps/mytracks/ImportActivity.java
index 7ed3709a7..9a2caadca 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/ImportActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/ImportActivity.java
@@ -111,8 +111,8 @@ public class ImportActivity extends Activity {
protected Dialog onCreateDialog(int id) {
switch (id) {
case DIALOG_PROGRESS_ID:
- progressDialog = DialogUtils.createHorizontalProgressDialog(this,
- getString(R.string.import_progress_message), new DialogInterface.OnCancelListener() {
+ progressDialog = DialogUtils.createHorizontalProgressDialog(
+ this, R.string.import_progress_message, new DialogInterface.OnCancelListener() {
@Override
public void onCancel(DialogInterface dialog) {
importAsyncTask.cancel(true);
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java b/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java
index 115e015ef..7214687d0 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java
@@ -250,7 +250,7 @@ public class MapActivity extends com.google.android.maps.MapActivity
return PlayTrackUtils.createInstallEarthDialog(this);
case DIALOG_DELETE_CURRENT_ID:
return DialogUtils.createConfirmationDialog(this,
- getString(R.string.track_list_delete_track_confirm_message),
+ R.string.track_list_delete_track_confirm_message,
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java b/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java
index 17d41c844..06c0cacf1 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java
@@ -30,7 +30,6 @@ import com.google.android.maps.mytracks.R;
import android.app.Dialog;
import android.bluetooth.BluetoothAdapter;
import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.SharedPreferences.Editor;
@@ -178,7 +177,7 @@ public class SettingsActivity extends PreferenceActivity {
switch (id) {
case DIALOG_CONFIRM_RESET_ID:
return DialogUtils.createConfirmationDialog(
- this, getString(R.string.settings_reset_confirm_message), new OnClickListener() {
+ this, R.string.settings_reset_confirm_message, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int button) {
onResetPreferencesConfirmed();
@@ -186,8 +185,8 @@ public class SettingsActivity extends PreferenceActivity {
});
case DIALOG_CONFIRM_ACCESS_ID:
return DialogUtils.createConfirmationDialog(this,
- getString(R.string.settings_sharing_allow_access_confirm_message),
- new OnClickListener() {
+ R.string.settings_sharing_allow_access_confirm_message,
+ new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int button) {
CheckBoxPreference pref = (CheckBoxPreference) findPreference(
@@ -196,8 +195,9 @@ public class SettingsActivity extends PreferenceActivity {
}
});
case DIALOG_CONFIRM_RESTORE_ID:
- return DialogUtils.createConfirmationDialog(
- this, getString(R.string.settings_backup_restore_confirm_message), new OnClickListener() {
+ return DialogUtils.createConfirmationDialog(this,
+ R.string.settings_backup_restore_confirm_message,
+ new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
startActivity(new Intent(SettingsActivity.this, RestoreChooserActivity.class));
diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackList.java b/MyTracks/src/com/google/android/apps/mytracks/TrackList.java
index 14971c751..49fccb164 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackList.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackList.java
@@ -354,8 +354,7 @@ public class TrackList extends ListActivity
.create();
case DIALOG_DELETE_ALL_ID:
return DialogUtils.createConfirmationDialog(this,
- getString(R.string.track_list_delete_all_confirm_message),
- new DialogInterface.OnClickListener() {
+ R.string.track_list_delete_all_confirm_message, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
MyTracksProviderUtils.Factory.get(TrackList.this).deleteAllTracks();
@@ -369,7 +368,7 @@ public class TrackList extends ListActivity
});
case DIALOG_DELETE_CURRENT_ID:
return DialogUtils.createConfirmationDialog(this,
- getString(R.string.track_list_delete_track_confirm_message),
+ R.string.track_list_delete_track_confirm_message,
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java b/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java
index 08819ffa2..f1253cdce 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java
@@ -203,22 +203,19 @@ public class WaypointsList extends ListActivity implements View.OnClickListener
@Override
protected Dialog onCreateDialog(int id) {
- switch (id) {
- case DIALOG_DELETE_CURRENT_ID:
- return DialogUtils.createConfirmationDialog(this,
- getString(R.string.marker_list_delete_marker_confirm_message),
- new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- providerUtils.deleteWaypoint(
- selectedWaypointId, new DescriptionGeneratorImpl(WaypointsList.this));
- }
- });
- default:
- return null;
+ if (id != DIALOG_DELETE_CURRENT_ID) {
+ return null;
}
+ return DialogUtils.createConfirmationDialog(this,
+ R.string.marker_list_delete_marker_confirm_message, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ providerUtils.deleteWaypoint(
+ selectedWaypointId, new DescriptionGeneratorImpl(WaypointsList.this));
+ }
+ });
}
-
+
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.search_only, menu);
diff --git a/MyTracks/src/com/google/android/apps/mytracks/WelcomeActivity.java b/MyTracks/src/com/google/android/apps/mytracks/WelcomeActivity.java
index ff32fdc44..2a1f5f42d 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/WelcomeActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/WelcomeActivity.java
@@ -61,7 +61,6 @@ public class WelcomeActivity extends Activity {
View view = getLayoutInflater().inflate(R.layout.about, null);
TextView aboutVersion = (TextView) view.findViewById(R.id.about_version);
aboutVersion.setText(SystemUtils.getMyTracksVersion(this));
-
return new AlertDialog.Builder(this)
.setCancelable(true)
.setNegativeButton(R.string.about_license, new DialogInterface.OnClickListener() {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupActivity.java
index 4f55a9ccf..fb4f12de2 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupActivity.java
@@ -58,19 +58,16 @@ public class BackupActivity extends Activity {
@Override
protected Dialog onCreateDialog(int id) {
- switch (id) {
- case DIALOG_PROGRESS_ID:
- return DialogUtils.createSpinnerProgressDialog(this,
- getString(R.string.settings_backup_now_progress_message),
- new DialogInterface.OnCancelListener() {
- @Override
- public void onCancel(DialogInterface dialog) {
- finish();
- }
- });
- default:
- return null;
+ if (id != DIALOG_PROGRESS_ID) {
+ return null;
}
+ return DialogUtils.createSpinnerProgressDialog(
+ this, R.string.settings_backup_now_progress_message, new DialogInterface.OnCancelListener() {
+ @Override
+ public void onCancel(DialogInterface dialog) {
+ finish();
+ }
+ });
}
/**
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreActivity.java
index 43528a63b..b00aa3fe3 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreActivity.java
@@ -71,19 +71,16 @@ public class RestoreActivity extends Activity {
@Override
protected Dialog onCreateDialog(int id) {
- switch (id) {
- case DIALOG_PROGRESS_ID:
- return DialogUtils.createSpinnerProgressDialog(this,
- getString(R.string.settings_backup_restore_progress_message),
- new DialogInterface.OnCancelListener() {
- @Override
- public void onCancel(DialogInterface dialog) {
- finish();
- }
- });
- default:
- return null;
+ if (id != DIALOG_PROGRESS_ID) {
+ return null;
}
+ return DialogUtils.createSpinnerProgressDialog(this,
+ R.string.settings_backup_restore_progress_message, new DialogInterface.OnCancelListener() {
+ @Override
+ public void onCancel(DialogInterface dialog) {
+ finish();
+ }
+ });
}
/**
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreChooserActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreChooserActivity.java
index 8b5fc81c7..c305068d0 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreChooserActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreChooserActivity.java
@@ -24,8 +24,6 @@ import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.DialogInterface;
-import android.content.DialogInterface.OnCancelListener;
-import android.content.DialogInterface.OnClickListener;
import android.content.Intent;
import android.os.Bundle;
import android.widget.Toast;
@@ -91,32 +89,30 @@ public class RestoreChooserActivity extends Activity {
@Override
protected Dialog onCreateDialog(int id) {
- switch (id) {
- case DIALOG_CHOOSER_ID:
- String items[] = new String[backupDates.length];
- for (int i = 0; i < backupDates.length; i++) {
- items[i] = StringUtils.formatDateTime(this, backupDates[i].getTime());
- }
- return new AlertDialog.Builder(this)
- .setCancelable(true)
- .setItems(items, new OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- startActivity(new Intent(RestoreChooserActivity.this, RestoreActivity.class)
- .putExtra(RestoreActivity.EXTRA_DATE, backupDates[which].getTime()));
- finish();
- }
- })
- .setOnCancelListener(new OnCancelListener() {
- @Override
- public void onCancel(DialogInterface dialog) {
- finish();
- }
- })
- .setTitle(R.string.settings_backup_restore_select_title)
- .create();
- default:
- return null;
+ if (id != DIALOG_CHOOSER_ID) {
+ return null;
}
+ String items[] = new String[backupDates.length];
+ for (int i = 0; i < backupDates.length; i++) {
+ items[i] = StringUtils.formatDateTime(this, backupDates[i].getTime());
+ }
+ return new AlertDialog.Builder(this)
+ .setCancelable(true)
+ .setItems(items, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ startActivity(new Intent(RestoreChooserActivity.this, RestoreActivity.class).putExtra(
+ RestoreActivity.EXTRA_DATE, backupDates[which].getTime()));
+ finish();
+ }
+ })
+ .setOnCancelListener(new DialogInterface.OnCancelListener() {
+ @Override
+ public void onCancel(DialogInterface dialog) {
+ finish();
+ }
+ })
+ .setTitle(R.string.settings_backup_restore_select_title)
+ .create();
}
}
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java
index 1c0b4ed73..905874922 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java
@@ -28,8 +28,6 @@ import android.app.AlertDialog;
import android.app.Dialog;
import android.app.ProgressDialog;
import android.content.DialogInterface;
-import android.content.DialogInterface.OnCancelListener;
-import android.content.DialogInterface.OnClickListener;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
@@ -121,9 +119,8 @@ public class SaveActivity extends Activity {
protected Dialog onCreateDialog(int id) {
switch (id) {
case DIALOG_PROGRESS_ID:
- progressDialog = DialogUtils.createHorizontalProgressDialog(this,
- getString(R.string.sd_card_progress_message),
- new DialogInterface.OnCancelListener() {
+ progressDialog = DialogUtils.createHorizontalProgressDialog(
+ this, R.string.sd_card_progress_message, new DialogInterface.OnCancelListener() {
@Override
public void onCancel(DialogInterface dialog) {
saveAsyncTask.cancel(true);
@@ -137,14 +134,14 @@ public class SaveActivity extends Activity {
.setIcon(success
? android.R.drawable.ic_dialog_info : android.R.drawable.ic_dialog_alert)
.setMessage(messageId)
- .setOnCancelListener(new OnCancelListener() {
+ .setOnCancelListener(new DialogInterface.OnCancelListener() {
@Override
public void onCancel(DialogInterface dialog) {
dialog.dismiss();
onPostResultDialog();
}
})
- .setPositiveButton(R.string.generic_ok, new OnClickListener() {
+ .setPositiveButton(R.string.generic_ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int arg1) {
dialog.dismiss();
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/maps/ChooseMapActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/maps/ChooseMapActivity.java
index c864e01de..62112474c 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/maps/ChooseMapActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/maps/ChooseMapActivity.java
@@ -25,8 +25,6 @@ import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.DialogInterface;
-import android.content.DialogInterface.OnCancelListener;
-import android.content.DialogInterface.OnClickListener;
import android.content.Intent;
import android.graphics.Color;
import android.os.Bundle;
@@ -122,7 +120,7 @@ public class ChooseMapActivity extends Activity {
switch (id) {
case DIALOG_PROGRESS_ID:
return DialogUtils.createSpinnerProgressDialog(
- this, getString(R.string.maps_list_progress_message), new DialogInterface.OnCancelListener() {
+ this, R.string.maps_list_progress_message, new DialogInterface.OnCancelListener() {
@Override
public void onCancel(DialogInterface dialog) {
asyncTask.cancel(true);
@@ -134,13 +132,13 @@ public class ChooseMapActivity extends Activity {
.setCancelable(true)
.setIcon(android.R.drawable.ic_dialog_alert)
.setMessage(R.string.maps_list_error)
- .setOnCancelListener(new OnCancelListener() {
+ .setOnCancelListener(new DialogInterface.OnCancelListener() {
@Override
public void onCancel(DialogInterface dialog) {
finish();
}
})
- .setPositiveButton(R.string.generic_ok, new OnClickListener() {
+ .setPositiveButton(R.string.generic_ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int arg1) {
finish();
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/AbstractSendActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/AbstractSendActivity.java
index 6a094d1e1..b21aee1d9 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/AbstractSendActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/AbstractSendActivity.java
@@ -71,21 +71,18 @@ public abstract class AbstractSendActivity extends Activity {
@Override
protected Dialog onCreateDialog(int id) {
- switch (id) {
- case DIALOG_PROGRESS_ID:
- progressDialog = DialogUtils.createHorizontalProgressDialog(this,
- getString(R.string.send_google_progress_message, getServiceName()),
- new DialogInterface.OnCancelListener() {
- @Override
- public void onCancel(DialogInterface dialog) {
- asyncTask.cancel(true);
- startNextActivity(false, true);
- }
- });
- return progressDialog;
- default:
- return null;
+ if (id != DIALOG_PROGRESS_ID) {
+ return null;
}
+ progressDialog = DialogUtils.createHorizontalProgressDialog(
+ this, R.string.send_google_progress_message, new DialogInterface.OnCancelListener() {
+ @Override
+ public void onCancel(DialogInterface dialog) {
+ asyncTask.cancel(true);
+ startNextActivity(false, true);
+ }
+ }, getServiceName());
+ return progressDialog;
}
/**
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/AccountChooserActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/AccountChooserActivity.java
index 1e078aefe..76499b105 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/AccountChooserActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/AccountChooserActivity.java
@@ -135,49 +135,56 @@ public class AccountChooserActivity extends Activity {
.setTitle(R.string.send_google_no_account_title)
.create();
case DIALOG_CHOOSER_ID:
- String[] choices = new String[accounts.length];
- for (int i = 0; i < accounts.length; i++) {
- choices[i] = accounts[i].name;
- }
- return new AlertDialog.Builder(this)
- .setCancelable(true)
- .setNegativeButton(R.string.generic_cancel, new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int which) {
- finish();
- }
- })
- .setOnCancelListener(new DialogInterface.OnCancelListener() {
- @Override
- public void onCancel(DialogInterface dialog) {
- finish();
- }
- })
- .setPositiveButton(R.string.generic_ok, new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int which) {
- Account account = accounts[selectedAccountIndex];
- SharedPreferences sharedPreferences = getSharedPreferences(
- Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
- Editor editor = sharedPreferences.edit();
- editor.putString(getString(R.string.preferred_account_key), account.name);
- ApiAdapterFactory.getApiAdapter().applyPreferenceChanges(editor);
-
- sendRequest.setAccount(account);
- getPermission(MapsConstants.SERVICE_NAME, sendRequest.isSendMaps(), mapsCallback);
- }
- })
- .setSingleChoiceItems(
- choices, selectedAccountIndex, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- selectedAccountIndex = which;
- }
- })
- .setTitle(R.string.send_google_choose_account_title)
- .create();
+ return createDialogChooser();
default:
return null;
}
}
+
+ /**
+ * Creates a dialog chooser.
+ */
+ private Dialog createDialogChooser() {
+ String[] choices = new String[accounts.length];
+ for (int i = 0; i < accounts.length; i++) {
+ choices[i] = accounts[i].name;
+ }
+ return new AlertDialog.Builder(this)
+ .setCancelable(true)
+ .setNegativeButton(R.string.generic_cancel, new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int which) {
+ finish();
+ }
+ })
+ .setOnCancelListener(new DialogInterface.OnCancelListener() {
+ @Override
+ public void onCancel(DialogInterface dialog) {
+ finish();
+ }
+ })
+ .setPositiveButton(R.string.generic_ok, new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int which) {
+ Account account = accounts[selectedAccountIndex];
+ SharedPreferences sharedPreferences = getSharedPreferences(
+ Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
+ Editor editor = sharedPreferences.edit();
+ editor.putString(getString(R.string.preferred_account_key), account.name);
+ ApiAdapterFactory.getApiAdapter().applyPreferenceChanges(editor);
+
+ sendRequest.setAccount(account);
+ getPermission(MapsConstants.SERVICE_NAME, sendRequest.isSendMaps(), mapsCallback);
+ }
+ })
+ .setSingleChoiceItems(
+ choices, selectedAccountIndex, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ selectedAccountIndex = which;
+ }
+ })
+ .setTitle(R.string.send_google_choose_account_title)
+ .create();
+ }
private PermissionCallback spreadsheetsCallback = new PermissionCallback() {
@Override
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivity.java
index 5f12ee9c5..b3e379ff1 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivity.java
@@ -80,100 +80,94 @@ public class UploadResultActivity extends Activity {
@Override
protected Dialog onCreateDialog(int id) {
- switch (id) {
- case DIALOG_RESULT_ID:
- View view = getLayoutInflater().inflate(R.layout.upload_result, null);
+ if (id != DIALOG_RESULT_ID) {
+ return null;
+ }
+ View view = getLayoutInflater().inflate(R.layout.upload_result, null);
- LinearLayout mapsResult = (LinearLayout) view.findViewById(R.id.upload_result_maps_result);
- LinearLayout fusionTablesResult = (LinearLayout) view.findViewById(
- R.id.upload_result_fusion_tables_result);
- LinearLayout docsResult = (LinearLayout) view.findViewById(R.id.upload_result_docs_result);
+ LinearLayout mapsResult = (LinearLayout) view.findViewById(R.id.upload_result_maps_result);
+ LinearLayout fusionTablesResult = (LinearLayout) view.findViewById(
+ R.id.upload_result_fusion_tables_result);
+ LinearLayout docsResult = (LinearLayout) view.findViewById(R.id.upload_result_docs_result);
- ImageView mapsResultIcon = (ImageView) view.findViewById(
- R.id.upload_result_maps_result_icon);
- ImageView fusionTablesResultIcon = (ImageView) view.findViewById(
- R.id.upload_result_fusion_tables_result_icon);
- ImageView docsResultIcon = (ImageView) view.findViewById(
- R.id.upload_result_docs_result_icon);
+ ImageView mapsResultIcon = (ImageView) view.findViewById(R.id.upload_result_maps_result_icon);
+ ImageView fusionTablesResultIcon = (ImageView) view.findViewById(
+ R.id.upload_result_fusion_tables_result_icon);
+ ImageView docsResultIcon = (ImageView) view.findViewById(R.id.upload_result_docs_result_icon);
- TextView successFooter = (TextView) view.findViewById(R.id.upload_result_success_footer);
- TextView errorFooter = (TextView) view.findViewById(R.id.upload_result_error_footer);
+ TextView successFooter = (TextView) view.findViewById(R.id.upload_result_success_footer);
+ TextView errorFooter = (TextView) view.findViewById(R.id.upload_result_error_footer);
- boolean hasError = false;
- if (!sendRequest.isSendMaps()) {
- mapsResult.setVisibility(View.GONE);
- } else {
- if (!sendRequest.isMapsSuccess()) {
- mapsResultIcon.setImageResource(R.drawable.failure);
- mapsResultIcon.setContentDescription(getString(R.string.generic_error_title));
- hasError = true;
- }
- }
-
- if (!sendRequest.isSendFusionTables()) {
- fusionTablesResult.setVisibility(View.GONE);
- } else {
- if (!sendRequest.isFusionTablesSuccess()) {
- fusionTablesResultIcon.setImageResource(R.drawable.failure);
- fusionTablesResultIcon.setContentDescription(getString(R.string.generic_error_title));
- hasError = true;
- }
- }
-
- if (!sendRequest.isSendDocs()) {
- docsResult.setVisibility(View.GONE);
- } else {
- if (!sendRequest.isDocsSuccess()) {
- docsResultIcon.setImageResource(R.drawable.failure);
- docsResultIcon.setContentDescription(getString(R.string.generic_error_title));
- hasError = true;
- }
- }
-
- if (hasError) {
- successFooter.setVisibility(View.GONE);
- } else {
- errorFooter.setVisibility(View.GONE);
- }
-
- AlertDialog.Builder builder = new AlertDialog.Builder(this)
- .setCancelable(true)
- .setIcon(hasError ? android.R.drawable.ic_dialog_alert
- : android.R.drawable.ic_dialog_info)
- .setOnCancelListener(new DialogInterface.OnCancelListener() {
- @Override
- public void onCancel(DialogInterface dialog) {
- finish();
- }
- })
- .setPositiveButton(R.string.generic_ok, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- if (!sendRequest.isShowAll() && shareUrl != null) {
- startShareUrlActivity(shareUrl);
- }
- finish();
- }
- })
- .setTitle(hasError ? R.string.generic_error_title : R.string.generic_success_title)
- .setView(view);
-
- // Add a Share URL button if showing all the options and a shareUrl
- // exists
- if (sendRequest.isShowAll() && shareUrl != null) {
- builder.setNegativeButton(getString(R.string.send_google_result_share_url),
- new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- startShareUrlActivity(shareUrl);
- finish();
- }
- });
- }
- return builder.create();
- default:
- return null;
+ boolean hasError = false;
+ if (!sendRequest.isSendMaps()) {
+ mapsResult.setVisibility(View.GONE);
+ } else {
+ if (!sendRequest.isMapsSuccess()) {
+ mapsResultIcon.setImageResource(R.drawable.failure);
+ mapsResultIcon.setContentDescription(getString(R.string.generic_error_title));
+ hasError = true;
+ }
}
+
+ if (!sendRequest.isSendFusionTables()) {
+ fusionTablesResult.setVisibility(View.GONE);
+ } else {
+ if (!sendRequest.isFusionTablesSuccess()) {
+ fusionTablesResultIcon.setImageResource(R.drawable.failure);
+ fusionTablesResultIcon.setContentDescription(getString(R.string.generic_error_title));
+ hasError = true;
+ }
+ }
+
+ if (!sendRequest.isSendDocs()) {
+ docsResult.setVisibility(View.GONE);
+ } else {
+ if (!sendRequest.isDocsSuccess()) {
+ docsResultIcon.setImageResource(R.drawable.failure);
+ docsResultIcon.setContentDescription(getString(R.string.generic_error_title));
+ hasError = true;
+ }
+ }
+
+ if (hasError) {
+ successFooter.setVisibility(View.GONE);
+ } else {
+ errorFooter.setVisibility(View.GONE);
+ }
+
+ AlertDialog.Builder builder = new AlertDialog.Builder(this)
+ .setCancelable(true)
+ .setIcon(hasError ? android.R.drawable.ic_dialog_alert : android.R.drawable.ic_dialog_info)
+ .setOnCancelListener(new DialogInterface.OnCancelListener() {
+ @Override
+ public void onCancel(DialogInterface dialog) {
+ finish();
+ }
+ })
+ .setPositiveButton(R.string.generic_ok, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ if (!sendRequest.isShowAll() && shareUrl != null) {
+ startShareUrlActivity(shareUrl);
+ }
+ finish();
+ }
+ })
+ .setTitle(hasError ? R.string.generic_error_title : R.string.generic_success_title)
+ .setView(view);
+
+ // Add a Share URL button if showing all the options and a shareUrl exists
+ if (sendRequest.isShowAll() && shareUrl != null) {
+ builder.setNegativeButton(
+ getString(R.string.send_google_result_share_url), new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ startShareUrlActivity(shareUrl);
+ finish();
+ }
+ });
+ }
+ return builder.create();
}
/**
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivity.java
index 0e0433cb7..e44eb2dd8 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivity.java
@@ -78,77 +78,74 @@ public class UploadServiceChooserActivity extends Activity {
@Override
protected Dialog onCreateDialog(int id) {
- switch (id) {
- case DIALOG_CHOOSER_ID:
- View view = getLayoutInflater().inflate(R.layout.upload_service_chooser, null);
-
- mapsTableRow = (TableRow) view.findViewById(R.id.send_google_maps_row);
- fusionTablesTableRow = (TableRow) view.findViewById(R.id.send_google_fusion_tables_row);
- docsTableRow = (TableRow) view.findViewById(R.id.send_google_docs_row);
-
- mapsCheckBox = (CheckBox) view.findViewById(R.id.send_google_maps);
- fusionTablesCheckBox = (CheckBox) view.findViewById(R.id.send_google_fusion_tables);
- docsCheckBox = (CheckBox) view.findViewById(R.id.send_google_docs);
-
- mapsOptionTableRow = (TableRow) view.findViewById(R.id.send_google_maps_option_row);
- newMapRadioButton = (RadioButton) view.findViewById(R.id.send_google_new_map);
- existingMapRadioButton = (RadioButton) view.findViewById(R.id.send_google_existing_map);
-
- // Setup checkboxes
- OnCheckedChangeListener checkBoxListener = new OnCheckedChangeListener() {
- public void onCheckedChanged(CompoundButton button, boolean checked) {
- updateStateBySelection();
- }
- };
- mapsCheckBox.setOnCheckedChangeListener(checkBoxListener);
- fusionTablesCheckBox.setOnCheckedChangeListener(checkBoxListener);
- docsCheckBox.setOnCheckedChangeListener(checkBoxListener);
-
- // Setup initial state
- initState();
-
- // Update state based on sendRequest
- updateStateBySendRequest();
-
- // Update state based on current selection
- updateStateBySelection();
-
- alertDialog = new AlertDialog.Builder(this)
- .setCancelable(true)
- .setNegativeButton(R.string.generic_cancel, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- finish();
- }
- })
- .setOnCancelListener(new DialogInterface.OnCancelListener() {
- @Override
- public void onCancel(DialogInterface d) {
- finish();
- }
- })
- .setPositiveButton(
- R.string.send_google_send_now, new DialogInterface.OnClickListener() {
-
- @Override
- public void onClick(DialogInterface dialog, int which) {
- saveState();
- if (sendMaps() || sendFusionTables() || sendDocs()) {
- startNextActivity();
- } else {
- Toast.makeText(UploadServiceChooserActivity.this,
- R.string.send_google_no_service_selected, Toast.LENGTH_LONG).show();
- finish();
- }
- }
- })
- .setTitle(R.string.send_google_title)
- .setView(view)
- .create();
- return alertDialog;
- default:
- return null;
+ if (id != DIALOG_CHOOSER_ID) {
+ return null;
}
+ View view = getLayoutInflater().inflate(R.layout.upload_service_chooser, null);
+
+ mapsTableRow = (TableRow) view.findViewById(R.id.send_google_maps_row);
+ fusionTablesTableRow = (TableRow) view.findViewById(R.id.send_google_fusion_tables_row);
+ docsTableRow = (TableRow) view.findViewById(R.id.send_google_docs_row);
+
+ mapsCheckBox = (CheckBox) view.findViewById(R.id.send_google_maps);
+ fusionTablesCheckBox = (CheckBox) view.findViewById(R.id.send_google_fusion_tables);
+ docsCheckBox = (CheckBox) view.findViewById(R.id.send_google_docs);
+
+ mapsOptionTableRow = (TableRow) view.findViewById(R.id.send_google_maps_option_row);
+ newMapRadioButton = (RadioButton) view.findViewById(R.id.send_google_new_map);
+ existingMapRadioButton = (RadioButton) view.findViewById(R.id.send_google_existing_map);
+
+ // Setup checkboxes
+ OnCheckedChangeListener checkBoxListener = new OnCheckedChangeListener() {
+ public void onCheckedChanged(CompoundButton button, boolean checked) {
+ updateStateBySelection();
+ }
+ };
+ mapsCheckBox.setOnCheckedChangeListener(checkBoxListener);
+ fusionTablesCheckBox.setOnCheckedChangeListener(checkBoxListener);
+ docsCheckBox.setOnCheckedChangeListener(checkBoxListener);
+
+ // Setup initial state
+ initState();
+
+ // Update state based on sendRequest
+ updateStateBySendRequest();
+
+ // Update state based on current selection
+ updateStateBySelection();
+
+ alertDialog = new AlertDialog.Builder(this)
+ .setCancelable(true)
+ .setNegativeButton(R.string.generic_cancel, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ finish();
+ }
+ })
+ .setOnCancelListener(new DialogInterface.OnCancelListener() {
+ @Override
+ public void onCancel(DialogInterface d) {
+ finish();
+ }
+ })
+ .setPositiveButton(R.string.send_google_send_now, new DialogInterface.OnClickListener() {
+
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ saveState();
+ if (sendMaps() || sendFusionTables() || sendDocs()) {
+ startNextActivity();
+ } else {
+ Toast.makeText(UploadServiceChooserActivity.this,
+ R.string.send_google_no_service_selected, Toast.LENGTH_LONG).show();
+ finish();
+ }
+ }
+ })
+ .setTitle(R.string.send_google_title)
+ .setView(view)
+ .create();
+ return alertDialog;
}
/**
diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/DialogUtils.java b/MyTracks/src/com/google/android/apps/mytracks/util/DialogUtils.java
index c6c39cfac..126f25bf4 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/DialogUtils.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/DialogUtils.java
@@ -37,15 +37,15 @@ public class DialogUtils {
* Creates a confirmation dialog.
*
* @param context the context
- * @param message the confirmation message
+ * @param messageId the confirmation message id
* @param onClickListener the listener to invoke when the user clicks OK
*/
public static Dialog createConfirmationDialog(
- Context context, String message, DialogInterface.OnClickListener onClickListener) {
+ Context context, int messageId, DialogInterface.OnClickListener onClickListener) {
return new AlertDialog.Builder(context)
.setCancelable(true)
.setIcon(android.R.drawable.ic_dialog_alert)
- .setMessage(message)
+ .setMessage(context.getString(messageId))
.setNegativeButton(android.R.string.cancel, null)
.setPositiveButton(android.R.string.ok, onClickListener)
.setTitle(R.string.generic_confirm_title)
@@ -56,39 +56,47 @@ public class DialogUtils {
* Creates a spinner progress dialog.
*
* @param context the context
- * @param message the progress message
- * @param onCancelListener the listener to invoke when the user cancels
+ * @param messageId the progress message id
+ * @param onCancelListener the cancel listener
*/
public static ProgressDialog createSpinnerProgressDialog(
- Context context, String message, DialogInterface.OnCancelListener onCancelListener) {
- ProgressDialog progressDialog = new ProgressDialog(context);
- progressDialog.setCancelable(true);
- progressDialog.setIcon(android.R.drawable.ic_dialog_info);
- progressDialog.setIndeterminate(true);
- progressDialog.setMessage(message);
- progressDialog.setOnCancelListener(onCancelListener);
- progressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
- progressDialog.setTitle(R.string.generic_progress_title);
- return progressDialog;
+ Context context, int messageId, DialogInterface.OnCancelListener onCancelListener) {
+ return createProgressDialog(true, context, messageId, onCancelListener);
}
-
+
/**
* Creates a horizontal progress dialog.
*
* @param context the context
- * @param message the progress message
- * @param onCancelListener the listener to invoke when the user cancels
+ * @param messageId the progress message id
+ * @param onCancelListener the cancel listener
+ * @param formatArgs the format arguments for the messageId
*/
- public static ProgressDialog createHorizontalProgressDialog(
- Context context, String message, DialogInterface.OnCancelListener onCancelListener) {
+ public static ProgressDialog createHorizontalProgressDialog(Context context, int messageId,
+ DialogInterface.OnCancelListener onCancelListener, Object... formatArgs) {
+ return createProgressDialog(false, context, messageId, onCancelListener, formatArgs);
+ }
+
+ /**
+ * Creates a progress dialog.
+ *
+ * @param spinner true to use the spinner style
+ * @param context the context
+ * @param messageId the progress message id
+ * @param onCancelListener the cancel listener
+ * @param formatArgs the format arguments for the message id
+ */
+ private static ProgressDialog createProgressDialog(boolean spinner, Context context,
+ int messageId, DialogInterface.OnCancelListener onCancelListener, Object... formatArgs) {
ProgressDialog progressDialog = new ProgressDialog(context);
progressDialog.setCancelable(true);
progressDialog.setIcon(android.R.drawable.ic_dialog_info);
progressDialog.setIndeterminate(true);
- progressDialog.setMessage(message);
+ progressDialog.setMessage(context.getString(messageId, formatArgs));
progressDialog.setOnCancelListener(onCancelListener);
- progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
- progressDialog.setTitle(R.string.generic_progress_title);
+ progressDialog.setProgressStyle(spinner ? ProgressDialog.STYLE_SPINNER
+ : ProgressDialog.STYLE_HORIZONTAL);
+ progressDialog.setTitle(R.string.generic_progress_title);
return progressDialog;
}
}
diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/PlayTrackUtils.java b/MyTracks/src/com/google/android/apps/mytracks/util/PlayTrackUtils.java
index 675bef4f5..2605904a5 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/PlayTrackUtils.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/PlayTrackUtils.java
@@ -24,7 +24,6 @@ import android.app.AlertDialog;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
@@ -96,7 +95,7 @@ public class PlayTrackUtils {
.setCancelable(true)
.setMessage(R.string.track_list_play_install_earth_message)
.setNegativeButton(android.R.string.cancel, null)
- .setPositiveButton(android.R.string.ok, new OnClickListener() {
+ .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
Intent intent = new Intent();
diff --git a/MyTracksLib/.classpath b/MyTracksLib/.classpath
index 996e75add..4aeffd3c3 100644
--- a/MyTracksLib/.classpath
+++ b/MyTracksLib/.classpath
@@ -4,5 +4,6 @@
+
diff --git a/MyTracksTest/.classpath b/MyTracksTest/.classpath
index 6044ff11f..a59367532 100644
--- a/MyTracksTest/.classpath
+++ b/MyTracksTest/.classpath
@@ -11,5 +11,6 @@
+