From f2eff38d81549f6b509891a7a57b7f5374790152 Mon Sep 17 00:00:00 2001
From: peli0101 <peli0101@72b678ce-9140-0410-bee8-679b907dd61a>
Date: Thu, 15 Jan 2009 23:48:26 +0000
Subject: [PATCH] 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
---
 AndroidManifest.xml                       |   2 +-
 res/drawable/icon_safe.png                | Bin 0 -> 3000 bytes
 res/layout-land/front_door.xml            |  24 ++++++++-------
 res/layout/front_door.xml                 |  35 +++++++++++-----------
 src/org/openintents/safe/AskPassword.java |   2 +-
 5 files changed, 33 insertions(+), 30 deletions(-)
 create mode 100644 res/drawable/icon_safe.png

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d7b463f..f1fb5af 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3,7 +3,7 @@
     package="org.openintents.safe" 
     android:versionCode="1" 
     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
index 0000000000000000000000000000000000000000..c90f40ba2b0f17ff3d9ffadeb9ea8b5cb7639de2
GIT binary patch
literal 3000
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

literal 0
HcmV?d00001

diff --git a/res/layout-land/front_door.xml b/res/layout-land/front_door.xml
index 39c5c50..d141870 100644
--- 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"
 	android:orientation="vertical" android:layout_width="fill_parent"
 	android:layout_height="fill_parent">
-	
-	<TableLayout android:id="@+id/entry_head" 
+	<LinearLayout android:id="@+id/entry_head"
 		android:layout_width="fill_parent" 
-		android:layout_height="wrap_content">
-		
-		<TableRow>
+		android:layout_height="wrap_content"
+		android:orientation = "vertical"
+		android:layout_marginTop="5dip">
+		<LinearLayout 
+			android:layout_width="wrap_content" 
+			android:layout_height="wrap_content"
+			android:orientation="horizontal"
+			android:layout_gravity="center">
 			<ImageView android:id="@+id/entry_icon"
 				android:layout_height="wrap_content"
 				android:layout_width="wrap_content"
@@ -33,12 +37,12 @@
 			<TextView android:id="@+id/entry_header"
 				android:paddingBottom="10px"
 				android:paddingTop="10px"
-				android:textSize="20px" 
-				android:layout_width="fill_parent"
-				android:layout_weight="1"
+				android:textSize="24px" 
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
 			/>
-		</TableRow>
-	</TableLayout>
+		</LinearLayout>
+	</LinearLayout>
 	<TextView android:id="@+id/first_time"
 		android:layout_below="@id/entry_head"
 		android:text="@string/first_time" 
diff --git a/res/layout/front_door.xml b/res/layout/front_door.xml
index 493238b..cb8dd93 100644
--- 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"
 	android:orientation="vertical" android:layout_width="fill_parent"
 	android:layout_height="fill_parent">
-	
-	<TableLayout android:layout_width="fill_parent" 
-		android:layout_height="wrap_content">
-		
-		<TableRow>
-			<ImageView android:id="@+id/entry_icon"
-				android:layout_height="wrap_content"
-				android:layout_width="wrap_content"
-			/>
-			<TextView android:id="@+id/entry_header"
-				android:paddingBottom="10px"
-				android:paddingTop="10px"
-				android:textSize="20px" 
-				android:layout_width="fill_parent"
-				android:layout_weight="1"
-			/>
-		</TableRow>
-	</TableLayout>
+	 <LinearLayout android:layout_width="wrap_content" 
+		android:layout_height="wrap_content"
+		android:orientation="horizontal"
+		android:layout_gravity="center"
+		android:layout_marginTop="15dip">
+		<ImageView android:id="@+id/entry_icon"
+			android:layout_height="wrap_content"
+			android:layout_width="wrap_content"
+		/>
+		<TextView android:id="@+id/entry_header"
+			android:paddingBottom="10px"
+			android:paddingTop="10px"
+			android:textSize="24px" 
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+		/>
+	</LinearLayout>
 	<TextView android:id="@+id/first_time"
 		android:text="@string/first_time" 
 		android:paddingBottom="10px"
diff --git a/src/org/openintents/safe/AskPassword.java b/src/org/openintents/safe/AskPassword.java
index 7b7ae8c..be585a4 100644
--- 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);
-- 
2.50.1