From bedeeff28c75c7719e6f246485728d809cdb4e24 Mon Sep 17 00:00:00 2001
From: Kenny Root <kenny@the-b.org>
Date: Sat, 17 Dec 2011 15:04:57 -0600
Subject: Move some manifest items to avoid lint warnings

---
 .classpath                        |  2 +-
 AndroidManifest.xml               | 16 ++++++++--------
 res/layout/act_colors.xml         |  4 ++--
 res/layout/act_generatepubkey.xml |  2 +-
 res/values/strings.xml            |  2 ++
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/.classpath b/.classpath
index 79a8481..31e9da2 100644
--- a/.classpath
+++ b/.classpath
@@ -3,5 +3,5 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e00cb90..188ebba 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -23,6 +23,14 @@
 
 	<uses-sdk android:targetSdkVersion="11" android:minSdkVersion="3" />
 
+	<uses-permission android:name="android.permission.INTERNET" />
+	<uses-permission android:name="android.permission.VIBRATE" />
+	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+	<uses-permission android:name="android.permission.WAKE_LOCK" />
+
+	<supports-screens />
+
 	<application
 		android:icon="@drawable/icon"
 		android:label="@string/app_name"
@@ -83,12 +91,4 @@
 			android:value="AEdPqrEAAAAIDlFz9nSUr2g0gSytW0t2cNnYAGHDkptlVohsBA" />
 
 	</application>
-
-	<uses-permission android:name="android.permission.INTERNET" />
-	<uses-permission android:name="android.permission.VIBRATE" />
-	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-	<uses-permission android:name="android.permission.WAKE_LOCK" />
-
-	<supports-screens />
 </manifest>
diff --git a/res/layout/act_colors.xml b/res/layout/act_colors.xml
index a703a8d..625437d 100644
--- a/res/layout/act_colors.xml
+++ b/res/layout/act_colors.xml
@@ -24,7 +24,7 @@
 	android:layout_height="fill_parent">
 
 	<TextView
-		android:text="FG:"
+		android:text="@string/colors_fg"
 		android:layout_height="wrap_content"
 		android:layout_width="wrap_content"
 		android:id="@+id/fg_label"
@@ -47,7 +47,7 @@
 		/>
 
 	<TextView
-		android:text="BG:"
+		android:text="@string/color_bg"
 		android:layout_height="wrap_content"
 		android:layout_width="wrap_content"
 		android:layout_toLeftOf="@+id/bg"
diff --git a/res/layout/act_generatepubkey.xml b/res/layout/act_generatepubkey.xml
index f11fa05..324c125 100644
--- a/res/layout/act_generatepubkey.xml
+++ b/res/layout/act_generatepubkey.xml
@@ -86,9 +86,9 @@
 
 			<EditText
 				android:id="@+id/bits"
+				android:inputType="number"
 				android:layout_height="wrap_content"
 				android:text="1024"
-				android:numeric="integer"
 				android:singleLine="true"
 				android:layout_weight="1" />
 		</TableRow>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 591662d..d76c49e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -465,4 +465,6 @@
 	<string name="color_green">"green"</string>
 	<string name="color_blue">"blue"</string>
 	<string name="color_gray">"gray"</string>
+	<string name="colors_fg">FG:</string>
+	<string name="color_bg">BG:</string>
 </resources>
-- 
cgit v1.2.3