summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CameraActivity.java
Commit message (Collapse)AuthorAgeFilesLines
* CameraActivity: Don't hide navigation barDanny Baumann2016-01-151-3/+7
| | | | | | * Make it transparent instead. Change-Id: I08b06ac72d88aaf62ae7f52a3dde9ba865bc3542
* SnapdragonCamera: fix thumbnail displayLikai Ding2016-01-141-2/+4
| | | | | | | | | | | Thumbnail image is usually larger than needed due to the choice of down-sampling factor. When the decoded bitmap is square, it's width and height is not correctly set in CircularDrawable, so only the left-top part of the cropped image is shown. Set the size and only decode exactly the region for display. Change-Id: I5f4af66a08f0dc02d84bda605b74c9e2b782fe63 CRs-Fixed: 881895
* Snap: Remove dead codeMichael Bestas2016-01-091-25/+0
| | | | | | | | | | * Remove non-standard video resolutions. * Revert "camera: override shutter sound volume" commit 8a50cda8f72738e943904fdf7cae189b2b0a8ea8. Adapted from CodeAurora commit 000c6fa3b5c95297496e0ae077030132409871ea Change-Id: I167ab5ff399c4f1d306a1a7ddf94896565c9625a
* Snap: FilmStripView must exist before loading photo/video modulescodeworkx2016-01-091-8/+12
| | | | Change-Id: Ife58cd6cde57f38343c73518d6561036a13dbf06
* CameraActivity: Handle NPE when film strip view is nullLuK13372016-01-091-1/+3
| | | | Change-Id: I0de4ec0f2cb4653822249ea97e8a07c890fc7231
* SnapdragonCamera: Improvement in open camera latencySanjeev Garg2016-01-081-34/+36
| | | | | | | | | setContentView(R.layout.camera_filmstrip) call in the app takes ~40 msec before actual openCamera call is made. This is adding to the total APP camera open latency. So Opening camera in parallel to the call to setContentView(R.layout.camera_filmstrip) to save this time. Change-Id: I8e3797e65d17021853e0e04873178a372f12f195
* SnapdragonCamera: Don't display metadata in paused stateEmilian Peev2016-01-071-1/+4
| | | | | | | | | | | | | | | | The media metadata retrieval is executed in separate 'async' thread. Once done an UI dialog is generated using the resulting data. A race condition is possible when the query thread is triggered and the activity itself is paused. If the task finishes after the application is no longer running, then the UI dialog box sequence can lead to a runtime exception. To resolve this an additional check is needed which will skip the metadata display step in case the applicaiton is already paused. Change-Id: I8ed5f9b54575278f337d720f997ee649cee3f2f6
* init SDCard, fix nullptrcodeworkx2016-01-051-0/+5
| | | | Change-Id: I250664867c54a880bad63275b3c0300d8733c5af
* SnapdragonCamera: Fix compilationShuzhen Wang2016-01-021-1/+8
| | | | | | | | | | 1. Address compilation due to compiler upgrade. 2. Comment out video dependencies to enable camera. 3. Fix compilation issue due to IMountService interface change. 4. Comment out ExtendedFace. 5. Remove non-standard video resolutions. Change-Id: I167ab5ff399c4f1d306a1a7ddf94896565c9625a
* Camera2: Add option to set max screen brightnessMichael Bestas2015-09-171-0/+20
| | | | | | * Set maximum screen brightness while the user is inside the camera app Change-Id: I8b16ba47a933bc7d6b0c1cd62bfd6ca54875ce1e
* Camera: Handle keys only while in appMichael Bestas2015-09-171-1/+10
| | | | | | Thanks to Lars Greiss (SlimRoms) Change-Id: I63f757d25260fba4683f494f8b4daf178a2b4e13
* Camera: Cleanup hardware key handlingMichael Bestas2015-09-171-1/+3
| | | | | | | | | | | | | | | | | * Fix power shutter behaviour in camcorder mode * Disable volume change while in panorama mode, volume buttons should only handle camera operations while in the camera * Add camera/power/volume key shutter handling in panorama mode On devices with a hardware camera key: * Disable power & volume shutter features * Volume buttons control the zoom On devices without a hardware camera key: * When power shutter is disabled, volume buttons control the shutter (like AOSP) * When power shutter is enabled, volume buttons control the zoom Change-Id: I141946d5b6f5aec8b1e9a9f99270d30295596079
* Camera: Powerkey shutter (2/2)Michael Bestas2015-09-171-0/+16
| | | | | | | | | | | | | | 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
* SnapdragonCamera: remove nav bar to enable full screen previewByunghun Jeon2015-08-031-5/+10
| | | | | | | Remove the navigation bar in order to take advantage of full screen. Change-Id: I25f42af825c4f3b7ad6521c2ee6d62fa4219044a CRs-Fixed: 865254
* SnapdragonCamera: Gallery2 Can't show the newest picturelikaid2015-04-081-0/+2
| | | | | | | | | | Camera give Gallery2 the newest picture's index is wrong in RTL mode. Give Gallery2 the correct index. Change-Id: Ie0f3835f0a9ab46b408ffe0b4ea5dd60906267e0 CRs-Fixed: 816284
* SnapdragonCamera: Update the storage space status after remount SDcardlikaid2015-03-201-0/+20
| | | | | | | | Add broadcast receiver to monitor SDcard status, update the storage space and hint when the SDcard was mounted or unmounted. Change-Id: I4b114d42d26091588d745fee874c04d595d5cfa1 CRs-Fixed: 790983
* SnapdragonCamera: Allow edit in Gallery2 if launched from SnapcamByunghun Jeon2015-02-241-0/+5
| | | | Change-Id: I67afa657adfc137a70f0c5d8d831bc2b0cbdaaeb
* Merge "SnapdragonCamera: Fix play the video directly when goto gallery"bait_dispatcher_monitor_system2015-02-191-2/+14
|\
| * SnapdragonCamera: Fix play the video directly when goto gallerylikaid2015-02-171-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | When clicked the preview thumbnail of a video, Camera launched Gallery with the action Intent.ACTION_VIEW, it caused Gallery play the video directly after Gallery started. Set the action Intent.ACTION_MAIN when launched Gallery. Change-Id: I74c9fc7b66a8ddb5fd06ceba5a0bd370e97b1154 CRs-Fixed: 794309 (cherry picked from commit 4c0d475c7d3be21487a34491a0072918dbbac230)
* | SnapdragonCamera: circular thumbnail iconLikai Ding2015-02-171-37/+179
|/ | | | | | | | | | 1. change thumbnail icon to circular and its background to transparent 2. speed up loading with optimal sample size and region decoder 3. fix orientation bug regarding panorama photos 4. don't fire load task on fake onDataLoaded() call Change-Id: I7f4eb8dad4c54a01a7ccd98907e06952e470840b (cherry picked from commit ac714ea974b4bd0ef99403def5aa7d8a3deecc5d)
* SnapdragonCamera: Wake up screen when invoke camera by gesturelikaid2015-02-131-19/+31
| | | | | | | | | | | The screen didn't wake up when invoked camera by gesture on dark screen, which caused the camera view couldn't be shown successfully. Acquire a wake lock at the beginning of onCreate, to make sure the screen could be lighten up, release the lock in onDestroy. Change-Id: I081c1e8a02d9eee18e6f33b2e6535a777feb1348 CRs-Fixed: 788479
* Merge "SnapdragonCamera: Fix NPE in SnapdragonCamera during monkey test"Linux Build Service Account2015-02-091-0/+4
|\
| * SnapdragonCamera: Fix NPE in SnapdragonCamera during monkey testkaiyiz2015-01-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | The mineType will be null if get it from an invalid uri, this may happen when delete a video very quickly after taken it and back to Camera, the video data has already gone before notifyNewMeida called. Add null pointer check before use mimeType to avoid the NPE. Change-Id: I6021faf2d4016e258153f0a75419f01fdfd7ed6c CRs-Fixed: 784389
* | Camera2: Change into full screen mode when return to camera previewlikaid2015-02-051-0/+1
| | | | | | | | | | | | | | | | | | | | The screen size didn't change when return from FilmStripView to camera preview, that caused the camera preview was in mini screen. Go to full screen when the current view is camera preview. Change-Id: Ib7153335670ad8596222e3b340861508767c1fb2 CRs-Fixed: 790334
* | SnapdragonCamera: fix portrait orientationLikai Ding2015-02-021-15/+0
|/ | | | | | | | | | | | Fix camera activity to portrait, so there is no delay when rotation occurs. Main changes are: 1. RotateLayout now supports padding and dynamically added child. 2. Camera controls and gesture detetion are now orientation-aware. 3. Toasts are replaced with RotateTextToast. 4. Obselete layout files are removed. Change-Id: I338849bd7fb84b847eb357f771a24a5cc09bf6fa
* Merge "camera: override shutter sound volume"Linux Build Service Account2015-01-211-0/+19
|\
| * camera: override shutter sound volumeZhou Song2015-01-161-0/+19
| | | | | | | | | | | | | | | | | | | | -Override shutter sound volume by reading property and using the value from the property. The global volume is re-set when camera recording is stopped or when the application exits CRs-Fixed: 716717 Change-Id: I6b40cddad99fdb12f6a3266217b1e98d347e0cd5
* | Merge "SnapdragonCamera: Open camera in init for improve start preview KPIs"Linux Build Service Account2015-01-201-3/+0
|\ \
| * | SnapdragonCamera: Open camera in init for improve start preview KPIskaiyiz2015-01-161-3/+0
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | When switch from VideoModule to PhotoModule, opencamera will run in onResume rather than init() and start preview must be executed after open camera.This lead to start preview slowly. Open camera when module init for run start preview as early as possible. so the flag mIsModuleSwitchInProgress isn't needed. Reference similar action in VideoModule's init(). CRs-Fixed: 741089 Change-Id: I5a8fd18ef944fbc28f1b61470a4f389d3096c8ef
* / SnapdragonCamera: implement refocus featureLikai Ding2015-01-141-0/+9
|/ | | | | | | | Add a scene mode for refocus. If the latest photo is taken with refocus, user can click on the preview thumbnail, then refocus it by tapping on the photo. Change-Id: I2fd69439467f5a1e33d23d8d239aa3472d88b585
* SnapdragonCamera: fix don't lock screen after press power keykaiyiz2015-01-091-4/+8
| | | | | | | | | | | | | | The window flag FLAG_SHOW_WHEN_LOCKED is workding even if press power key, so camera activity will not be close still run above locked screen UI. The CameraGestureActivity is start from screen off, so it will be a SecureCameraActivity. Finish activity as same as the secure camera activity. Change-Id: I76d8ff3d2f037b81140b35255b52b4c4f4de95d3 CRs-Fixed: 777770
* SnapdragonCamera: Fix app couldn't open Camera when Flashlight is onkaiyiz2015-01-031-2/+2
| | | | | | | | | | | Camera couldn't be open when Flashlight is on because CameraDevice has been used. Receive the led flashlight intent and close flashlight. CRs-Fixed: 769624 Change-Id: Ib5be47cc93b55bb06637f15309b7d4bea694e58f
* Merge "Camera: Add CameraGestureActivity as alias of CameraActivity"Linux Build Service Account2014-12-161-0/+4
|\
| * Camera: Add CameraGestureActivity as alias of CameraActivityJing (Mia) Wang2014-12-101-0/+4
| | | | | | | | | | | | | | Make the activity could show above lock screen and turn on screen when it is started by gesture operation. Change-Id: I2099154f2325de83597b4262203c58a84b91f2d9
* | Camera2: fix preview thumb could not update after delete photoJing (Mia) Wang2014-12-121-2/+5
|/ | | | | | | | | | | The preview thumb bitmap is still exist after restart Camera even if some photo in phone is changed. Clear preview thumb bitmap when resume camera activity. CRs-Fixed: 768224 Change-Id: I3d0713a38d92d7d28a73f833df6d7e8e53faa23c
* SnapdragonCamera: Add preview thumbnail buttonByunghun Jeon2014-11-191-4/+107
| | | | | | Add preview thumbnail button and touch it to go to gallery Change-Id: Ib80ef94c677c204d7f0826356792aba2aa11d4d1
* SnapdragonCamera: Use MDP composition instead of GPUByunghun Jeon2014-11-171-5/+5
| | | | | | Use MDP composition instead of GPU Change-Id: I4f47d26365bd611242a21e66b232d7521b502b04
* SnapdragonCamera: Modify SnapdragonCamera UIByunghun Jeon2014-11-171-1/+45
| | | | | | Modified SnapdragonCamera setting menus with new icons Change-Id: I726296dfb100ac81ad6f1cd84420ae27c0ae1201
* Camera: open Camera and start Preview in a seperate thread.Sai Kumar Sanagavarapu2014-10-201-0/+3
| | | | | | | | Start openCamera and start preview in a separate thread so that UI initialization and preview can run parallely. This is to improve camera cold start latency. Change-Id: I57af45bc90a4db1630c73449d543c3ff0992e55c
* SnapdragonCamera: Switch to SD card when internal storage is fullkaiyiz2014-08-211-0/+4
| | | | | | | | | | | | | | | | When internal storage is full, switch to SD card for storage. Change the save path from internal storage to SD card when updateStorageSpace is called if: 1. Internal storage is the current save path and does not have enough space 2. SD card has enough space Display a toast message and update display of the save path menu item when the storage path is switched. CRs-Fixed: 687210 Change-Id: I6a9804e4f64e6d55c6aebd889ac2ce5e887cfa5a
* Rename module and package name to co-exist with AOSP appSachin Shah2014-08-161-1/+1
| | | | | | | | Rename package from com.android.camera2 to org.codeaurora.snapcam, module name from Camera2 to SnapdragonCamera and app name from "Camera" to "Snapdragon Camera" Change-Id: I2800070e72631e119a15fe0132424d1047be9f0c
* Merge "Revert "Camera: Mem-leak""Linux Build Service Account2014-06-301-41/+2
|\
| * Revert "Camera: Mem-leak"Vijay kumar Tumati2014-06-191-41/+2
| | | | | | | | | | | | | | | | | | | | This reverts commit 46b761ab50e36daa2ff79527553014905e784895. We see some regressions with this change so we are reverting it for now. We will fix the issues soon. Change-Id: I59da92087006cef0da16c8a11fe7c31f32aa0312
* | Merge "Merge tag 'android-4.4.3_r1' into HEAD"Linux Build Service Account2014-06-231-2/+1
|\ \ | |/ |/|
| * Merge tag 'android-4.4.3_r1' into HEADChiou-Hao Hsu2014-06-111-2/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android 4.4.3 release 1 * tag 'android-4.4.3_r1': Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Remove TRIM support Import translations. DO NOT MERGE Import translations. DO NOT MERGE Fix samsung video recording Fix WB indicator override Revert fixed focus area in CAF mode Add another HTC picture resolution Always set focus mode first before applying scene mode Reduce logging of flattened Preferences Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence. Conflicts: res/values/arrays.xml src/com/android/camera/FocusOverlayManager.java src/com/android/camera/PhotoModule.java src/com/android/camera/VideoModule.java Change-Id: I4be00366e24933c6504639776c711e1a874d1f2e
| | * Remove TRIM supportAlan Newberger2013-12-041-2/+1
| | | | | | | | | | | | | | | | | | | | | Remove the ability to trim a video with the quick menu action. Bug: 11884080 Change-Id: If00cb31ad6b913012c542a809dba1a8e5d9e5b74
* | | Merge "Camera: Mem-leak"Linux Build Service Account2014-06-131-2/+41
|\ \ \ | |/ / |/| |
| * | Camera: Mem-leakSuman Mukherjee2014-06-091-2/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hprof identified memleak in localdatalist from list and hashmap Reason: removedata was not getting invoked. Fix Made: Invoke removedata from ondestroy and onresume of camera activity Cleanup bitmaps before reallocation on same variable. CRs-Fixed: 655256 Change-Id: I42d99beb7e493eea2394462ee02cbe956e86c502
* | | Merge "Camera2: Make menu not pop up in take picture interface"Linux Build Service Account2014-06-051-3/+1
|\ \ \ | |/ / |/| |
| * | Camera2: Make menu not pop up in take picture interfacekaiyiz2014-05-271-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we click menu key in view interface and take picture interface,the menu will both pop up. Modify condition to achieve not pop up menu in take picture interface. CRs-fixed: 652961 Change-Id: Ifc2e3b4535fdf48c110673a3ec633ecdc93cc37a
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 14:42:16 +0000