From cba40a6688ae39872a707ecd45434f292147912c Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Tue, 12 Jun 2012 14:51:42 -0700
Subject: [PATCH] Use one scrollbar for confirm sharing dialog.

---
 MyTracks/res/layout/confirm_sharing.xml       | 32 ++++++++++++-------
 .../sendtogoogle/ConfirmSharingActivity.java  | 13 +++++---
 .../apps/mytracks/util/DialogUtils.java       | 11 ++++---
 3 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/MyTracks/res/layout/confirm_sharing.xml b/MyTracks/res/layout/confirm_sharing.xml
index 6e50ad44b..d13425cfa 100644
--- a/MyTracks/res/layout/confirm_sharing.xml
+++ b/MyTracks/res/layout/confirm_sharing.xml
@@ -14,16 +14,26 @@ 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.
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="wrap_content"
-  android:layout_width="fill_parent" >
-  <CheckBox
-    android:id="@+id/confirm_sharing"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+  style="@style/ScrollView" >
+  <LinearLayout
     android:layout_height="wrap_content"
-    android:layout_marginBottom="8dp"
-    android:layout_marginLeft="8dp"
-    android:layout_marginRight="8dp"
     android:layout_width="fill_parent"
-    android:text="@string/generic_do_not_show_again"
-    style="@style/TextMedium" />
-</LinearLayout>
\ No newline at end of file
+    android:orientation="vertical"
+    android:paddingBottom="12dp"
+    android:paddingLeft="14dp"
+    android:paddingRight="10dp"
+    android:paddingTop="2dp" >
+    <TextView
+      android:id="@+id/confirm_sharing_text_view"
+      android:autoLink="web"
+      style="@style/TextMedium" />
+    <CheckBox
+      android:id="@+id/confirm_sharing_check_box"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="8dp"
+      android:layout_width="fill_parent"
+      android:text="@string/generic_do_not_show_again"
+      style="@style/TextMedium" />
+  </LinearLayout>
+</ScrollView>
\ 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
index 2ed9e1f40..600bcca92 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/ConfirmSharingActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/ConfirmSharingActivity.java
@@ -28,6 +28,7 @@ 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.
@@ -59,7 +60,12 @@ public class ConfirmSharingActivity extends Activity {
       return null;
     }
     View view = getLayoutInflater().inflate(R.layout.confirm_sharing, null);
-    checkBox = (CheckBox) view.findViewById(R.id.confirm_sharing);
+    
+    TextView textView = (TextView) view.findViewById(R.id.confirm_sharing_text_view);
+    textView.setText(getString(
+        R.string.share_track_confirm_message, getString(R.string.maps_public_unlisted_url)));
+    
+    checkBox = (CheckBox) view.findViewById(R.id.confirm_sharing_check_box);
     DialogInterface.OnClickListener okListener = new DialogInterface.OnClickListener() {
         @Override
       public void onClick(DialogInterface dialog, int button) {
@@ -74,10 +80,9 @@ public class ConfirmSharingActivity extends Activity {
         finish();
       }
     };
-    String message = getString(
-        R.string.share_track_confirm_message, getString(R.string.maps_public_unlisted_url));
+  
     Dialog dialog = DialogUtils.createConfirmationDialog(
-        this, message, view, okListener, cancelListener);
+        this, -1, view, okListener, cancelListener);
     dialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
         @Override
       public void onCancel(DialogInterface dialogInterface) {
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 8b5277699..1f456ea6b 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/DialogUtils.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/DialogUtils.java
@@ -43,31 +43,34 @@ public class DialogUtils {
    */
   public static Dialog createConfirmationDialog(
       Context context, int messageId, DialogInterface.OnClickListener okListener) {
-    return createConfirmationDialog(context, context.getString(messageId), null, okListener, null);
+    return createConfirmationDialog(context, messageId, null, okListener, null);
   }
 
   /**
    * Creates a confirmation dialog.
    * 
    * @param context the context
-   * @param message the message
+   * @param messageId the messageId
    * @param view the view
    * @param okListener the listener when OK is clicked
    * @param cancelListener the listener when cancel is clicked
    */
   public static Dialog createConfirmationDialog(
-      Context context, String message, View view, DialogInterface.OnClickListener okListener,
+      Context context, int messageId, View view, DialogInterface.OnClickListener okListener,
       DialogInterface.OnClickListener cancelListener) {
     AlertDialog.Builder builder = new AlertDialog.Builder(context)
         .setCancelable(true)
         .setIcon(android.R.drawable.ic_dialog_alert)
-        .setMessage(message)
         .setNegativeButton(android.R.string.cancel, cancelListener)
         .setPositiveButton(android.R.string.ok, okListener)
         .setTitle(R.string.generic_confirm_title);
+    if (messageId != -1) {
+      builder.setMessage(messageId);
+    }
     if (view != null) {
       builder.setView(view);
     }
+    
     return builder.create();
   }