From: kruland2607 <kruland2607@180e2498-e6e9-4542-8430-84ac67f01cd8>
Date: Fri, 15 Jun 2012 14:13:04 +0000 (+0000)
Subject: Tweak the main layout for Honeycomb and ICS devices.  Added custom layout for these... 
X-Git-Tag: upstream/12.09^2~176
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=5bce3f0dba3df3af4bc70e14ae7ebd453068bb66;p=debian%2Fopenrocket

Tweak the main layout for Honeycomb and ICS devices.  Added custom layout for these devices running on non-xlarge screens which pushes the title text down below the action bar.  Fixed the style for ICS and Honeycomb to properly hide the actionbar but leave the overflow menu button.

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
index 00000000..e4880d86
--- /dev/null
+++ b/android/res/layout-v11/main.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="@drawable/starfield"
+    android:orientation="vertical" >
+
+    <ImageView
+        android:id="@+id/openrocket"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:gravity="center_horizontal"
+        android:paddingTop="22dp"
+        android:src="@drawable/openrocket" />
+
+    <TextView
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:text="@string/version" />
+
+    <ImageView
+        android:id="@+id/rocketglobe"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="4"
+        android:src="@drawable/rocketglobe" />
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:gravity="center_horizontal" >
+
+        <Button
+            android:id="@+id/main_open"
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent"
+            android:text="@string/openfilelabel" />
+
+        <Button
+            android:id="@+id/main_browse"
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent"
+            android:text="@string/viewmotorslabel" />
+
+        <Button
+            android:id="@+id/main_donate"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:background="@drawable/sf_donate" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/android/res/values-v11/styles.xml b/android/res/values-v11/styles.xml
index 3d5f4937..535b5345 100644
--- 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 91b509ea..303484ea 100644
--- 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>