Merge pull request #987 from wxuanguang/master

#89 #90 #95 #165 已完成全部实验
hzuapps · Jun 17, 2016 · 3472e7c · 3472e7c
2 parents 25d2078 + 61201eb
commit 3472e7c
Show file tree

Hide file tree

Showing 8 changed files with 469 additions and 52 deletions.
diff --git a/app/src/main/java/edu/hzuapps/androidworks/homeworks/com1314080901135/AndroidManifest.xml b/app/src/main/java/edu/hzuapps/androidworks/homeworks/com1314080901135/AndroidManifest.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="net.baisoft.stopwatch"
+      android:versionCode="1"
+      android:versionName="1.0">
+    <application android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="true" >
+        <activity android:name=".MainActivity"
+                  android:label="@string/app_name"
+                  android:screenOrientation="portrait"
+                  android:windowSoftInputMode="stateHidden">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+    </application>
+    <uses-sdk android:minSdkVersion="4" />
+
+</manifest> 
diff --git a/...in/java/edu/hzuapps/androidworks/homeworks/com1314080901135/Com1314080901135Activity.java b/...in/java/edu/hzuapps/androidworks/homeworks/com1314080901135/Com1314080901135Activity.java