aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Android/.classpath6
-rw-r--r--Android/AndroidManifest.xml8
-rw-r--r--Android/gen/org/mysociety/FixMyStreet/R.java7
-rw-r--r--Android/project.properties2
-rw-r--r--Android/res/menu/activity_main.xml2
-rw-r--r--Android/res/values-v11/styles.xml2
-rw-r--r--Android/res/values-v14/styles.xml2
7 files changed, 11 insertions, 18 deletions
diff --git a/Android/.classpath b/Android/.classpath
index bc7a6b5..ce299ea 100644
--- a/Android/.classpath
+++ b/Android/.classpath
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
- <classpathentry kind="lib" path="libs/cordova-2.2.0.jar"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="gen"/>
+ <classpathentry kind="lib" path="libs/cordova-2.5.0.jar"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
diff --git a/Android/AndroidManifest.xml b/Android/AndroidManifest.xml
index d28759a..4d8ddf2 100644
--- a/Android/AndroidManifest.xml
+++ b/Android/AndroidManifest.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.mysociety.FixMyStreet"
- android:versionCode="6"
- android:versionName="1.0.4" >
+ android:versionCode="7"
+ android:versionName="1.9" >
<uses-sdk
android:minSdkVersion="7"
@@ -28,11 +28,11 @@
<application
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
- android:theme="@style/AppTheme" android:allowBackup="true">
+ android:allowBackup="true">
<activity
android:name=".AndroidActivity"
android:label="@string/title_activity_main"
- android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale" android:screenOrientation="portrait">
+ android:screenOrientation="portrait">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
diff --git a/Android/gen/org/mysociety/FixMyStreet/R.java b/Android/gen/org/mysociety/FixMyStreet/R.java
index dd255ce..0c8d263 100644
--- a/Android/gen/org/mysociety/FixMyStreet/R.java
+++ b/Android/gen/org/mysociety/FixMyStreet/R.java
@@ -15,13 +15,13 @@ public final class R {
public static final int ic_launcher=0x7f020001;
}
public static final class id {
- public static final int menu_settings=0x7f080000;
+ public static final int menu_settings=0x7f070000;
}
public static final class layout {
public static final int activity_main=0x7f030000;
}
public static final class menu {
- public static final int activity_main=0x7f070000;
+ public static final int activity_main=0x7f060000;
}
public static final class string {
public static final int app_name=0x7f050001;
@@ -29,9 +29,6 @@ public final class R {
public static final int menu_settings=0x7f050002;
public static final int title_activity_main=0x7f050003;
}
- public static final class style {
- public static final int AppTheme=0x7f060000;
- }
public static final class xml {
public static final int config=0x7f040000;
}
diff --git a/Android/project.properties b/Android/project.properties
index 9b84a6b..85aac54 100644
--- a/Android/project.properties
+++ b/Android/project.properties
@@ -11,4 +11,4 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
-target=android-16
+target=android-8
diff --git a/Android/res/menu/activity_main.xml b/Android/res/menu/activity_main.xml
index cfc10fd..6b30180 100644
--- a/Android/res/menu/activity_main.xml
+++ b/Android/res/menu/activity_main.xml
@@ -2,5 +2,5 @@
<item android:id="@+id/menu_settings"
android:title="@string/menu_settings"
android:orderInCategory="100"
- android:showAsAction="never" />
+ />
</menu>
diff --git a/Android/res/values-v11/styles.xml b/Android/res/values-v11/styles.xml
index d408cbc..6b30d8d 100644
--- a/Android/res/values-v11/styles.xml
+++ b/Android/res/values-v11/styles.xml
@@ -1,5 +1,3 @@
<resources>
- <style name="AppTheme" parent="android:Theme.Holo.Light" />
-
</resources> \ No newline at end of file
diff --git a/Android/res/values-v14/styles.xml b/Android/res/values-v14/styles.xml
index 1c089a7..6b30d8d 100644
--- a/Android/res/values-v14/styles.xml
+++ b/Android/res/values-v14/styles.xml
@@ -1,5 +1,3 @@
<resources>
- <style name="AppTheme" parent="android:Theme.Holo.Light.DarkActionBar" />
-
</resources> \ No newline at end of file