From 6f3c94f33faeeb784c67cce7fda3f9bc261719f8 Mon Sep 17 00:00:00 2001
From: r4ravi2008 <r4ravi2008@gmail.com>
Date: Thu, 12 Nov 2015 14:58:54 -0800
Subject: [PATCH] release-ancha, fix motion tracking permissions

---
 .../javapointcloud/PointCloudActivity.java    |  2 +-
 .../app/src/main/AndroidManifest.xml          |  4 +-
 .../videooverlaysample/MainActivity.java      | 42 ++++++++-----------
 .../app/src/main/res/values/strings.xml       |  4 ++
 4 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/PointCloudJava/app/src/main/java/com/projecttango/experiments/javapointcloud/PointCloudActivity.java b/PointCloudJava/app/src/main/java/com/projecttango/experiments/javapointcloud/PointCloudActivity.java
index 47480820..18065b42 100644
--- a/PointCloudJava/app/src/main/java/com/projecttango/experiments/javapointcloud/PointCloudActivity.java
+++ b/PointCloudJava/app/src/main/java/com/projecttango/experiments/javapointcloud/PointCloudActivity.java
@@ -148,6 +148,7 @@ protected void onResume() {
         try {
             mTango.connect(mConfig);
             mIsTangoServiceConnected = true;
+            setupExtrinsics();
         } catch (TangoOutOfDateException outDateEx) {
             if (mTangoUx != null) {
                 mTangoUx.showTangoOutOfDate();
@@ -156,7 +157,6 @@ protected void onResume() {
             Toast.makeText(getApplicationContext(), R.string.TangoError, Toast.LENGTH_SHORT)
                     .show();
         }
-        setupExtrinsics();
         Log.i(TAG, "onResumed");
     }
 
diff --git a/VideoOverlaySample/app/src/main/AndroidManifest.xml b/VideoOverlaySample/app/src/main/AndroidManifest.xml
index 32a2f2fa..04c2e995 100644
--- a/VideoOverlaySample/app/src/main/AndroidManifest.xml
+++ b/VideoOverlaySample/app/src/main/AndroidManifest.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.projecttango.videooverlaysample"
+    package="com.projecttango.experiments.videooverlaysample"
     android:versionCode="0"
     android:versionName="0" >
 
     <uses-sdk
         android:minSdkVersion="17"
         android:targetSdkVersion="19" />
-     <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.CAMERA" />
 
     <application
         android:allowBackup="true"
diff --git a/VideoOverlaySample/app/src/main/java/com/projecttango/experiments/videooverlaysample/MainActivity.java b/VideoOverlaySample/app/src/main/java/com/projecttango/experiments/videooverlaysample/MainActivity.java
index ea83ca9d..587d4d53 100644
--- a/VideoOverlaySample/app/src/main/java/com/projecttango/experiments/videooverlaysample/MainActivity.java
+++ b/VideoOverlaySample/app/src/main/java/com/projecttango/experiments/videooverlaysample/MainActivity.java
@@ -28,7 +28,9 @@
 import com.google.atap.tangoservice.TangoCameraPreview;
 import com.google.atap.tangoservice.TangoConfig;
 import com.google.atap.tangoservice.TangoCoordinateFramePair;
+import com.google.atap.tangoservice.TangoErrorException;
 import com.google.atap.tangoservice.TangoEvent;
+import com.google.atap.tangoservice.TangoOutOfDateException;
 import com.google.atap.tangoservice.TangoPoseData;
 import com.google.atap.tangoservice.TangoXyzIjData;
 
@@ -48,7 +50,6 @@ public class MainActivity extends Activity {
 	private TangoCameraPreview tangoCameraPreview;
 	private Tango mTango;
 	private boolean mIsConnected;
-	private boolean mIsPermissionGranted;
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -61,33 +62,17 @@ protected void onCreate(Bundle savedInstanceState) {
 		setContentView(tangoCameraPreview);
 	}
 
-	@Override
-	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-		// Check which request we're responding to
-		if (requestCode == Tango.TANGO_INTENT_ACTIVITYCODE) {
-			// Make sure the request was successful
-			if (resultCode == RESULT_CANCELED) {
-				Toast.makeText(this, "Motion Tracking Permissions Required!",
-						Toast.LENGTH_SHORT).show();
-				finish();
-			} else {
-				startCameraPreview();
-				mIsPermissionGranted = true;
-			}
-		}
-	}
-
 	// Camera Preview
 	private void startCameraPreview() {
-	    // Connect to color camera
+		// Connect to color camera
 		tangoCameraPreview.connectToTangoCamera(mTango,
 				TangoCameraIntrinsics.TANGO_CAMERA_COLOR);
 		// Use default configuration for Tango Service.
 		TangoConfig config = mTango.getConfig(TangoConfig.CONFIG_TYPE_DEFAULT);
 		mTango.connect(config);
 		mIsConnected = true;
-		
-		// No need to add any coordinate frame pairs since we are not using 
+
+		// No need to add any coordinate frame pairs since we are not using
 		// pose data. So just initialize.
 		ArrayList<TangoCoordinateFramePair> framePairs = new ArrayList<TangoCoordinateFramePair>();
 		mTango.connectListener(framePairs, new OnTangoUpdateListener() {
@@ -98,9 +83,9 @@ public void onPoseAvailable(TangoPoseData pose) {
 
 			@Override
 			public void onFrameAvailable(int cameraId) {
-			    
-			    // Check if the frame available is for the camera we want and
-			    // update its frame on the camera preview.
+
+				// Check if the frame available is for the camera we want and
+				// update its frame on the camera preview.
 				if (cameraId == TangoCameraIntrinsics.TANGO_CAMERA_COLOR) {
 					tangoCameraPreview.onFrameAvailable();
 				}
@@ -131,8 +116,15 @@ protected void onPause() {
 	@Override
 	protected void onResume() {
 		super.onResume();
-		if (!mIsConnected && mIsPermissionGranted) {
-			startCameraPreview();
+		try {
+			if (!mIsConnected) {
+				startCameraPreview();
+			}
+		} catch (TangoOutOfDateException e) {
+			Toast.makeText(getApplicationContext(), R.string.TangoOutOfDateException,
+					Toast.LENGTH_SHORT).show();
+		} catch (TangoErrorException e) {
+			Toast.makeText(getApplicationContext(), R.string.TangoError, Toast.LENGTH_SHORT).show();
 		}
 	}
 }
diff --git a/VideoOverlaySample/app/src/main/res/values/strings.xml b/VideoOverlaySample/app/src/main/res/values/strings.xml
index b07f29a0..db77ac82 100644
--- a/VideoOverlaySample/app/src/main/res/values/strings.xml
+++ b/VideoOverlaySample/app/src/main/res/values/strings.xml
@@ -4,5 +4,9 @@
     <string name="app_name">VideoOverlaySample</string>
     <string name="hello_world">Hello world!</string>
     <string name="action_settings">Settings</string>
+    <string name="TangoError">"Tango exception! Try again!"</string>
+    <string name="TangoOutOfDateException">"Tango service outdated!"</string>
+    <string name="resetmotiontracking">"Reset motion tracking"</string>
+    <string name="motiontrackingpermission">"Motion Tracking permission needed!"</string>
 
 </resources>