ROBOT_DEMO: unify Dialog appearance

diff --git a/orte/Robot_Demo/gen/org/ocera/orte/demo/R.java b/orte/Robot_Demo/gen/org/ocera/orte/demo/R.java
index 51f64ed95ccbc951c683f63457f149c8bbf1c2e0..359d7f8d745f997e6eb08f1cd65c4cbe55305097 100644 (file)
--- a/orte/Robot_Demo/gen/org/ocera/orte/demo/R.java
+++ b/orte/Robot_Demo/gen/org/ocera/orte/demo/R.java
@@ -16,22 +16,21 @@ public final class R {
         public static final int logo_flamingos=0x7f020002;
     }
     public static final class id {
-        public static final int about=0x7f070017;
-        public static final int button1=0x7f070010;
-        public static final int crane=0x7f070014;
+        public static final int about=0x7f070016;
+        public static final int crane=0x7f070013;
         public static final int editText1=0x7f070006;
         public static final int editText2=0x7f070009;
         public static final int editText3=0x7f07000c;
         public static final int editText4=0x7f07000f;
-        public static final int exit=0x7f070018;
-        public static final int hokuyo=0x7f070013;
+        public static final int exit=0x7f070017;
+        public static final int hokuyo=0x7f070012;
         public static final int hokuyo_view=0x7f070004;
         public static final int hokuyo_view_bg=0x7f070003;
         public static final int imageView1=0x7f070000;
-        public static final int magnet=0x7f070015;
+        public static final int magnet=0x7f070014;
         public static final int scrollView1=0x7f070001;
-        public static final int speed=0x7f070011;
-        public static final int speed_mon=0x7f070012;
+        public static final int speed=0x7f070010;
+        public static final int speed_mon=0x7f070011;
         public static final int tableRow1=0x7f070005;
         public static final int tableRow2=0x7f070007;
         public static final int tableRow3=0x7f07000a;
@@ -40,7 +39,7 @@ public final class R {
         public static final int textView2=0x7f070008;
         public static final int textView3=0x7f07000b;
         public static final int textView4=0x7f07000e;
-        public static final int voltage=0x7f070016;
+        public static final int voltage=0x7f070015;
     }
     public static final class layout {
         public static final int about_dialog=0x7f030000;

diff --git a/orte/Robot_Demo/res/layout/status_dialog.xml b/orte/Robot_Demo/res/layout/status_dialog.xml
index 23f398b7bcab1e69e583ca6c62f5d37fa8f599a8..e9454c69ab13dea68e7369269507094f10ffdfb1 100644 (file)
--- a/orte/Robot_Demo/res/layout/status_dialog.xml
+++ b/orte/Robot_Demo/res/layout/status_dialog.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
     android:gravity="center"
     android:orientation="vertical" >
 
     <TableLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" >
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center" >
 
         <TableRow
             android:id="@+id/tableRow1"
@@ -99,10 +102,4 @@
 
     </TableLayout>
 
-    <Button
-        android:id="@+id/button1"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="OK" />
-
 </LinearLayout>

diff --git a/orte/Robot_Demo/src/org/ocera/orte/demo/MainActivity.java b/orte/Robot_Demo/src/org/ocera/orte/demo/MainActivity.java
index 31581c92dc00bbcb80768f6963adcea052380181..ea0d43b5b193314ab5dbf9796cbcfded2a52078e 100644 (file)
--- a/orte/Robot_Demo/src/org/ocera/orte/demo/MainActivity.java
+++ b/orte/Robot_Demo/src/org/ocera/orte/demo/MainActivity.java
@@ -7,6 +7,7 @@ import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.pm.ActivityInfo;
 import android.hardware.Sensor;
 import android.hardware.SensorEvent;
@@ -154,24 +155,26 @@ public class MainActivity extends Activity {
        super.onCreate(savedInstanceState);
         setContentView(R.layout.hokuyo_view);
         
-        voltageDialog = new Dialog(this,R.style.voltage_dialog);
-        voltageDialog.setCancelable(false);
-               voltageDialog.setContentView(R.layout.status_dialog);
-               Button okButton = (Button)voltageDialog.findViewById(R.id.button1);
-               okButton.setOnClickListener(new OnClickListener() {
+               AlertDialog.Builder voltageBuilder = new AlertDialog.Builder(this);
+               LayoutInflater inflater = getLayoutInflater();
+               View voltageView = inflater.inflate(R.layout.status_dialog, null);
+               voltageBuilder.setCancelable(false);
+               voltageBuilder.setView(voltageView);
+               voltageBuilder.setPositiveButton("OK", new DialogInterface.OnClickListener() {
                        @Override
-                       public void onClick(View arg0) {
+                       public void onClick(DialogInterface dialog, int which) {
                                voltageDialog.dismiss();
                                pwr_voltage.cancel();
                        }
                });
-               voltage33 = (EditText)voltageDialog.findViewById(R.id.editText1);
-               voltage50 = (EditText)voltageDialog.findViewById(R.id.editText2);
-               voltage80 = (EditText)voltageDialog.findViewById(R.id.editText3);
-               voltageBAT = (EditText)voltageDialog.findViewById(R.id.editText4);
+               voltageBuilder.setTitle("Voltages");
+               voltageDialog = voltageBuilder.create();
+               voltage33 = (EditText)voltageView.findViewById(R.id.editText1);
+               voltage50 = (EditText)voltageView.findViewById(R.id.editText2);
+               voltage80 = (EditText)voltageView.findViewById(R.id.editText3);
+               voltageBAT = (EditText)voltageView.findViewById(R.id.editText4);
                
                AlertDialog.Builder builder = new AlertDialog.Builder(this);
-               LayoutInflater inflater = getLayoutInflater();
                View aboutView = inflater.inflate(R.layout.about_dialog, null);
                builder.setView(aboutView);
                builder.setPositiveButton("OK", null);