Merge to head

MyTracks/src/com/google/android/apps/mytracks/WelcomeActivity.java

@@ -20,13 +20,12 @@ import com.google.android.maps.mytracks.R;
 
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.view.Window;
-import android.webkit.WebView;
 import android.widget.TextView;
 
 /**
@@ -36,52 +35,54 @@ import android.widget.TextView;
  */
 public class WelcomeActivity extends Activity {
 
+  private static final int DIALOG_ABOUT_ID = 0;
+  private static final int DIALOG_EULA_ID = 1;
+  
   @Override
   public void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
-    requestWindowFeature(Window.FEATURE_NO_TITLE);
-    requestWindowFeature(Window.FEATURE_PROGRESS);
-
     setContentView(R.layout.welcome);
-
-    WebView web = (WebView) findViewById(R.id.welcome_web);
-    web.loadUrl("file:///android_asset/welcome.html");
-
-    findViewById(R.id.welcome_ok).setOnClickListener(
-        new OnClickListener() {
-          public void onClick(View v) {
-            finish();
-          }
-        });
-
+    findViewById(R.id.welcome_ok).setOnClickListener(new OnClickListener() {
+      public void onClick(View v) {
+        finish();
+      }
+    });
     findViewById(R.id.welcome_about).setOnClickListener(new OnClickListener() {
       public void onClick(View v) {
-        about();
+        showDialog(DIALOG_ABOUT_ID);
       }
     });
   }
 
-  /**
-   * Shows the "about" dialog.
-   * 
-   * TODO: Add a menu option for showing the same thing.
-   */
-  public void about() {
-    LayoutInflater li = LayoutInflater.from(this);
-    View view = li.inflate(R.layout.about, null);
-    AlertDialog.Builder builder = new AlertDialog.Builder(this);
-    builder.setView(view);
-    builder.setPositiveButton(R.string.generic_ok, null);
-    builder.setNegativeButton(R.string.about_license, new DialogInterface.OnClickListener() {
-      @Override 
-      public void onClick(DialogInterface dialog, int which) {
-        Eula.showEula(WelcomeActivity.this);
-      }
-    });
-    builder.setIcon(R.drawable.arrow_icon);
-    AlertDialog dialog = builder.create();
-    dialog.show();
-    ((TextView) dialog.findViewById(R.id.about_version_register)).
-        setText(SystemUtils.getMyTracksVersion(this));
+  @Override
+  protected Dialog onCreateDialog(int id) {
+    AlertDialog.Builder builder;
+    switch (id) {
+      case DIALOG_ABOUT_ID:
+        LayoutInflater layoutInflator = LayoutInflater.from(this);
+        View view = layoutInflator.inflate(R.layout.about, null);
+        TextView aboutVersionTextView = (TextView) view.findViewById(R.id.about_version);
+        aboutVersionTextView.setText(SystemUtils.getMyTracksVersion(this));
+        
+        builder = new AlertDialog.Builder(this);
+        builder.setView(view);
+        builder.setPositiveButton(R.string.generic_ok, null);
+        builder.setNegativeButton(R.string.about_license, new DialogInterface.OnClickListener() {
+          @Override
+          public void onClick(DialogInterface dialog, int which) {
+            showDialog(DIALOG_EULA_ID);
+          }
+        });
+        return builder.create();
+      case DIALOG_EULA_ID:
+        builder = new AlertDialog.Builder(this);
+        builder.setTitle(R.string.eula_title);
+        builder.setMessage(R.string.eula_message);
+        builder.setPositiveButton(R.string.generic_ok, null);
+        builder.setCancelable(true);
+        return builder.create();     
+      default:
+        return null;
+    }
   }
 }