summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CameraActivity.java
Commit message (Collapse)AuthorAgeFilesLines
* SnapdragonCamera: Add video to Camera2 moduleByunghun Jeon2016-06-291-1/+2
| | | | | | Add video to Camera2 module and combine the UI Change-Id: I0bcd86eb6b95fe2180856780ddd794682259e799
* Merge "SnapdragonCamera: Sharpshooter post filter" into camera.lnx.1.0-dev.1.0Camera Software Integration2016-06-201-1/+1
|\
| * SnapdragonCamera: Sharpshooter post filterJack Yoo2016-06-081-1/+1
| | | | | | | | | | | | | | Adding Sharpshooter post process filter Change-Id: I8f3c1962db437e7dfbe2973f806a3f9a26480eb7 CRs-Fixed: 1023183
* | SnapdragonCamera: Multiple fixes in SettingManagerJay Wang2016-06-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | - Setting manager instance was not destroyed when camera activity onDestroy is called and a new instance is created again when onCreate is called. Make change to destroy the setting manager during onDestroy. - Include high resolution picture sizes to the picture size list Change-Id: Id6cb52da1419f7e723304236b5d2c204d217398c CRs-Fixed: 1025845, 1025789
* | Merge "SnapdragonCamera: Fixed M permission issue" into camera.lnx.1.0-dev.1.0Linux Build Service Account2016-06-101-25/+28
|\ \
| * | SnapdragonCamera: Fixed M permission issueJay Wang2016-06-021-25/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Resolved NPE while sending permission request - Made change to request non-critical permissions once only, but the critical permssions all th time. - Removed unused contant defines CRs-Fixed: 1019847 Change-Id: Ib997244cbcc041d86c094c7ee7a902bff56e92ad
* | | Merge "Fixes to M permissions." into camera.lnx.1.0-dev.1.0Linux Build Service Account2016-06-101-2/+11
|\| |
| * | Fixes to M permissions.zafir2016-06-021-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we called PermissionsActivity with startActivityForResult(). However, this creates race conditions as we check for permissions and the CameraActivity continues to operate. Now, we end CameraActivity and launch a new instance upon successful permissions resolution. We can also put the preload filmstrip logic back in its original place in onCreate. The checks for permissions happen in both onCreate and onResume. Bug: 22442745, 22478144, 22497152 CRs-Fixed: 1019847 Change-Id: I82e9125a46581db44aa61d4ee94aec5a820e9df0 (cherry picked from commit ac0e2425e77a9b69e76d2f31876798825ea44584)
* | | Merge "Minimum viable Android M runtime permissions handling for H." into ↵Linux Build Service Account2016-06-101-0/+41
|\| | | |/ |/| | | camera.lnx.1.0-dev.1.0
| * Minimum viable Android M runtime permissions handling for H.zafir2016-06-021-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates new activity for permissions handling: both checking for permissions and handling error condition when critical permissions are not present. The reason for creating a new activity is so the app does not attempt to continue executing OnCreate, OnResume etc, which opens the camera while the dialogs are showing. This should not slow the app down because the permissions activity will only run when a) the first time the app has insufficient permissions and b) when a critical permission is missing and the app needs to shut down. Bug: 21273463 CRs-Fixed: 1019847 Change-Id: I603acfb3057ba26b9cfa7935eb4cb24b5d547cb5 (cherry picked from commit ad44cda82fe6ec5ee090115129223c6314f9e1bb)
* | SnapdragonCamera: Update settingsManager and add Dual mode to Scene modeByunghun Jeon2016-05-311-1/+4
| | | | | | | | | | | | | | Update settingsManager and add Dual mode to Scene mode Change-Id: I508430840c3fb8c7d0b56a2a63e09b271754fcb4 CRs-Fixed: 1018118
* | SnapdragonCamera: Add continuous shot and count downByunghun Jeon2016-05-311-3/+3
| | | | | | | | | | | | | | Add continous shot and count down to CaptureModule Change-Id: I986302201f742d7671a67c26953eecc2a0276294 CRs-Fixed: 1018118
* | SnapdragonCamera: Add SettingsManager, scene, and filterByunghun Jeon2016-05-311-7/+10
|/ | | | | | | | | | | Add SettingsManager to work as a database for settings. It will handle all dependencies and populate the values. Add scene mode and filter. Restructure UI and menu by combining them and leave the handling of settings to SettingsManager Change-Id: I185163fdddbffd29434e6a9c41b33be6d3388f88 CRs-Fixed: 1018118
* Merge "SnapdragonCamera: Adjusting view initialization" into ↵Linux Build Service Account2016-04-171-6/+0
|\ | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Adjusting view initializationJack Yoo2016-04-061-6/+0
| | | | | | | | | | | | | | | | Instead of removing and adding the entire root view, changing only core surface view on module change. Change-Id: I5c39cf23b2a58280f4e4e8484865bbed0b12e1cf CRs-Fixed: 979254
* | SnapdragonCamera: Camera2 add dual cameraByunghun Jeon2016-03-301-1/+3
|/ | | | | | | Add Camera2 dual camera support to SnapdragonCamera CRs-Fixed: 989750 Change-Id: I45a749ad03a531286a39cbfcfdcb65e5cad4759e
* SnapdragonCamera: Add Camera2 modeByunghun Jeon2016-03-301-1/+23
| | | | | | | Use camera2 API to show preview and take snapshot CRs-Fixed: 989750 Change-Id: I07e2d6743529b3d3d5acecf667e9493465a094c9
* Fix android.process.media got killed when capturezfu2016-03-181-0/+5
| | | | | | | | | | | | android.process.media has a very low priority as Cached app in background. When snapdragon camera using ContentResolver and do query/updating it will promot to foreground priority, but there may have some race condition that lmk in the progress to kill media, and AMS want set to foreground. So, keep this process as foreground during the whole ActivityLife time, by hold a query cursor onCreate and destory onStop. CRs-Fixed: 984061 Change-Id: I530fddfa240030ad84dc09b599ad783f6a2f21e0
* SnapdragonCamera: Fix timing of preference initializationByunghun Jeon2016-03-171-0/+6
| | | | | | | Initialize preference before making the views visible. Change-Id: Ie3d541c7fcb29ed86e0e9fd52a1a1e4ea870f009 CRs-Fixed: 982842
* Revert "SnapDragonCamera: make exit smooth in landscape mode"Jack Yoo2016-02-061-7/+0
| | | | | | | This reverts commit c70d966b798508275001215b50ea9e74f3688eb7. Change-Id: Ie22576332280e0dc6ea423ff0c6e369b850d7b3b CRs-Fixed: 968135
* SnapdragonCamera: Fix blank preview issue during pause & resumeJay Wang2016-02-031-52/+0
| | | | | | | | | | | | | | | Continuous pause & resume operation by pressing the power button can cause the blank preview. The application close the camera when there is onPause or screen off intent. Sometimes the resume comes after screen off intent when user resumes the device quickly after pausing the device. Because of this race-condition, the camera is closed unintentionally. To resolve the issue, re-structure the code to receive screen-off intent only during video recording and stop the recording when intent is received. Change-Id: Ic993b83527b41dbbf53f63ef8ca25fa3a12fb77e CRs-Fixed: 970172
* SnapdragonCamera: Fix the memory leak on view.Jack Yoo2016-01-301-19/+45
| | | | | | | | Keep using modules instead of creating. Don't remove the view without cleaning it. Change-Id: I260a660cac3d770f7d02dfdc1881e15490da66a0 CRs-Fixed: 958510
* SnapdragonCamera: Hiding navigation barCamera Software Integration2015-12-301-8/+13
| | | | | | | Hiding navigation bar according to the system property Change-Id: Ifb007cb8d8958fc553dad0181cf8a26ad5efee65 CRs-Fixed: 908830
* Revert "SnapdragonCamera: Set navigation bar according to flag"Camera Software Integration2015-12-301-14/+8
| | | | | | This reverts commit 8fce47a5fb0277b3763b94a1fd23ea499d35e4b1. Change-Id: I955f7ad42df89d30b39b8c7c26473ceac69a9c9d
* SnapdragonCamera: Remove double onResume callCamera Software Integration2015-12-221-6/+0
| | | | | | | | | | For panorama module with screen lock set, when user suspend and resume the app back, onResume is called twice, calling openCamera twice as well. This is resulting in crash. Remove calling resume from screen-on receiver. Change-Id: I9c6a0baca9aef1732ac003f3cb122fc3866a7b35 CRs-Fixed: 927063
* Revert "SnapdragonCamera: Use floating components during video record."Byunghun Jeon2015-10-291-8/+0
| | | | | | This reverts commit 59b05fd1d75943f037aec41def16cdceb6443ecf. Change-Id: I807bdbf0fe669a989d58484ab11451c891acaf5b
* SnapdragonCamera: Fix compilationJaimin Bhise2015-10-291-18/+0
| | | | | | | | | | | | 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. 6. Revert "camera: override shutter sound volume" commit 8a50cda8f72738e943904fdf7cae189b2b0a8ea8. Change-Id: I167ab5ff399c4f1d306a1a7ddf94896565c9625a
* SnapdragonCamera: Handle startPreview exception in camera.Sanjeev Garg2015-10-131-0/+9
| | | | | | | | | | If any exception occurs in start preview then camera app should handle this exception and should display error pop-up and exit gracefully. CRs-Fixed: 919778 Change-Id: I80b60224d5d47a96dad78c40f8a23e3e9be45e65
* Merge "SnapdragonCamera:Fix icons overlapped with navigation bar"Linux Build Service Account2015-09-291-3/+3
|\
| * SnapdragonCamera:Fix icons overlapped with navigation barlikaid2015-09-141-3/+3
| | | | | | | | | | | | | | | | | | When returning from Gallery app,the icons overlapped with navigation bar. Restore Camera app's systemui display attributes CRs-Fixed: 896214 Change-Id: I20462d843c9264e332b879cefe67a8e6dfe894e5
* | Merge "SnapDragonCamera: make exit smooth in landscape mode"Linux Build Service Account2015-09-291-0/+7
|\ \
| * | SnapDragonCamera: make exit smooth in landscape modelikaid2015-09-211-0/+7
| |/ | | | | | | | | | | | | | | | | | | | | | | In landscape mode, the system will change the display config to portrait, so the SurfaceView should destroy first, then close the camera device. As user press back key for exit camera, set the screen to portrait first, then close the camera device. CRs-Fixed: 890573 Change-Id: I01c5ed11aea00be6809231b704fb3b2514c20c84
* / SnapdragonCamera: Use floating components during video record.Jay Wang2015-09-161-0/+8
|/ | | | | | | | During recording, there are only 2 widgets on UI. Directly attaching them to window manager and making main UI layer fully transparent can reduce power consumption. Change-Id: I8c4f4768ab91d50fc72080f0f6d7316ee2e60ef4
* Merge "SnapdragonCamera: Reset navigation bar state whenever screen turns on"Linux Build Service Account2015-09-101-0/+7
|\
| * SnapdragonCamera: Reset navigation bar state whenever screen turns onByunghun Jeon2015-09-021-0/+7
| | | | | | | | | | | | | | Reset navigation bar state whenever screen turns on Change-Id: Ic1021322e33cf116706c533edaac0f28396fa631 CRs-Fixed: 887673
* | SnapdragonCamera: Fix the preview thumbnail issuelikaid2015-09-021-0/+2
|/ | | | | | | | | | | | | When set the preview thumbnail imageView to visible, it used the drawable resource in cache which was set since last time. That caused we still could see the preview thumbnail though the bitmap was invalid. Clear the drawable resource in cache when the preview thumbnail is invalid. Change-Id: Id37620d32b8dff8dd3cad0f33da678b8709e6ee1 CRs-Fixed: 899905
* Merge "SnapdragonCamera: Improvement in open camera latency"Linux Build Service Account2015-08-111-34/+36
|\
| * SnapdragonCamera: Improvement in open camera latencySanjeev Garg2015-08-061-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: Set navigation bar according to flagByunghun Jeon2015-08-071-8/+14
|/ | | | | | Set navigation bar according to flag and set it to show by default Change-Id: I5ddb9d5f8150d7fd1d182bacb25cd02651a2db5b
* SnapdragonCamera: Modify paddings and size of menusByunghun Jeon2015-08-051-1/+1
| | | | | | Modify paddings and size of menus to display longer menus Change-Id: I43bd3a8de8178ca2bdd273f4cfb6fafbcb92d82a
* Merge "SnapdragonCamera: fix thumbnail display"Linux Build Service Account2015-07-301-2/+4
|\
| * SnapdragonCamera: fix thumbnail displayLikai Ding2015-07-301-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
* | SnapdragonCamera: remove nav bar to enable full screen previewByunghun Jeon2015-07-281-5/+10
|/ | | | | | | Remove the navigation bar in order to take advantage of full screen. Change-Id: I25f42af825c4f3b7ad6521c2ee6d62fa4219044a CRs-Fixed: 865254
* Merge "SnapdragonCamera: Stop record when screen off"Linux Build Service Account2015-07-161-13/+33
|\
| * SnapdragonCamera: Stop record when screen offlikaid2015-07-151-13/+33
| | | | | | | | | | | | | | | | | | | | | | During Gplayer play, when we press power key to make screen off the SnapdragonCamera can not stop recording video. Add a broadcast for SCREEN_OFF to make the SnapdragonCamera stop when press power key. Change-Id: I7f06bc651aebd3c23212edfc55696fb93e9e250d CRs-Fixed: 866025
* | SnapdragonCamera: Fix display smaller thumbnail on panorama previewlikaid2015-07-141-0/+14
|/ | | | | | | | | | | The preview thumbnail size is calculated according to the captured image size. When capture panorama image with landscape, the height of the image will be too small to fill the thumbnail view. Enlarge the bitmap to the thumbnail size if it is not large enough. Change-Id: I65afcdf2943eed4526639ff418b929e6450711b5 CRs-Fixed: 868550
* Merge "SnapdragonCamera: Gallery2 Can't show the newest picture"Linux Build Service Account2015-04-151-0/+2
|\
| * SnapdragonCamera: Gallery2 Can't show the newest picturelikaid2015-04-031-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-04-031-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: Don't display metadata in paused stateEmilian Peev2015-03-051-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: I19e2a044441e4bfb9eca05445a821a2f7bc43548
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-30 15:26:18 +0000