From: peli0101 <peli0101@72b678ce-9140-0410-bee8-679b907dd61a>
Date: Thu, 15 Jan 2009 23:48:26 +0000 (+0000)
Subject: Include new icon for OI Safe.
X-Git-Url: https://hydra-www.ietfng.org/gitweb/?a=commitdiff_plain;h=f2eff38d81549f6b509891a7a57b7f5374790152;p=android-vcpass-oisafe

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 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 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 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);