Tweak the main layout for Honeycomb and ICS devices. Added custom layout for these...

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@783 180e2498-e6e9-4542-8430-84ac67f01cd8

diff --git a/android/res/layout-v11/main.xml b/android/res/layout-v11/main.xml
new file mode 100644 (file)
index 0000000..e4880d8
--- /dev/null
+++ b/android/res/layout-v11/main.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"\r
+    android:layout_width="fill_parent"\r
+    android:layout_height="fill_parent"\r
+    android:background="@drawable/starfield"\r
+    android:orientation="vertical" >\r
+\r
+    <ImageView\r
+        android:id="@+id/openrocket"\r
+        android:layout_width="fill_parent"\r
+        android:layout_height="wrap_content"\r
+        android:layout_weight="1"\r
+        android:gravity="center_horizontal"\r
+        android:paddingTop="22dp"\r
+        android:src="@drawable/openrocket" />\r
+\r
+    <TextView\r
+        android:layout_width="fill_parent"\r
+        android:layout_height="wrap_content"\r
+        android:gravity="center_horizontal"\r
+        android:text="@string/version" />\r
+\r
+    <ImageView\r
+        android:id="@+id/rocketglobe"\r
+        android:layout_width="fill_parent"\r
+        android:layout_height="wrap_content"\r
+        android:layout_weight="4"\r
+        android:src="@drawable/rocketglobe" />\r
+\r
+    <LinearLayout\r
+        android:layout_width="fill_parent"\r
+        android:layout_height="wrap_content"\r
+        android:layout_weight="1"\r
+        android:gravity="center_horizontal" >\r
+\r
+        <Button\r
+            android:id="@+id/main_open"\r
+            android:layout_width="wrap_content"\r
+            android:layout_height="fill_parent"\r
+            android:text="@string/openfilelabel" />\r
+\r
+        <Button\r
+            android:id="@+id/main_browse"\r
+            android:layout_width="wrap_content"\r
+            android:layout_height="fill_parent"\r
+            android:text="@string/viewmotorslabel" />\r
+\r
+        <Button\r
+            android:id="@+id/main_donate"\r
+            android:layout_width="wrap_content"\r
+            android:layout_height="wrap_content"\r
+            android:layout_gravity="center"\r
+            android:background="@drawable/sf_donate" />\r
+    </LinearLayout>\r
+\r
+</LinearLayout>
\ No newline at end of file

diff --git a/android/res/values-v11/styles.xml b/android/res/values-v11/styles.xml
index 3d5f493763a5a82017c671831587db299697eb33..535b5345acd25849485db08fbed1d1f6798a1499 100644 (file)
--- a/android/res/values-v11/styles.xml
+++ b/android/res/values-v11/styles.xml
@@ -6,16 +6,17 @@
 
     <style name="AppTheme.NoActionBar" parent="AppTheme">
         <item name="android:actionBarStyle">@style/ActionBar.noBlueBar</item>
-        <item name="android:background">@android:color/transparent</item> <!-- transparent -->
-        <item name="background">@android:color/transparent</item> <!-- transparent -->
+        <item name="android:background">@android:color/transparent</item>
+        <item name="background">@android:color/transparent</item>
         <item name="android:windowActionBarOverlay">true</item>
         <item name="windowActionBarOverlay">true</item>
-        <item name="windowNoTitle">true</item>
-        <item name="android:windowNoTitle">true</item>
-        </style>
+    </style>
 
     <style name="ActionBar.noBlueBar" parent="Widget.Sherlock.ActionBar">
         <item name="android:background">@android:color/transparent</item>
+        <item name="background">@android:color/transparent</item>
+        <item name="android:displayOptions"></item>
+        <item name="displayOptions"></item>
     </style>
 
 </resources>
\ No newline at end of file

diff --git a/android/res/values/styles.xml b/android/res/values/styles.xml
index 91b509eafade7bec4b3a1807a659757d01a20b6d..303484eac1ab8b9af5a09cc41c907c323ccd08bb 100644 (file)
--- a/android/res/values/styles.xml
+++ b/android/res/values/styles.xml
@@ -12,8 +12,9 @@
     </style>
 
     <style name="AppTheme.NoActionBar" parent="AppTheme">
+        <item name="android:windowNoTitle">true</item>
         <item name="windowNoTitle">true</item>
-    </style>
+        </style>
 
     <style name="spinnerStyle" parent="Widget.Sherlock.TextView.SpinnerItem">
         <item name="android:textSize">26dp</item>