Merge pull request #19 from Shao-Feng/android_service

Enable tinyweb running in android service

Author: Shao-Feng

.travis.yml

@@ -2,8 +2,8 @@ language: android
 jdk: oraclejdk7
 android:
   components:
-  - build-tools-19.1.0
-  - android-19
+  - build-tools-21.0.1
+  - android-21
   - extra
 before_script:
 - sudo apt-get update

android/AndroidManifest.xml

@@ -7,26 +7,34 @@
     <uses-sdk
         android:minSdkVersion="8"
         android:targetSdkVersion="19" />
-    <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"/>
+
+    <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" />
+
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
 
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:launchMode="singleTask" >
         <activity
-            android:name="com.intel.tinywebtestservice.FullscreenActivity"
+            android:name=".FullscreenActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
-            android:label="@string/app_name"
-            android:theme="@style/FullscreenTheme" >
+            android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+        <service
+            android:name=".TinywebService"
+            android:enabled="true"
+            android:exported="true" >
+        </service>
     </application>
 
 </manifest>

android/build.gradle

@@ -4,7 +4,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.3'
+        classpath 'com.android.tools.build:gradle:1.3.0'
     }
 }
 
@@ -23,8 +23,8 @@ android {
             assets.srcDirs = ['assets']
         }
     }
-    compileSdkVersion 19
-    buildToolsVersion "19.1.0"
+    compileSdkVersion 21
+    buildToolsVersion "21.0.1"
 
     if (multiarch) {
         productFlavors {
@@ -55,3 +55,8 @@ android {
         abortOnError false
     }
 }
+
+dependencies {
+    compile 'com.android.support:appcompat-v7:22.1.1'
+}
+

android/gradle.properties

@@ -0,0 +1,5 @@
+#systemProp.http.proxyHost=child-prc.intel.com
+#systemProp.http.proxyPort=913
+#systemProp.https.proxyHost=child-prc.intel.com
+#systemProp.https.proxyPort=913
+android.useDeprecatedNdk=true

android/res/drawable/ic_launcher.png

@@ -31,7 +31,6 @@
 
         <LinearLayout
             android:id="@+id/fullscreen_content_controls"
-            style="?buttonBarStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|center_horizontal"
@@ -40,23 +39,20 @@
             tools:ignore="UselessParent" >
             <Button
                 android:id="@+id/start_button"
-                style="?buttonBarButtonStyle"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:text="@string/start_button" 
-                android:onClick="startService"/>
+                android:onClick="startTinywebService"/>
             <Button
                 android:id="@+id/stop_button"
-                style="?buttonBarButtonStyle"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:text="@string/stop_button" 
-                android:onClick="stopService"/>
+                android:onClick="stopTinywebService"/>
             <Button
                 android:id="@+id/refresh_button"
-                style="?buttonBarButtonStyle"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"