changes necessary for using apphance

johnnylambada · May 23, 2012 · 235ac04 · 235ac04
1 parent 724876a
commit 235ac04
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 8 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -5,22 +5,39 @@
     android:versionName="1.0" >
 
     <uses-sdk android:minSdkVersion="8" />
-
+
+    <!-- apphance -->
+    <uses-permission android:name="android.permission.INTERNET" />
+	<uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <!-- apphance (not required) -->
+	<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+	<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+	<uses-permission android:name="android.permission.BLUETOOTH" />
+
     <application
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name" 
         >
-        <activity
+        <activity android:name=".WorldMapActivity"
-            android:name=".WorldMapActivity"
             android:label="@string/app_name" 
             android:screenOrientation="landscape"
             >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+    	<!-- apphance -->
+        <activity android:name="com.apphance.android.ui.LoginActivity" 
+            android:configChanges="orientation"
+			android:launchMode="singleInstance" />
+		<activity android:name="com.apphance.android.ui.ProblemActivity" 
+		    android:configChanges="orientation" 
+		    android:launchMode="singleInstance" />
+
     </application>
 
 </manifest>
diff --git a/apphance-task.txt b/apphance-task.txt
@@ -0,0 +1 @@
+574846bd9bd4cfa59623e7fbbb1c6d6b3f342a6a
diff --git a/libs/apphance-android-library-1.5.jar b/libs/apphance-android-library-1.5.jar
diff --git a/src/com/sigseg/android/view/InputStreamScene.java b/src/com/sigseg/android/view/InputStreamScene.java
@@ -9,7 +9,8 @@
 import android.graphics.Canvas;
 import android.graphics.Point;
 import android.graphics.Rect;
-import android.util.Log;
+
+import com.apphance.android.Log;
 
 public class InputStreamScene extends Scene {
 	private static final String TAG="InputStreamScene";

diff --git a/src/com/sigseg/android/view/Scene.java b/src/com/sigseg/android/view/Scene.java
@@ -5,7 +5,8 @@
 import android.graphics.Canvas;
 import android.graphics.Point;
 import android.graphics.Rect;
-import android.util.Log;
+
+import com.apphance.android.Log;
 
 /*
  * +-------------------------------------------------------------------+

diff --git a/src/com/sigseg/android/worldmap/WorldMapActivity.java b/src/com/sigseg/android/worldmap/WorldMapActivity.java
@@ -4,20 +4,25 @@
 import android.graphics.Point;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.util.Log;
 import android.view.Window;
 import android.view.WindowManager;
 
+import com.apphance.android.Apphance;
+import com.apphance.android.Log;
+
 public class WorldMapActivity extends Activity {
 	private static final String TAG = "WorldMapActivity";
 	private static final String KEY_POINT = "POINT";
 
+	public static final String APPHANCE_KEY = "574846bd9bd4cfa59623e7fbbb1c6d6b3f342a6a";
+
 	private WorldView worldView;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         Log.d(TAG,"onCreate()");
+        Apphance.startNewSession(this, APPHANCE_KEY , Apphance.Mode.Silent);
         // Hide the window title.
         requestWindowFeature(Window.FEATURE_NO_TITLE);
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);

diff --git a/src/com/sigseg/android/worldmap/WorldView.java b/src/com/sigseg/android/worldmap/WorldView.java
@@ -7,14 +7,14 @@
 import android.graphics.Canvas;
 import android.graphics.Point;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.GestureDetector;
 import android.view.GestureDetector.OnGestureListener;
 import android.view.MotionEvent;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import android.widget.Scroller;
 
+import com.apphance.android.Log;
 import com.sigseg.android.view.InputStreamScene;
 
 public class WorldView extends SurfaceView implements SurfaceHolder.Callback, OnGestureListener{