diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml
index d515fc273..bcd3f86f2 100755
--- a/MyTracks/AndroidManifest.xml
+++ b/MyTracks/AndroidManifest.xml
@@ -211,7 +211,6 @@ limitations under the License.
       android:name="com.google.android.apps.mytracks.io.maps.ChooseMapActivity" />
     <activity android:name="com.google.android.apps.mytracks.io.maps.SendMapsActivity" />
     <activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.AccountChooserActivity" />
-    <activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.ConfirmSharingActivity" />
     <activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.UploadResultActivity" />
     <activity android:name="com.google.android.apps.mytracks.settings.BackupResetSettingsActivity" />
     <activity android:name="com.google.android.apps.mytracks.settings.ChartSettingsActivity" />
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index d557d04c8..0e41edbe3 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -918,7 +918,7 @@ limitations under the License.
     translation_description="In the 'Help' page, the answer on share visibility.">
     By default, tracks sent to Google Maps are unlisted, tracks sent to Google Fusion Tables are
     public, and tracks sent to Google Docs are private. For Google Maps, you can change the
-    default between public and unlisted via Settings -> Sharing. After uploading tracks, you can
+    default between public and unlisted via Settings -> Google. After uploading tracks, you can
     change their visibility in Google Maps, Google Fusion Tables, and Google Docs.
   </string>
   <string name="help_share_visibility_question"
@@ -2196,7 +2196,7 @@ limitations under the License.
 
       %1$s url. E.g., 'support.google.com/maps/bin/answer.py?answer=144365'.">
     This will upload your track to Google Maps so that you can share the map url with friends. The
-    map will be either public or unlisted depending on your setting at Settings -> Sharing. For more
+    map will be either public or unlisted depending on your setting at Settings -> Google. For more
     info on public versus unlisted, see %1$s.
   </string>
   <string name="share_track_picker_title"
diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
index fa184911f..66b9cf3ba 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
@@ -24,7 +24,7 @@ import com.google.android.apps.mytracks.content.WaypointCreationRequest;
 import com.google.android.apps.mytracks.fragments.ChartFragment;
 import com.google.android.apps.mytracks.fragments.ChooseActivityDialogFragment;
 import com.google.android.apps.mytracks.fragments.ChooseUploadServiceDialogFragment;
-import com.google.android.apps.mytracks.fragments.ConfirmPlayDialogFragment;
+import com.google.android.apps.mytracks.fragments.ConfirmDialogFragment;
 import com.google.android.apps.mytracks.fragments.DeleteOneTrackDialogFragment;
 import com.google.android.apps.mytracks.fragments.DeleteOneTrackDialogFragment.DeleteOneTrackCaller;
 import com.google.android.apps.mytracks.fragments.FrequencyDialogFragment;
@@ -39,6 +39,7 @@ import com.google.android.apps.mytracks.settings.SettingsActivity;
 import com.google.android.apps.mytracks.util.AnalyticsUtils;
 import com.google.android.apps.mytracks.util.IntentUtils;
 import com.google.android.apps.mytracks.util.PreferencesUtils;
+import com.google.android.apps.mytracks.util.StringUtils;
 import com.google.android.apps.mytracks.util.TrackRecordingServiceConnectionUtils;
 import com.google.android.maps.mytracks.R;
 
@@ -311,6 +312,25 @@ public class TrackDetailActivity extends AbstractMyTracksActivity implements Del
     return super.onPrepareOptionsMenu(menu);
   }
 
