aboutsummaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2016-11-15 12:14:48 -0800
committerEino-Ville Talvala <etalvala@google.com>2016-11-15 12:14:48 -0800
commitb204ebf856e344548ba42e5f8b9893e557208813 (patch)
tree946964a6672671cd47c5d5c1ba5972503fda1452 /apps
parentb176d2013070d522361d34ad6c83358b82b2191b (diff)
downloadpdk-b204ebf856e344548ba42e5f8b9893e557208813.tar.gz
Enable running on old API levels; add shutter sound disable output
- To ensure we can run TestingCamera on pre-N devices, add minimum SDK level - Add missing CameraInfo parameter into InfoDialog, for shutter sound enforcement. Test: Run application, verify disable info is available Change-Id: Ic414db59b449a95c4fb9cf6aaf978844ebbf4edd
Diffstat (limited to 'apps')
-rw-r--r--apps/TestingCamera/Android.mk1
-rw-r--r--apps/TestingCamera/src/com/android/testingcamera/InfoDialogFragment.java3
2 files changed, 4 insertions, 0 deletions
diff --git a/apps/TestingCamera/Android.mk b/apps/TestingCamera/Android.mk
index 9b9129a..80a51b4 100644
--- a/apps/TestingCamera/Android.mk
+++ b/apps/TestingCamera/Android.mk
@@ -22,6 +22,7 @@ LOCAL_MODULE_TAGS := optional
LOCAL_SDK_VERSION := current
+LOCAL_MIN_SDK_VERSION := 19
LOCAL_SRC_FILES := \
$(call all-java-files-under, src) \
diff --git a/apps/TestingCamera/src/com/android/testingcamera/InfoDialogFragment.java b/apps/TestingCamera/src/com/android/testingcamera/InfoDialogFragment.java
index 9499778..8a3af39 100644
--- a/apps/TestingCamera/src/com/android/testingcamera/InfoDialogFragment.java
+++ b/apps/TestingCamera/src/com/android/testingcamera/InfoDialogFragment.java
@@ -53,6 +53,9 @@ public class InfoDialogFragment extends DialogFragment implements View.OnClickLi
b.append(cameraInfo.facing == CameraInfo.CAMERA_FACING_FRONT ? "FRONT\n" : "BACK\n");
b.append(" Orientation: ");
b.append(cameraInfo.orientation);
+ b.append("\n");
+ b.append(" Can disable shutter sound: ");
+ b.append(cameraInfo.canDisableShutterSound);
b.append("\n\n");
b.append("getParameters() output:\n ");
Camera.Parameters p = camera.getParameters();