diff options
author | Andrew Harp <andrewharp@google.com> | 2016-12-01 11:52:14 -0800 |
---|---|---|
committer | TensorFlower Gardener <gardener@tensorflow.org> | 2016-12-01 12:02:42 -0800 |
commit | 431164534d382dda73581f22fb2a699cdba0b54f (patch) | |
tree | dcb60205d588fae7115769bac0fed3fc2b7e6ef0 | |
parent | 3ca795bc7ffad431a69c1f55401562e53eb6df1a (diff) |
Explicitly import R.java in Android demo in order to make changing the app package easier.
Change: 140758957
4 files changed, 6 insertions, 2 deletions
diff --git a/tensorflow/examples/android/src/org/tensorflow/demo/CameraActivity.java b/tensorflow/examples/android/src/org/tensorflow/demo/CameraActivity.java index e9e370699d..52d493d0f4 100644 --- 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.view.WindowManager; 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 abstract class CameraActivity extends Activity implements OnImageAvailabl } } - 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 index 2e09e78b8a..85df16c3c3 100644 --- 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.List; 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 index 3e3a3407fb..5985010a4f 100644 --- 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.OverlayView.DrawCallback; 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 class ClassifierActivity extends CameraActivity implements OnImageAvailab 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 index d75136485a..309cbbdee6 100644 --- 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.BorderedText; 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 |