diff options
author | Michael Bestas <mikeioannina@gmail.com> | 2014-01-20 20:40:32 +0200 |
---|---|---|
committer | Michael Bestas <mikeioannina@gmail.com> | 2015-09-17 23:26:02 +0300 |
commit | 69fe66517f086a01b6f9fb80e669256ec11c6625 (patch) | |
tree | f2645455775f1fe11616071ae9771ab418832247 /src/com/android/camera/PhotoModule.java | |
parent | 090a890049355881cba3ed6d503aebafae056384 (diff) | |
download | android_packages_apps_Snap-69fe66517f086a01b6f9fb80e669256ec11c6625.tar.gz android_packages_apps_Snap-69fe66517f086a01b6f9fb80e669256ec11c6625.tar.bz2 android_packages_apps_Snap-69fe66517f086a01b6f9fb80e669256ec11c6625.zip |
Camera: Powerkey shutter (2/2)
Ported from cm-10.1
Including cm-10.1 camera commit:
aa4ae80a41fbab763891c5ef6d67a9e5b4bb981b Don't mess around with pref local ID for power shutter initialization.
Includes http://review.cyanogenmod.org/56986
[mikeioannina]: Updates for L
Signed-off-by: Michael Bestas <mikeioannina@gmail.com>
Change-Id: I0992baa558eefd306d00fbece59cb5c512d9448b
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
-rw-r--r-- | src/com/android/camera/PhotoModule.java | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index c23c41f9c..9a798d50b 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2012 The Android Open Source Project + * Copyright (C) 2013-2015 The CyanogenMod Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -493,6 +494,9 @@ public class PhotoModule mPreferences.setLocalId(mActivity, mCameraId); CameraSettings.upgradeLocalPreferences(mPreferences.getLocal()); + // Power shutter + mActivity.initPowerShutter(mPreferences); + if (mOpenCameraThread == null) { mOpenCameraThread = new OpenCameraThread(); mOpenCameraThread.start(); @@ -2315,6 +2319,9 @@ public class PhotoModule // (e.g. onResume -> onPause -> onResume). stopPreview(); + // Load the power shutter + mActivity.initPowerShutter(mPreferences); + mNamedImages = null; if (mLocationManager != null) mLocationManager.recordLocation(false); @@ -2467,6 +2474,9 @@ public class PhotoModule @Override public boolean onKeyDown(int keyCode, KeyEvent event) { + /*TODO: if (!mActivity.mShowCameraAppView) { + return false; + }*/ switch (keyCode) { case KeyEvent.KEYCODE_VOLUME_UP: if (/*TODO: mActivity.isInCameraApp() &&*/ mFirstTimeInitialized @@ -2504,12 +2514,21 @@ public class PhotoModule mUI.pressShutterButton(); } return true; + case KeyEvent.KEYCODE_POWER: + if (mFirstTimeInitialized && event.getRepeatCount() == 0 + && CameraActivity.mPowerShutter) { + onShutterButtonFocus(true); + } + return true; } return false; } @Override public boolean onKeyUp(int keyCode, KeyEvent event) { + /*TODO: if (!mActivity.mShowCameraAppView) { + return false; + }*/ switch (keyCode) { case KeyEvent.KEYCODE_VOLUME_UP: case KeyEvent.KEYCODE_VOLUME_DOWN: @@ -2519,6 +2538,11 @@ public class PhotoModule onShutterButtonFocus(false); } return true; + case KeyEvent.KEYCODE_POWER: + if (CameraActivity.mPowerShutter && mFirstTimeInitialized) { + onShutterButtonClick(); + } + return true; } return false; } @@ -4184,6 +4208,7 @@ public class PhotoModule setCameraParametersWhenIdle(UPDATE_PARAM_PREFERENCE); mUI.updateOnScreenIndicators(mParameters, mPreferenceGroup, mPreferences); + mActivity.initPowerShutter(mPreferences); } else { mHandler.sendEmptyMessage(SET_PHOTO_UI_PARAMS); } |