fix regression: missing version, fontsize in settings

Revert "Merge pull request #92 from hashar/jenkins-version"

This reverts commit 2a340b0, reversing
changes made to dd511ed.

AndroidManifest.xml

@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-    android:versionName set by aapt by reading project.properties
--->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="org.wikipedia" android:versionCode="1">
+	package="org.wikipedia" android:versionCode="1" android:versionName="1.0">
 	<supports-screens android:largeScreens="true"
 		android:normalScreens="true" android:smallScreens="true"
 		android:resizeable="true" android:anyDensity="true" />

build.xml

@@ -1,20 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="WikipediaActivity" default="help">
 
-    <!-- Load system environment -->
-    <property environment="env" />
-
-    <!--
-         Eventually override version name according to Jenkins env
-         Else will use version.name from project.properties file
-    -->
-    <condition property="version.name" value="jenkins-${env.BUILD_ID}_#${env.BUILD_NUMBER}">
-        <and>
-            <isset property="env.BUILD_ID" />
-            <isset property="env.BUILD_NUMBER" />
-        </and>
-    </condition>
-
     <!-- The local.properties file is created and updated by the 'android' tool.
          It contains the path to the SDK. It should *NOT* be checked into
          Version Control Systems. -->

project.properties

@@ -1,8 +1,2 @@
 # Project target.
 target=Google Inc.:Google APIs:10
-
-# Application version shown to users
-# This is the version name being passed to aapt for insertion into
-# the AndroidManifest.xml file
-# Note: Jenkins override it with environnement variables, see build.xml
-version.name="1.0"