diff options
| author | Andy Huibers <andyhuibers@google.com> | 2014-06-24 17:38:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-24 17:38:47 +0000 |
| commit | 4a0042759b9521bf36dc0d8576a628f4a29b2bb5 (patch) | |
| tree | 42842bf23e3ebc0a92709b1aec53798f8d484c83 /src/com/android/camera/VideoModule.java | |
| parent | d3580417d6347c52c35b008bf9e333c08b771e8e (diff) | |
| parent | b7c7d9a067cd52a27cfbaf0714a2074f972d836d (diff) | |
| download | android_packages_apps_Camera2-4a0042759b9521bf36dc0d8576a628f4a29b2bb5.tar.gz android_packages_apps_Camera2-4a0042759b9521bf36dc0d8576a628f4a29b2bb5.tar.bz2 android_packages_apps_Camera2-4a0042759b9521bf36dc0d8576a628f4a29b2bb5.zip | |
am b7c7d9a0: Add metadata to capture and tap to focus events.
* commit 'b7c7d9a067cd52a27cfbaf0714a2074f972d836d':
Add metadata to capture and tap to focus events.
Diffstat (limited to 'src/com/android/camera/VideoModule.java')
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 045696138..0e5f78afa 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -63,6 +63,7 @@ import com.android.camera.module.ModuleController; import com.android.camera.settings.Keys; import com.android.camera.settings.SettingsManager; import com.android.camera.settings.SettingsUtil; +import com.android.camera.ui.TouchCoordinate; import com.android.camera.util.ApiHelper; import com.android.camera.util.CameraUtil; import com.android.camera.util.UsageStatistics; @@ -705,6 +706,11 @@ public class VideoModule extends CameraModule } @Override + public void onShutterCoordinate(TouchCoordinate coord) { + // Do nothing. + } + + @Override public void onShutterButtonFocus(boolean pressed) { // TODO: Remove this when old camera controls are removed from the UI. } @@ -1878,7 +1884,8 @@ public class VideoModule extends CameraModule Boolean gridLinesOn = Keys.areGridLinesOn(mActivity.getSettingsManager()); UsageStatistics.instance().photoCaptureDoneEvent( eventprotos.NavigationChange.Mode.VIDEO_STILL, title + ".jpeg", exif, - isCameraFrontFacing(), false, currentZoomValue(), flashSetting, gridLinesOn, null); + isCameraFrontFacing(), false, currentZoomValue(), flashSetting, gridLinesOn, + null, null, null); getServices().getMediaSaver().addImage( data, title, dateTaken, loc, orientation, |