Explicitly import R.java in Android demo in order to make changing th…

…e app package easier. Change: 140758957
benoitsteiner · Dec 1, 2016 · 4311645 · 4311645
1 parent 3ca795b
commit 4311645
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/tensorflow/examples/android/src/org/tensorflow/demo/CameraActivity.java b/tensorflow/examples/android/src/org/tensorflow/demo/CameraActivity.java
@@ -32,6 +32,7 @@
 import android.widget.Toast;
 import java.nio.ByteBuffer;
 import org.tensorflow.demo.env.Logger;
+import org.tensorflow.demo.R;
 
 public abstract class CameraActivity extends Activity implements OnImageAvailableListener {
   private static final Logger LOGGER = new Logger();
@@ -199,7 +200,7 @@ public void requestRender() {
     }
   }
 
-  public void addCallback(OverlayView.DrawCallback callback) {
+  public void addCallback(final OverlayView.DrawCallback callback) {
     final OverlayView overlay = (OverlayView) findViewById(R.id.overlay);
     if (overlay != null) {
       overlay.addCallback(callback);

diff --git a/tensorflow/examples/android/src/org/tensorflow/demo/CameraConnectionFragment.java b/tensorflow/examples/android/src/org/tensorflow/demo/CameraConnectionFragment.java
@@ -58,6 +58,7 @@
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 import org.tensorflow.demo.env.Logger;
+import org.tensorflow.demo.R;
 
 public class CameraConnectionFragment extends Fragment {
   private static final Logger LOGGER = new Logger();

diff --git a/tensorflow/examples/android/src/org/tensorflow/demo/ClassifierActivity.java b/tensorflow/examples/android/src/org/tensorflow/demo/ClassifierActivity.java
@@ -37,6 +37,7 @@
 import org.tensorflow.demo.env.BorderedText;
 import org.tensorflow.demo.env.ImageUtils;
 import org.tensorflow.demo.env.Logger;
+import org.tensorflow.demo.R;
 
 public class ClassifierActivity extends CameraActivity implements OnImageAvailableListener {
   private static final Logger LOGGER = new Logger();
@@ -224,7 +225,7 @@ public void run() {
     Trace.endSection();
   }
 
-  private void renderDebug(Canvas canvas) {
+  private void renderDebug(final Canvas canvas) {
     if (!isDebug()) {
       return;
     }

diff --git a/tensorflow/examples/android/src/org/tensorflow/demo/DetectorActivity.java b/tensorflow/examples/android/src/org/tensorflow/demo/DetectorActivity.java
@@ -42,6 +42,7 @@
 import org.tensorflow.demo.env.ImageUtils;
 import org.tensorflow.demo.env.Logger;
 import org.tensorflow.demo.tracking.MultiBoxTracker;
+import org.tensorflow.demo.R;
 
 /**
  * An activity that uses a TensorFlowMultiboxDetector and ObjectTracker to detect and then track