Use up to date build targets. Format Manifest according to Android

Guidelines. Remove cruft (we have version control for that).

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9f6cd0438c183dd0e17bca2f7a558ff464035c42..17ccec84d5ffd7b88d236d1f5e644e8c5d008995 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,65 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
- 
- package="com.hughes.android.dictionary"
- 
- android:versionCode="21"
- android:versionName="3.3"
- android:installLocation="auto">
-
- <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="4"/>
- 
-   <!--
-    Because android:minSdkVersion is 3, these parameters default to
-    false, but we need them to be true.
-    See:
-    http://developer.android.com/guide/topics/manifest/supports-screens-element.html
-    -->
-  <supports-screens
-      android:resizeable="true"
-      android:anyDensity="true"
-      android:largeScreens="true"
-      />
-      
-   <!--   android:xlargeScreens="true" />  --> 
-   
-   <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
-
-  <uses-permission android:name="android.permission.INTERNET" />
-  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-
-  <application 
-      android:icon="@drawable/icon"
-      android:label="@string/app_name"
-      android:theme="@style/Theme.Light"
-      android:name=".DictionaryApplication" >
-  
-<!--   
-  android:backupAgent="DictionaryBackupAgent"
-  -->
-
-  <meta-data android:name="com.google.android.backup.api_key"
-      android:value="AEdPqrEAAAAIUa0cU0ZHbBpYXJqm0vVUP5IAjr5D4iUeX7UwiQ" />
-
-  <activity android:name=".DictionaryManagerActivity"
-      android:label="@string/app_name">
-
-    <intent-filter>
-      <action android:name="android.intent.action.MAIN" />
-      <category android:name="android.intent.category.LAUNCHER" />
-    </intent-filter>
-  </activity>
-
-  <activity android:name=".DictionaryActivity" />
-  <activity android:name=".DictionaryEditActivity" />
-  <activity android:name=".AboutActivity" />
-  <activity android:name=".HtmlDisplayActivity" />
-  <activity android:name=".PreferenceActivity" />
-  <activity android:name=".DownloadActivity"
-      android:configChanges="keyboardHidden|orientation"/>
-
- </application>
-
-</manifest> 
\ No newline at end of file
+    package="com.hughes.android.dictionary"
+    android:installLocation="auto"
+    android:versionCode="21"
+    android:versionName="3.3" >
+
+    <uses-sdk
+        android:minSdkVersion="4"
+        android:targetSdkVersion="16" />
+
+    <uses-feature
+        android:name="android.hardware.touchscreen"
+        android:required="false" />
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+    <application
+        android:name=".DictionaryApplication"
+        android:icon="@drawable/icon"
+        android:label="@string/app_name"
+        android:theme="@style/Theme.Light" >
+
+        <meta-data
+            android:name="com.google.android.backup.api_key"
+            android:value="AEdPqrEAAAAIUa0cU0ZHbBpYXJqm0vVUP5IAjr5D4iUeX7UwiQ" />
+
+        <activity
+            android:name=".DictionaryManagerActivity"
+            android:label="@string/app_name" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity android:name=".DictionaryActivity" />
+        <activity android:name=".DictionaryEditActivity" />
+        <activity android:name=".AboutActivity" />
+        <activity android:name=".HtmlDisplayActivity" />
+        <activity android:name=".PreferenceActivity" />
+        <activity
+            android:name=".DownloadActivity"
+            android:configChanges="keyboardHidden|orientation" />
+    </application>
+
+</manifest>
\ No newline at end of file

diff --git a/project.properties b/project.properties
index 9afbeffdf8289b81a519a87a12735e2c2fc595a7..83e83ebd3a5c40cf8a8dde49cf6ccc795b039499 100644 (file)
--- a/project.properties
+++ b/project.properties
@@ -10,5 +10,5 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=android-8
+target=android-16
 android.library.reference.1=../Util