diff options
author | jt1134 <jt1134@gmail.com> | 2014-01-04 20:52:27 -0600 |
---|---|---|
committer | Michael Bestas <mikeioannina@gmail.com> | 2017-01-04 21:57:38 +0200 |
commit | 21f9c8d2db00b3f09de9d9a80877f7d5fa8e13ef (patch) | |
tree | 30c9a580d23799358a5d120814d66bc346a7edc1 /src | |
parent | 1188615601ca80d6f5a37cff4842a6522835b8a3 (diff) | |
download | android_packages_apps_Snap-21f9c8d2db00b3f09de9d9a80877f7d5fa8e13ef.tar.gz android_packages_apps_Snap-21f9c8d2db00b3f09de9d9a80877f7d5fa8e13ef.tar.bz2 android_packages_apps_Snap-21f9c8d2db00b3f09de9d9a80877f7d5fa8e13ef.zip |
Camera2: implement volume key zoom in video mode
Change-Id: I140e8cfb3e39700f60e40c35b38e92c83a3c26de
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/camera/VideoModule.java | 9 | ||||
-rw-r--r-- | src/com/android/camera/VideoUI.java | 16 |
2 files changed, 25 insertions, 0 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 8b17ff3a2..76aa8a623 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -1364,6 +1364,12 @@ public class VideoModule implements CameraModule, } switch (keyCode) { + case KeyEvent.KEYCODE_VOLUME_UP: + mUI.onScaleStepResize(true); + return true; + case KeyEvent.KEYCODE_VOLUME_DOWN: + mUI.onScaleStepResize(false); + return true; case KeyEvent.KEYCODE_CAMERA: if (event.getRepeatCount() == 0) { mUI.clickShutter(); @@ -1386,6 +1392,9 @@ public class VideoModule implements CameraModule, @Override public boolean onKeyUp(int keyCode, KeyEvent event) { switch (keyCode) { + case KeyEvent.KEYCODE_VOLUME_UP: + case KeyEvent.KEYCODE_VOLUME_DOWN: + return true; case KeyEvent.KEYCODE_CAMERA: mUI.pressShutter(false); return true; diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java index 2454a012f..adda6b206 100644 --- a/src/com/android/camera/VideoUI.java +++ b/src/com/android/camera/VideoUI.java @@ -22,6 +22,7 @@ import org.codeaurora.snapcam.R; import android.content.res.Configuration; import android.graphics.Bitmap; +import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Point; import android.graphics.drawable.ColorDrawable; @@ -1099,6 +1100,21 @@ public class VideoUI implements PieRenderer.PieListener, return mCameraControls.getVisibility() == View.VISIBLE; } + public boolean onScaleStepResize(boolean direction) + { + if(mGestures != null){ + return mGestures.onScaleStepResize(direction); + } + return false; + } + + public void onScaleChangeDraw(Canvas canvas) + { + if(mGestures != null){ + mGestures.onScaleChangeDraw(canvas); + } + } + @Override public void onDisplayChanged() { mCameraControls.checkLayoutFlip(); |