msg555 · hennyb · Feb 19, 2014 · Feb 20, 2014 · Feb 20, 2014 · Mar 1, 2014
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -1,93 +1,123 @@
 <?xml version="1.1" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="edu.umich.PowerTutor"
-      android:versionCode="15" android:versionName="1.5">
-  <application android:icon="@drawable/icon" android:label="@string/app_name">
-    <activity android:name=".ui.UMLogger"
-              android:label="@string/app_name"
-              android:screenOrientation="portrait" >
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-        <category android:name="android.intent.category.LAUNCHER" />
-      </intent-filter>
-    </activity>
-    <activity android:name=".ui.Help" >
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-      </intent-filter>
-    </activity>
-    <activity android:name=".ui.PowerViewer" >
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-      </intent-filter>
-    </activity>
-    <activity android:name=".ui.PowerTop"
-              android:label="Power Top" >
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-      </intent-filter>
-    </activity>
-    <activity android:name=".ui.PowerPie" >
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-      </intent-filter>
-    </activity>
-    <activity android:name=".ui.MiscView" >
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-      </intent-filter>
-    </activity>
-    <activity android:name=".ui.PowerTabs"
-              android:theme="@android:style/Theme.NoTitleBar">
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-      </intent-filter>
-    </activity>
-    <activity android:name=".ui.EditPreferences"
-              android:label="PowerTutor Options">
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-      </intent-filter>
-    </activity>
-    <activity android:name=".ui.ViewerPreferences"
-              android:label="PowerTutor History Options">
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-      </intent-filter>
-    </activity>
-    <activity android:name=".widget.Configure"
-              android:label="Configure PowerTutor Widget" >
-      <intent-filter>
-        <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
-      </intent-filter>
-    </activity>
-    <activity android:name=".widget.DataSourceConfigure"
-              android:label="Configure Data Source">
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-      </intent-filter>
-    </activity>
-    <receiver android:name=".ui.StartupReceiver">
-      <intent-filter>
-        <action android:name="android.intent.action.BOOT_COMPLETED" />
-        <category android:name="android.intent.category.HOME" />
-      </intent-filter>
-    </receiver>
-    <service android:name=".service.UMLoggerService"></service>
-    <receiver android:name=".widget.PowerWidget" >
-      <intent-filter>
-          <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-      </intent-filter>
-      <meta-data android:name="android.appwidget.provider"
-                 android:resource="@xml/widget_info" />
-      </receiver>
-  </application>
+    package="com.henny.PowerTutor2"
+    android:versionCode="19"
+    android:versionName="2" >
 
-  <uses-sdk android:minSdkVersion="3" />
-  <uses-permission android:name="android.permission.INTERNET" />
-  <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-  <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-  <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-  <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-</manifest> 
+    <application
+        android:icon="@drawable/icon"
+        android:label="@string/app_name" >
+        <meta-data
+            android:name="com.google.android.gms.version"
+            android:value="@integer/google_play_services_version" />
+
+        <activity
+            android:name="com.henny.PowerTutor2.ui.UMLogger"
+            android:label="@string/app_name"
+            android:screenOrientation="portrait" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity android:name="com.henny.PowerTutor2.ui.Help" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
+        <activity android:name="com.henny.PowerTutor2.ui.PowerViewer" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="com.henny.PowerTutor2.ui.PowerTop"
+            android:label="Power Top" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
+        <activity android:name="com.henny.PowerTutor2.ui.PowerPie" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
+        <activity android:name="com.henny.PowerTutor2.ui.MiscView" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="com.henny.PowerTutor2.ui.PowerTabs"
+            android:theme="@android:style/Theme.NoTitleBar" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="com.henny.PowerTutor2.ui.EditPreferences"
+            android:label="PowerTutor Options" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="com.henny.PowerTutor2.ui.ViewerPreferences"
+            android:label="PowerTutor History Options" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="com.henny.PowerTutor2.widget.Configure"
+            android:label="Configure PowerTutor Widget" >
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="com.henny.PowerTutor2.widget.DataSourceConfigure"
+            android:label="Configure Data Source" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="com.google.android.gms.ads.AdActivity"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize" />
+
+        <receiver android:name="com.henny.PowerTutor2.ui.StartupReceiver" >
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+
+                <category android:name="android.intent.category.HOME" />
+            </intent-filter>
+        </receiver>
+
+        <service android:name="com.henny.PowerTutor2.service.UMLoggerService" >
+        </service>
+
+        <receiver android:name="com.henny.PowerTutor2.widget.PowerWidget" >
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/widget_info" />
+        </receiver>
+        <activity android:name="com.purplebrain.adbuddiz.sdk.AdBuddizActivity" 
+               android:theme="@android:style/Theme.Translucent" />
+    </application>
+
+    <uses-sdk android:minSdkVersion="9" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+</manifest>
diff --git a/README b/README
@@ -2,9 +2,7 @@ PowerTutor Project
 
 Model based power mobile power estimator by application
 