+  public void onConfirmDialogDone(int id) {
+    switch (id) {
+      case R.string.show_confirm_play_earth_dialog_key:
+        AnalyticsUtils.sendPageViews(this, "/action/play");
+        Intent intent = IntentUtils.newIntent(this, SaveActivity.class)
+            .putExtra(SaveActivity.EXTRA_TRACK_ID, trackId)
+            .putExtra(SaveActivity.EXTRA_TRACK_FILE_FORMAT, (Parcelable) TrackFileFormat.KML)
+            .putExtra(SaveActivity.EXTRA_PLAY_TRACK, true);
+        startActivity(intent);
+        break;
+      case R.string.show_confirm_sharing_dialog_key:
+        AnalyticsUtils.sendPageViews(this, "/action/share");
+        ChooseActivityDialogFragment.newInstance(trackId, null).show(
+            getSupportFragmentManager(), ChooseActivityDialogFragment.CHOOSE_ACTIVITY_DIALOG_TAG);
+        break;
+      default:
+    }
+  }
+  
   @Override
   public boolean onOptionsItemSelected(MenuItem item) {
     Intent intent;
@@ -323,17 +343,21 @@ public class TrackDetailActivity extends AbstractMyTracksActivity implements Del
         return true;
       case R.id.track_detail_play:
         if (isEarthInstalled()) {
-          ConfirmPlayDialogFragment.newInstance(trackId)
-              .show(getSupportFragmentManager(), ConfirmPlayDialogFragment.CONFIRM_PLAY_DIALOG_TAG);
+          ConfirmDialogFragment.newInstance(R.string.show_confirm_play_earth_dialog_key,
+              PreferencesUtils.SHOW_CONFIRM_PLAY_DIALOG_DEFAULT,
+              getString(R.string.track_detail_play_confirm_message))
+              .show(getSupportFragmentManager(), ConfirmDialogFragment.CONFIRM_DIALOG_TAG);
         } else {
           new InstallEarthDialogFragment().show(
               getSupportFragmentManager(), InstallEarthDialogFragment.INSTALL_EARTH_DIALOG_TAG);
         }
         return true;
       case R.id.track_detail_share:
-        AnalyticsUtils.sendPageViews(this, "/action/share");
-        ChooseActivityDialogFragment.newInstance(trackId, null).show(
-            getSupportFragmentManager(), ChooseActivityDialogFragment.CHOOSE_ACTIVITY_DIALOG_TAG);
+        ConfirmDialogFragment.newInstance(R.string.show_confirm_sharing_dialog_key,
+            PreferencesUtils.SHOW_CONFIRM_SHARING_DIALOG_DEFAULT,
+            StringUtils.getHtml(
+                this, R.string.share_track_confirm_message, R.string.maps_public_unlisted_url))
+            .show(getSupportFragmentManager(), ConfirmDialogFragment.CONFIRM_DIALOG_TAG);
         return true;
       case R.id.track_detail_markers:
         intent = IntentUtils.newIntent(this, MarkerListActivity.class)
diff --git a/MyTracks/src/com/google/android/apps/mytracks/fragments/ChooseActivityDialogFragment.java b/MyTracks/src/com/google/android/apps/mytracks/fragments/ChooseActivityDialogFragment.java
index 1bfd8d5a1..c4bbf1f13 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/fragments/ChooseActivityDialogFragment.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/ChooseActivityDialogFragment.java
@@ -16,7 +16,7 @@
 
 package com.google.android.apps.mytracks.fragments;
 
-import com.google.android.apps.mytracks.io.sendtogoogle.ConfirmSharingActivity;
+import com.google.android.apps.mytracks.io.sendtogoogle.AccountChooserActivity;
 import com.google.android.apps.mytracks.io.sendtogoogle.SendRequest;
 import com.google.android.apps.mytracks.util.IntentUtils;
 import com.google.android.maps.mytracks.R;
@@ -120,7 +120,7 @@ public class ChooseActivityDialogFragment extends DialogFragment {
               sendRequest.setNewMap(true);
               sendRequest.setSharingAppPackageName(packageName);
               sendRequest.setSharingAppClassName(className);
-              Intent intent = IntentUtils.newIntent(activity, ConfirmSharingActivity.class)
+              Intent intent = IntentUtils.newIntent(activity, AccountChooserActivity.class)
                   .putExtra(SendRequest.SEND_REQUEST_KEY, sendRequest);
               startActivity(intent);
               dismiss();
diff --git a/MyTracks/src/com/google/android/apps/mytracks/fragments/ConfirmDialogFragment.java b/MyTracks/src/com/google/android/apps/mytracks/fragments/ConfirmDialogFragment.java
new file mode 100644
index 000000000..95a1d1999
--- /dev/null
+++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/ConfirmDialogFragment.java
@@ -0,0 +1,89 @@
+/*
+ * 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.fragments;
+
+import com.google.android.apps.mytracks.TrackDetailActivity;
+import com.google.android.apps.mytracks.util.PreferencesUtils;
+import com.google.android.maps.mytracks.R;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.support.v4.app.DialogFragment;
+import android.view.View;
+import android.widget.CheckBox;
+import android.widget.TextView;
+
+/**
+ * A DialogFragment to confirm an action.
+ * 
+ * @author Jimmy Shih
+ */
+public class ConfirmDialogFragment extends DialogFragment {
+
+  public static final String CONFIRM_DIALOG_TAG = "confirmDialog";
+
+  private static final String KEY_CONFIRM_ID = "confirmId";
+  private static final String KEY_DEFAULT_VALUE = "defaultValue";
+  private static final String KEY_MESSAGE = "message";
+
+  private CheckBox checkBox;
+
+  public static ConfirmDialogFragment newInstance(
+      int confirmId, boolean defaultValue, CharSequence message) {
+    Bundle bundle = new Bundle();
+    bundle.putInt(KEY_CONFIRM_ID, confirmId);
+    bundle.putBoolean(KEY_DEFAULT_VALUE, defaultValue);
+    bundle.putCharSequence(KEY_MESSAGE, message);
+    
+    ConfirmDialogFragment confirmDialogFragment = new ConfirmDialogFragment();
+    confirmDialogFragment.setArguments(bundle);
+    return confirmDialogFragment;
+  }
+
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    int confirmId = getArguments().getInt(KEY_CONFIRM_ID);
+    boolean defaultValue = getArguments().getBoolean(KEY_DEFAULT_VALUE);
+    if (!PreferencesUtils.getBoolean(getActivity(), confirmId, defaultValue)) {
+      dismiss();
+      TrackDetailActivity trackDetailActivity = (TrackDetailActivity) getActivity();
+      trackDetailActivity.onConfirmDialogDone(confirmId);
+    }
+  }
+
+  @Override
+  public Dialog onCreateDialog(Bundle savedInstanceState) {
+    View view = getActivity().getLayoutInflater().inflate(R.layout.confirm_dialog, null);
+    TextView textView = (TextView) view.findViewById(R.id.confirm_dialog_message);
+    textView.setText(getArguments().getCharSequence(KEY_MESSAGE));
+    checkBox = (CheckBox) view.findViewById(R.id.confirm_dialog_check_box);
+
+    return new AlertDialog.Builder(getActivity()).setNegativeButton(android.R.string.cancel, null)
+        .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+            @Override
+          public void onClick(DialogInterface dialog, int which) {
+            int confirmId = getArguments().getInt(KEY_CONFIRM_ID);
+            PreferencesUtils.setBoolean(getActivity(), confirmId, !checkBox.isChecked());
+            TrackDetailActivity trackDetailActivity = (TrackDetailActivity) getActivity();
+            trackDetailActivity.onConfirmDialogDone(confirmId);
+          }
+        }).setTitle(R.string.generic_confirm_title).setView(view).create();
+  }
+}
\ No newline at end of file
diff --git a/MyTracks/src/com/google/android/apps/mytracks/fragments/ConfirmPlayDialogFragment.java b/MyTracks/src/com/google/android/apps/mytracks/fragments/ConfirmPlayDialogFragment.java
deleted file mode 100644
index 5b2d3dcf9..000000000
--- a/MyTracks/src/com/google/android/apps/mytracks/fragments/ConfirmPlayDialogFragment.java
+++ /dev/null
@@ -1,102 +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.fragments;
-
-import com.google.android.apps.mytracks.io.file.SaveActivity;
-import com.google.android.apps.mytracks.io.file.TrackFileFormat;
-import com.google.android.apps.mytracks.util.AnalyticsUtils;
-import com.google.android.apps.mytracks.util.IntentUtils;
-import com.google.android.apps.mytracks.util.PreferencesUtils;
-import com.google.android.maps.mytracks.R;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Parcelable;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.FragmentActivity;
-import android.view.View;
-import android.widget.CheckBox;
-import android.widget.TextView;
-
-/**
- * A DialogFragment to confirm play in Google Earth.
- * 
- * @author Jimmy Shih
- */
-public class ConfirmPlayDialogFragment extends DialogFragment {
-
-  public static final String CONFIRM_PLAY_DIALOG_TAG = "confirmPlayDialog";
-  private static final String KEY_TRACK_ID = "trackId";
-
-  private FragmentActivity activity;
-  private CheckBox checkBox;
-
-  public static ConfirmPlayDialogFragment newInstance(long trackId) {
-    Bundle bundle = new Bundle();
-    bundle.putLong(KEY_TRACK_ID, trackId);
-
-    ConfirmPlayDialogFragment confirmPlayDialogFragment = new ConfirmPlayDialogFragment();
-    confirmPlayDialogFragment.setArguments(bundle);
-    return confirmPlayDialogFragment;
-  }
-
-  @Override
-  public void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    activity = getActivity();
-    if (!PreferencesUtils.getBoolean(getActivity(), R.string.show_confirm_play_earth_dialog_key,
-        PreferencesUtils.SHOW_CONFIRM_PLAY_DIALOG_DEFAULT)) {
-      dismiss();
-      playTrack();
-    }
-  }
-  
-  private void playTrack() {
-    long trackId = getArguments().getLong(KEY_TRACK_ID);
-    AnalyticsUtils.sendPageViews(activity, "/action/play");
-    Intent intent = IntentUtils.newIntent(activity, SaveActivity.class)
-        .putExtra(SaveActivity.EXTRA_TRACK_ID, trackId)
-        .putExtra(SaveActivity.EXTRA_TRACK_FILE_FORMAT, (Parcelable) TrackFileFormat.KML)
-        .putExtra(SaveActivity.EXTRA_PLAY_TRACK, true);
-    startActivity(intent);
-  }
-  
-  @Override
-  public Dialog onCreateDialog(Bundle savedInstanceState) {
-    View view = activity.getLayoutInflater().inflate(R.layout.confirm_dialog, null);
-    TextView textView = (TextView) view.findViewById(R.id.confirm_dialog_message);
-    textView.setText(R.string.track_detail_play_confirm_message);
-    checkBox = (CheckBox) view.findViewById(R.id.confirm_dialog_check_box);
-   
-    return new AlertDialog.Builder(activity)
-        .setNegativeButton(android.R.string.cancel, null)
-        .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-            @Override
-          public void onClick(DialogInterface dialog, int which) {
-            PreferencesUtils.setBoolean(
-                activity, R.string.show_confirm_play_earth_dialog_key, !checkBox.isChecked());
-            playTrack();
-          }
-        })
-        .setTitle(R.string.generic_confirm_title)
-        .setView(view)
-        .create();
-  }
-}
\ No newline at end of file
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/ConfirmSharingActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/ConfirmSharingActivity.java
deleted file mode 100644
index 73227b0c9..000000000
--- a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/ConfirmSharingActivity.java
+++ /dev/null
@@ -1,106 +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.io.sendtogoogle;
-
-import com.google.android.apps.mytracks.util.DialogUtils;
-import com.google.android.apps.mytracks.util.IntentUtils;
-import com.google.android.apps.mytracks.util.PreferencesUtils;
-import com.google.android.apps.mytracks.util.StringUtils;
-import com.google.android.maps.mytracks.R;
-
-import android.app.Activity;
-import android.app.Dialog;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.CheckBox;
-import android.widget.TextView;
-
-/**
- * An interstitial to confirm sharing with friends.
- * 
- * @author Jimmy Shih
- */
-public class ConfirmSharingActivity extends Activity {
-
-  private static final int DIALOG_ID = 0;
-
-  private SendRequest sendRequest;
-  private CheckBox checkBox;
-
-  @Override
-  protected void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    sendRequest = getIntent().getParcelableExtra(SendRequest.SEND_REQUEST_KEY);
-    if (PreferencesUtils.getBoolean(this, R.string.show_confirm_sharing_dialog_key,
-        PreferencesUtils.SHOW_CONFIRM_SHARING_DIALOG_DEFAULT)) {
-      showDialog(DIALOG_ID);
-    } else {
-      startNextActivity();
-    }
-  }
-
-  @Override
-  protected Dialog onCreateDialog(int id) {
-    if (id != DIALOG_ID) {
-      return null;
-    }
-    View view = getLayoutInflater().inflate(R.layout.confirm_dialog, null);
-    
-    TextView textView = (TextView) view.findViewById(R.id.confirm_dialog_message);
-    textView.setText(StringUtils.getHtml(
-        this, R.string.share_track_confirm_message, R.string.maps_public_unlisted_url));
-
-    checkBox = (CheckBox) view.findViewById(R.id.confirm_dialog_check_box);
-    DialogInterface.OnClickListener okListener = new DialogInterface.OnClickListener() {
-        @Override
-      public void onClick(DialogInterface dialog, int button) {
-        PreferencesUtils.setBoolean(ConfirmSharingActivity.this,
-            R.string.show_confirm_sharing_dialog_key, !checkBox.isChecked());
-        startNextActivity();
-      }
-    };
-    DialogInterface.OnClickListener cancelListener = new DialogInterface.OnClickListener() {
-        @Override
-      public void onClick(DialogInterface dialog, int button) {
-        finish();
-      }
-    };
-  
-    Dialog dialog = DialogUtils.createConfirmationDialog(
-        this, -1, view, okListener, cancelListener);
-    dialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
-        @Override
-      public void onCancel(DialogInterface dialogInterface) {
-        finish();
-      }
-    });
-    return dialog;
-  }
-
-  /**
-   * Starts the next activity for sharing with friends and finishes this
-   * activity.
-   */
-  private void startNextActivity() {
-    Intent intent = IntentUtils.newIntent(this, AccountChooserActivity.class)
-        .putExtra(SendRequest.SEND_REQUEST_KEY, sendRequest);
-    startActivity(intent);
-    finish();
-  }
-}
\ No newline at end of file