ROBOT_DEMO: change About dialog

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 e78a6f20e7e6eaa11756f3dde423cbc9e45ab972..cc2ab9503259409fa37c0ba2834d0a72cd79d719 100644 (file)
--- a/orte/Robot_Demo/gen/org/ocera/orte/demo/R.java
+++ b/orte/Robot_Demo/gen/org/ocera/orte/demo/R.java
@@ -26,11 +26,11 @@ public final class R {
         public static final int hokuyo=0x7f070014;
         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 imageView1=0x7f070001;
         public static final int magnet=0x7f070016;
         public static final int managers=0x7f070005;
         public static final int ownIP=0x7f070006;
-        public static final int scrollView1=0x7f070001;
+        public static final int scrollView1=0x7f070000;
         public static final int speed=0x7f070012;
         public static final int speed_mon=0x7f070013;
         public static final int tableRow1=0x7f070007;

diff --git a/orte/Robot_Demo/res/drawable/logo_flamingos.png b/orte/Robot_Demo/res/drawable/logo_flamingos.png
index e96aa9b52cb0a12a1d5344d9eb7a3b139455b75f..51126122fc578cbb15933afc3713db23adab0b25 100644 (file)
Binary files a/orte/Robot_Demo/res/drawable/logo_flamingos.png and b/orte/Robot_Demo/res/drawable/logo_flamingos.png differ

diff --git a/orte/Robot_Demo/res/layout/about_dialog.xml b/orte/Robot_Demo/res/layout/about_dialog.xml
index aaa7cc969f45b96e74d3fd57698d03c22c958c5b..da2bca634919092d6287cde8eab336be6434da00 100644 (file)
--- a/orte/Robot_Demo/res/layout/about_dialog.xml
+++ b/orte/Robot_Demo/res/layout/about_dialog.xml
@@ -1,31 +1,32 @@
 <?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:orientation="vertical">
-
-    <ImageView
-        android:id="@+id/imageView1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:adjustViewBounds="true"
-        android:src="@drawable/logo_flamingos" />
-
-    <ScrollView 
-        android:id="@+id/scrollView1"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:scrollbars="vertical" >
-
-           <TextView
-               android:id="@+id/textView1"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/scrollView1"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:scrollbars="vertical" >
+    
+       <LinearLayout
+           android:layout_width="wrap_content"
+           android:layout_height="wrap_content"
+           android:orientation="vertical">
+       
+           <ImageView
+               android:id="@+id/imageView1"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-               android:layout_gravity="center_horizontal"
-               android:gravity="center"
-               android:text="\nRoboDruid 1.0\n\n\nby Martin Vajnar\nand Flamingos Team\n\u00A9 2013\n\n\nDepartment of Control Engineering\nFaculty of Electrical Engineering\nCTU in Prague"
-               android:textSize="15sp" />
-        
-    </ScrollView>
+               android:adjustViewBounds="true"
+               android:scaleType="fitXY"
+               android:visibility="visible"
+               android:src="@drawable/logo_flamingos" />
+       
+                   <TextView
+                       android:id="@+id/textView1"
+                       android:layout_width="wrap_content"
+                       android:layout_height="wrap_content"
+                       android:layout_gravity="center_horizontal"
+                       android:gravity="center"
+                       android:text="\nRoboDruid 1.0\n\n\n\nDepartment of Control Engineering\nFaculty of Electrical Engineering\nCzech Technical University in Prague"
+                       android:textSize="15sp" />
 
-</LinearLayout>
+       </LinearLayout>
+</ScrollView>