-Contact: [email protected]
-
-Website: http://powertutor.org
+Contact: [email protected]
 
 This package includes the PowerTutor source code.  The code responsible for
 uploading logs to our remote server has been removed and replaced by a stub that

diff --git a/libs/android-support-v4.jar b/libs/android-support-v4.jar
diff --git a/libs/google-play-services_lib/.classpath b/libs/google-play-services_lib/.classpath
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>
diff --git a/libs/google-play-services_lib/.gitignore b/libs/google-play-services_lib/.gitignore
@@ -0,0 +1,19 @@
+# files for the dex VM
+*.dex
+
+# Java class files
+*.class
+
+# generated files
+bin/
+gen/
+
+# Ignore gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
diff --git a/libs/google-play-services_lib/.project b/libs/google-play-services_lib/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>google-play-services_lib</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/libs/google-play-services_lib/.settings/org.eclipse.jdt.core.prefs b/libs/google-play-services_lib/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/libs/google-play-services_lib/AndroidManifest.xml b/libs/google-play-services_lib/AndroidManifest.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.google.android.gms"
+    android:versionCode="4030530"
+    android:versionName="4.0.30 (889083-30)" >
+
+    <uses-sdk android:minSdkVersion="8"/>
+
+</manifest>
diff --git a/libs/google-play-services_lib/README.txt b/libs/google-play-services_lib/README.txt
@@ -0,0 +1,17 @@
+Library Project including Google Play services client jar.
+
+This can be used by an Android project to use the API's provided
+by Google Play services.
+
+There is technically no source, but the src folder is necessary
+to ensure that the build system works. The content is actually
+located in the libs/ directory.
+
+
+USAGE:
+
+Make sure you import this Android library project into your IDE
+and set this project as a dependency.
+
+Note that if you use proguard, you will want to include the
+options from proguard.txt in your configuration.
diff --git a/libs/google-play-services_lib/libs/google-play-services.jar b/libs/google-play-services_lib/libs/google-play-services.jar
diff --git a/libs/google-play-services_lib/libs/google-play-services.jar.properties b/libs/google-play-services_lib/libs/google-play-services.jar.properties
@@ -0,0 +1 @@
+doc=../../../docs/reference
diff --git a/libs/google-play-services_lib/proguard.txt b/libs/google-play-services_lib/proguard.txt
@@ -0,0 +1,20 @@
+-keep class * extends java.util.ListResourceBundle {
+    protected Object[][] getContents();
+}
+
+# Keep SafeParcelable value, needed for reflection. This is required to support backwards
+# compatibility of some classes.
+-keep public class com.google.android.gms.common.internal.safeparcel.SafeParcelable {
+    public static final *** NULL;
+}
+
+# Keep the names of classes/members we need for client functionality.
+-keepnames @com.google.android.gms.common.annotation.KeepName class *
+-keepclassmembernames class * {
+    @com.google.android.gms.common.annotation.KeepName *;
+}
+
+# Needed for Parcelable/SafeParcelable Creators to not get stripped
+-keepnames class * implements android.os.Parcelable {
+    public static final ** CREATOR;
+}
diff --git a/libs/google-play-services_lib/project.properties b/libs/google-play-services_lib/project.properties
@@ -0,0 +1,15 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-8
+android.library=true
diff --git a/libs/google-play-services_lib/res/color/common_signin_btn_text_dark.xml b/libs/google-play-services_lib/res/color/common_signin_btn_text_dark.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_pressed="true"
+        android:color="@color/common_signin_btn_dark_text_pressed" />
+    <item
+        android:state_enabled="false"
+        android:state_focused="true"
+        android:color="@color/common_signin_btn_dark_text_disabled" />
+    <item
+        android:state_focused="true"
+        android:color="@color/common_signin_btn_dark_text_focused" />
+    <item
+        android:state_enabled="false"
+        android:color="@color/common_signin_btn_dark_text_disabled" />
+    <item
+        android:color="@color/common_signin_btn_dark_text_default" />
+</selector>