Include new icon for OI Safe.

Center title in layout.

git-svn-id: http://openintents.googlecode.com/svn/trunk/Safe@1731 72b678ce-9140-0410-bee8-679b907dd61a

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d7b463f304afb24a21c0cd69975322b621d53ec7..f1fb5afcbdac7b88b2f6572d8f4b37400c890761 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3,7 +3,7 @@
     package="org.openintents.safe" \r
     android:versionCode="1" \r
     android:versionName="0.7.0">
-    <application android:icon="@drawable/passicon" android:allowClearUserData="true" android:debuggable="true" android:label="@string/app_name">
+    <application android:icon="@drawable/icon_safe" android:allowClearUserData="true" android:debuggable="true" android:label="@string/app_name">
         <activity class=".FrontDoor" android:name="FrontDoor" android:label="@string/app_name">
                <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/res/drawable/icon_safe.png b/res/drawable/icon_safe.png
new file mode 100644 (file)
index 0000000..c90f40b
Binary files /dev/null and b/res/drawable/icon_safe.png differ

diff --git a/res/layout-land/front_door.xml b/res/layout-land/front_door.xml
index 39c5c509eda0be614f9c15a44546193ed41e74c3..d141870805fabf995e08b434f224676c46e299f4 100644 (file)
--- a/res/layout-land/front_door.xml
+++ b/res/layout-land/front_door.xml
@@ -20,12 +20,16 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"\r
        android:orientation="vertical" android:layout_width="fill_parent"\r
        android:layout_height="fill_parent">\r
-       \r
-       <TableLayout android:id="@+id/entry_head" \r
+       <LinearLayout android:id="@+id/entry_head"\r
                android:layout_width="fill_parent" \r
-               android:layout_height="wrap_content">\r
-               \r
-               <TableRow>\r
+               android:layout_height="wrap_content"\r
+               android:orientation = "vertical"\r
+               android:layout_marginTop="5dip">\r
+               <LinearLayout \r
+                       android:layout_width="wrap_content" \r
+                       android:layout_height="wrap_content"\r
+                       android:orientation="horizontal"\r
+                       android:layout_gravity="center">\r
                        <ImageView android:id="@+id/entry_icon"\r
                                android:layout_height="wrap_content"\r
                                android:layout_width="wrap_content"\r
@@ -33,12 +37,12 @@
                        <TextView android:id="@+id/entry_header"\r
                                android:paddingBottom="10px"\r
                                android:paddingTop="10px"\r
-                               android:textSize="20px" \r
-                               android:layout_width="fill_parent"\r
-                               android:layout_weight="1"\r
+                               android:textSize="24px" \r
+                               android:layout_width="wrap_content"\r
+                               android:layout_height="wrap_content"\r
                        />\r
-               </TableRow>\r
-       </TableLayout>\r
+               </LinearLayout>\r
+       </LinearLayout>\r
        <TextView android:id="@+id/first_time"\r
                android:layout_below="@id/entry_head"\r
                android:text="@string/first_time" \r

diff --git a/res/layout/front_door.xml b/res/layout/front_door.xml
index 493238b8032ca8b98c0d39ea61ba945876067b71..cb8dd9355d57c7ea4642723c2ad363dbbd25fd73 100644 (file)
--- a/res/layout/front_door.xml
+++ b/res/layout/front_door.xml
@@ -20,24 +20,23 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"\r
        android:orientation="vertical" android:layout_width="fill_parent"\r
        android:layout_height="fill_parent">\r
-       \r
-       <TableLayout android:layout_width="fill_parent" \r
-               android:layout_height="wrap_content">\r
-               \r
-               <TableRow>\r
-                       <ImageView android:id="@+id/entry_icon"\r
-                               android:layout_height="wrap_content"\r
-                               android:layout_width="wrap_content"\r
-                       />\r
-                       <TextView android:id="@+id/entry_header"\r
-                               android:paddingBottom="10px"\r
-                               android:paddingTop="10px"\r
-                               android:textSize="20px" \r
-                               android:layout_width="fill_parent"\r
-                               android:layout_weight="1"\r
-                       />\r
-               </TableRow>\r
-       </TableLayout>\r
+        <LinearLayout android:layout_width="wrap_content" \r
+               android:layout_height="wrap_content"\r
+               android:orientation="horizontal"\r
+               android:layout_gravity="center"\r
+               android:layout_marginTop="15dip">\r
+               <ImageView android:id="@+id/entry_icon"\r
+                       android:layout_height="wrap_content"\r
+                       android:layout_width="wrap_content"\r
+               />\r
+               <TextView android:id="@+id/entry_header"\r
+                       android:paddingBottom="10px"\r
+                       android:paddingTop="10px"\r
+                       android:textSize="24px" \r
+                       android:layout_width="wrap_content"\r
+                       android:layout_height="wrap_content"\r
+               />\r
+       </LinearLayout>\r
        <TextView android:id="@+id/first_time"\r
                android:text="@string/first_time" \r
                android:paddingBottom="10px"\r

diff --git a/src/org/openintents/safe/AskPassword.java b/src/org/openintents/safe/AskPassword.java
index 7b7ae8ceea302d3b07c756996a3057856c2ca908..be585a44399be8aa88d215c8c61a2de0ac932a8f 100644 (file)
--- a/src/org/openintents/safe/AskPassword.java
+++ b/src/org/openintents/safe/AskPassword.java
@@ -83,7 +83,7 @@ public class AskPassword extends Activity {
                // Setup layout
                setContentView(R.layout.front_door);
                ImageView icon = (ImageView) findViewById(R.id.entry_icon);
-               icon.setImageResource(R.drawable.passicon);
+               icon.setImageResource(R.drawable.icon_safe);
                TextView header = (TextView) findViewById(R.id.entry_header);
                String version = VersionUtils.getVersionNumber(this);
                String appName = VersionUtils.getApplicationName(this);