kevinkong · CyndiQ · Feb 4, 2013 · Feb 5, 2013 · Feb 5, 2013 · Feb 5, 2013
diff --git a/.classpath b/.classpath
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry kind="lib" path="libs/activation.jar"/>
+	<classpathentry kind="lib" path="libs/mail.jar"/>
+	<classpathentry kind="lib" path="libs/additionnal.jar"/>
+	<classpathentry kind="lib" path="libs/android-support-v4.jar"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<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 exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry kind="lib" path="libs/commons-io-2.5.jar"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,13 @@
+## The problem
+
+Describe the issue you are experiencing, or features you want. 
+
+## Environment
+
+* Emmagee version
+* Device Information: **Brand**, **Model**, **System**.
+
+## Link to Emmagee logs
+
+Create a [GIST](https://gist.github.com) which is a paste of your _full_ Emmagee logs, and link them here. 
+Do _NOT_ paste your full Emmagee logs here, as it will make this issue very long and hard to read! 
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,19 @@
+# built application files
+*.apk
+*.ap_
+
+# files for the dex VM
+*.dex
+
+# Java class files
+*.class
+
+# generated files
+bin/
+gen/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+lint.xml
+.DS_Store
diff --git a/AUTHORS b/AUTHORS
@@ -1,2 +1,3 @@
 * KevinKong <[email protected]> <weibo:@孔庆云Kevin> <github:kevinkong>
 * andrewleo <[email protected]> <weibo:@A_o11> <github:andrewleo>
+* bingoHuang <[email protected]> <weibo:@黄庆兵> <github:bingoHuang>
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -1,42 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.netease.qa.emmagee"
-    android:versionCode="1"
-    android:versionName="1.0" >
+    android:versionCode="34"
+    android:versionName="2.5.1" >
 
-    <uses-sdk android:minSdkVersion="7" />
-    <application android:name=".utils.MyApplication"
+    <uses-sdk android:minSdkVersion="8" />
+
+    <application
+        android:name=".utils.MyApplication"
         android:icon="@drawable/icon"
-        android:label="@string/app_name" >
+        android:label="@string/app_name"
+        android:theme="@android:style/Theme.NoTitleBar" >
         <activity
             android:name=".activity.MainPageActivity"
-            android:label="@string/app_name"
-            android:configChanges="orientation|keyboardHidden">   <!-- 防止程序横屏以后重新启动 -->
+            android:configChanges="orientation|keyboardHidden"
+            android:launchMode="singleInstance"
+            android:screenOrientation="portrait" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <!-- <category android:name="android.intent.category.DEFAULT" /> -->
-                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".activity.SystemActivity"
-            android:label="@string/app_name2" >
-        </activity>
-
         <activity
             android:name=".activity.SettingsActivity"
-            android:label="@string/app_name4" >
-        </activity>
+            android:launchMode="singleInstance"
+            android:screenOrientation="portrait"
+            android:theme="@style/customTheme" />
+        <activity
+            android:name=".activity.AboutActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".activity.MailSettingsActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".activity.TestListActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".activity.TestReportActivity"
+            android:screenOrientation="portrait" />
 
-         <service 
-            android:name="com.netease.qa.emmagee.service.EmmageeService">
-        </service>
+        <service android:name="com.netease.qa.emmagee.service.EmmageeService" />
     </application>
+
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
-    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> 
-    <uses-permission android:name="android.permission.READ_LOGS"/>
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
-    <uses-permission android:name="android.permission.WAKE_LOCK"/>
+    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_LOGS" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.GET_TASKS" />
+
 </manifest>

diff --git a/README.md b/README.md
@@ -1,57 +1,78 @@
-##Emmagee - a practical, handy performance test tool for specified Android App
-
-Emmagee is a practical, handy performance test tool for specified Android App, which can monitor CPU, memory and 
-network traffic. Additionally, it also provides several cool features such as customizing interval of collecting data,
-rendering real-time process status in a floating window, and much more.
-
- * Homepage: 
- * Wiki: 
- * Issues: 
- * Tags: Android, Java 
-
-## Features
-
-* Process-specific monitoring 
-* Real-time data displaying
-* User-defined collecting interval
-
-## Why should I use Emmagee?
-
-Unlike other performance test tools that only do system-level monitoring, Emmagee provides the ability to monitor any single App. Other advantages that
-you should not miss:
-* Open source
-* Easy to use
-* Floating window rendering real-time process status  
-* CSV format report that can be converted into any other format you want
-* Fully support Android 2.2 and above
-
-## How to use Emmagee?
-
-1. Start Emmagee App
-2. Configure interval
-3. Select a target process 
-4. Click Start button
-
-And Enjoy!
-
-If you want to stop the test, just go back to Emmagee and click Stop button.
-
-## Contributors
-* NetEase, Inc.
-
-## License
-(The Apache License)
-
-Copyright (c) 2012-2013 NetEase, Inc. and other contributors
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+## Emmagee - a practical, handy performance test tool for specified Android App
+
+Emmagee is a practical, handy performance test tool for specified Android App, which can monitor CPU, memory, 
+network traffic, battery current and status([Some devices are not supported](https://github.com/NetEase/Emmagee/wiki/Some-devices-are-not-supported)), new features such as top activity and heap size if rooted([Root Toast may continously show](https://github.com/NetEase/Emmagee/wiki/FAQ)), are also supported in the [latest version](https://github.com/NetEase/Emmagee/releases). Additionally, it also provides several cool features such as customizing interval of collecting data,
+rendering real-time process status in a floating window, and much more.
+
+ * Homepage: https://github.com/NetEase/Emmagee
+ * Wiki: https://github.com/NetEase/Emmagee/wiki
+ * Issues: https://github.com/NetEase/Emmagee/issues
+ * FAQ: https://github.com/NetEase/Emmagee/wiki/FAQ
+ * Tags: Android, Java 
+
+<img src="https://github.com/andrewleo/pictures/blob/master/Emmagee/V2.0/homepage.png" width="180px" />&nbsp;<img src="https://github.com/andrewleo/pictures/blob/master/Emmagee/V2.0/settings.png" width="180px" />&nbsp;<img src="https://github.com/andrewleo/pictures/blob/master/Emmagee/V2.0/mailsettings.png" width="180px" />
+
+## Why should I use Emmagee?
+
+Unlike most other performance test tools that only do system-level monitoring, Emmagee provides the ability to monitor any single App. Other advantages that
+you should not miss:
+* Open source
+* Easy to use
+* Process-specific monitoring, including CPU, memory, network traffic, battery current, launching time and status
+* Floating window that renders real-time process status
+* CSV format report that can be converted into any other format you want
+* User-defined collecting interval
+* Fully support Android 2.2 and above
+
+## How to use Emmagee?
+
+First of all ,you should have Emmagee.apk,download [here](https://github.com/NetEase/Emmagee/releases) or 
+build the apk file youself [here](https://github.com/NetEase/Emmagee/wiki/How-to-build-emmage.apk%3F),then :
+
+1. Start Emmagee App
+2. Configure interval
+3. Select a target process 
+4. Click Start button
+
+And Enjoy!
+
+If you want to stop the test, just go back to Emmagee and click Stop button.
+
+## Android 5.0 and above
+
+* `Android 5.0 and above`: getRunningTasks() and getRunningAppProcesses() are deprecated and only return your application process, so it is unable to get TopActivity from Android 5.0.
+* `Android 7.0`: Google has restricted access to /proc, and also can not get pid of target application from TOP command in Android 7.0, I am so sorry to tell that 7.0 can not be supported.
+
+## Coming Soon
+* We want you to decide!
+
+## How to Contribute?
+
+You are welcome to contribute to Emmagee, meanwhile you'd better follow the rules below
+
+* It's *NOT* recommended to submit a pull request directly to Emmagee's `master` branch. `develop` branch is more appropriate
+* Follow common Java coding conventions
+* Put all Java class files under *com.netease* package
+* Add the following [license](#license) in each Java class file
+
+## Contributors
+* NetEase, Inc.
+* [yrom](https://github.com/yrom)
+* [LukeOwncloud](https://github.com/LukeOwncloud)
+
+## License
+(The Apache License)
+
+Copyright (c) 2012-2015 NetEase, Inc. and other contributors
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.1.0
+2.4
diff --git a/apk/Emmagee.apk b/apk/Emmagee.apk
diff --git a/build.xml b/build.xml
diff --git a/changelog.md b/changelog.md
@@ -0,0 +1,44 @@
+Emmagee Changelog
+
+###2.0 (2014-9-22)
+New Features:
+* Optimization of UI
+* I18N support(Chinese Simplified and English)
+* Collect usage of each CPU cores
+
+Issues Fixed:
+* #16 'Save' button is covered when soft keyboard pops up
+* #20 Strings hard-coded for language
+* #21 CSV report enhancement
+* #24 Floating window disappears on some specific devices
+* #25 Report unavailable path of CSV when test is over
+* #26 Dulplicated toast when test is over
+
+###1.3.0 (2014-1-6)
+New Features:
+* Integrate monitoring of app starting time
+
+Issues fixed
+* #12 Add "stop test" button on floating window
+* #13 Optimize interface and user experience
+
+###1.2.1 (2013-11-25)
+Issues fixed:
+* #10 The CSV report displays abnormally when free memory is above 1000.
+
+Improvements to :
+* #9 List the application with alphabet order.
+
+###1.2.0 (2013-9-17)
+* Support quad-core CPU
+* Integrate monitoring of battery current and status
+
+###1.1.0 (2013-4-8)
+* Configure specified recipients to receive test reports
+* Automaticly save the result when monitoring app stops
+
+###1.0.0 (2013-1-18)
+* Process-specific monitoring
+* Floating window that renders real-time process status
+* CSV format report that can be converted into any other format you want
+* User-defined collecting interval