summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "SnapdragonCamera: Wake up screen when invoke camera by gesture"Linux Build Service Account2015-02-121-19/+31
|\
| * SnapdragonCamera: Wake up screen when invoke camera by gesturelikaid2015-02-101-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: set histogram orientation"Linux Build Service Account2015-02-111-0/+3
|\ \
| * | SnapdragonCamera: set histogram orientationLikai Ding2015-02-101-0/+3
| | | | | | | | | | | | | | | | | | Set histogram rotation during orientation change. Change-Id: I6f9a6fb9a1761fc3a7f926f16794f8db8b61c78c
* | | Merge "SnapdragonCamera: Fix icon display abnormal."Linux Build Service Account2015-02-111-1/+0
|\ \ \
| * | | SnapdragonCamera: Fix icon display abnormal.likaid2015-02-101-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One additional drawable data is defined in array. Delete the additional data. Change-Id: Ifd4a744f21a1d6add2c28d42ebf20e615202e2cc CRs-Fixed: 791684
* | | | Merge "SnapdragonCamera: Add FullScreen Preview when in Panoramic shoot"Linux Build Service Account2015-02-1025-186/+396
|\ \ \ \
| * | | | SnapdragonCamera: Add FullScreen Preview when in Panoramic shootJay Wang2015-02-0925-186/+396
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the Panoramic preview to full screen Resized the warped preview image to smaller Size and render on top of the full screen preview image Warped preview image can be turned on/off Change-Id: I859839542ce94c5f70d7fe7983e93b5e9534b415
* | | | | Merge "SnapdragonCamera: Cover the preview until the preview really starts"Linux Build Service Account2015-02-102-4/+8
|\ \ \ \ \
| * | | | | SnapdragonCamera: Cover the preview until the preview really startslikaid2015-02-052-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the surface was ready, the preview data may not come yet, that caused the desktop ui flashed in the camera when relaunching camera. Delay the occasion of dismissing preview cover until onPreviewStarted. Change-Id: I80b751bd19889683d784b94827b668efa817ff02 CRs-Fixed: 789076
* | | | | | Merge "SnapdragonCamera: Subtract 50M when calculate the remaining photos"Linux Build Service Account2015-02-101-1/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | SnapdragonCamera: Subtract 50M when calculate the remaining photoslikaid2015-02-091-1/+2
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Camera couldn't take a snapshot when the available storage space is less than 50M. When calculate remaining photos, didn't subtract low storage threshold bytes. Subtract low storage threshold bytes when calculate the remaining photos. Change-Id: I774442e97ef8847a731167f7ef00454642632902 CRs-Fixed: 779420
* | | | | Merge "SnapdragonCamera: Fix null pointer exception during monkey test"Linux Build Service Account2015-02-093-6/+14
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | SnapdragonCamera: Fix null pointer exception during monkey testlikaid2015-02-093-6/+14
| |/ / / | | | | | | | | | | | | | | | | | | | | CRs-Fixed: 788421 788422 788437 788445 Change-Id: Ie77a53a73182b6642ce2e9f7de7c4c127e192f51
* | | | Merge "SnapdragonCamera: fix preview not shown bug"Linux Build Service Account2015-02-091-0/+2
|\ \ \ \
| * | | | SnapdragonCamera: fix preview not shown bugLikai Ding2015-02-061-0/+2
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | resizeForPreviewAspectRatio() might be called before SurfaceView's layout process, which causes SurfaceView being set to 0 width and height. Add check before adjusting SurfaceView's dimensions. Change-Id: I66bf6dfcef74253429b2c6cd1a80031d8e30f95d
* | | | 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
* | | | | Merge "SnapdragonCamera: Disable filter mode when HDR is on"Linux Build Service Account2015-02-091-15/+13
|\ \ \ \ \
| * | | | | SnapdragonCamera: Disable filter mode when HDR is onkaiyiz2015-01-231-15/+13
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When HDR was on, filter mode was invalid,it has no effect on preview, besides, scene mode had been changed to auto, but the scene icon didn't change. When HDR is ON, disable filter mode, and change scene mode icon to auto. Change-Id: I1e43021f0441b13549b6511a18252679299beec8 CRs-Fixed: 782599
* | | | | Merge "SnapdragonCamera: Do not show the filter button if not support"Linux Build Service Account2015-02-091-1/+5
|\ \ \ \ \
| * | | | | SnapdragonCamera: Do not show the filter button if not supportlikaid2015-02-051-1/+5
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The filter mode switcher button was always shown after video recording stopped. Check device capability from preference, if the device doesn't support filter mode, do not show the button. Change-Id: I0e3297437e4c22ba9c8ec8b36e0de60d673ce7b1 CRs-Fixed: 790252
* | | | | Merge "Camera2: Change into full screen mode when return to camera preview"Linux Build Service Account2015-02-091-0/+1
|\ \ \ \ \
| * | | | | 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
* | | | | Merge "SnapdragonCamera: Update the remaining number after change save path"Linux Build Service Account2015-02-091-0/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | SnapdragonCamera: Update the remaining number after change save pathkaiyiz2015-02-051-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The remaining photo number wasn't update after change the save path from SD card to phone storage, that caused the left number not matched current setting. Update it in onSharedPreferenceChanged, make it matched with the current save path setting. Change-Id: I544c5baca8a30f8c7dbd8d71962300ae320e9de5 CRs-Fixed: 786966
* | | | Merge "SnapdragonCamera: Improve app stop latency"Linux Build Service Account2015-02-062-2/+8
|\ \ \ \ | |_|_|/ |/| | |
| * | | SnapdragonCamera: Improve app stop latencyShalaj Jain2014-12-092-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable shutter button before starting/stopping recording on a shutter button click and enable it after without any delay. Add logs to know when shutter button is disabled/enabled. Change-Id: Ibca1e964d2e2fc1c1bd47c104f87289eb2a507bf
* | | | Merge "SnapdragonCamera: Revert copyright year change."Linux Build Service Account2015-02-051-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | SnapdragonCamera: Revert copyright year change.Sai Kumar Sanagavarapu2015-02-051-1/+1
|/ / / | | | | | | | | | | | | | | | Dont change copyright year of photomodule. Change-Id: I6b07b652d8caaa7df6931af0cab9b62d0ab41760
* | | Merge "SnapdragonCamera: fix portrait orientation"Linux Build Service Account2015-02-0433-787/+630
|\ \ \
| * | | SnapdragonCamera: fix portrait orientationLikai Ding2015-02-0233-787/+630
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 "SnapdragonCamera: Disable ZSL+AE-bracketing if not supported."Linux Build Service Account2015-02-041-2/+5
|\ \ \ \ | |/ / / |/| | |
| * | | SnapdragonCamera: Disable ZSL+AE-bracketing if not supported.Sai Kumar Sanagavarapu2015-02-021-2/+5
|/ / / | | | | | | | | | | | | | | | | | | Use ZSL+HDR feature check to disable AE-bracketing if not supported, because HDR internally uses AE-bracketing only. Change-Id: I47abe4373e643b1a790c50ada34bd481b3ee0031
* | | Merge "SnapdragonCamera: Add Portrait to scene mode"Linux Build Service Account2015-01-283-230/+9
|\ \ \
| * | | SnapdragonCamera: Add Portrait to scene modeByunghun Jeon2015-01-263-230/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add portrait option to scene mode Change-Id: I5c29e896734eab25e8f21adb142006081ea1c851 CRs-Fixed: 777753
* | | | Merge "SnapdragonCamera: fix not update preview thumb in scenemode macro+"Linux Build Service Account2015-01-281-19/+4
|\ \ \ \
| * | | | SnapdragonCamera: fix not update preview thumb in scenemode macro+kaiyiz2015-01-221-19/+4
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function update preview thumb is not called in macro+ mode. Fix the logic about macro+ mode, treat 7th picture as a normal picture taken. Change-Id: Icdd8f93d3feeb09eea67a3077b5ebf82508543cc CRs-Fixed: 783720
* | | | Merge "SnapdragonCamera: Sync surface destruction and camera open thread."Linux Build Service Account2015-01-262-1/+9
|\ \ \ \ | |_|/ / |/| | |
| * | | SnapdragonCamera: Sync surface destruction and camera open thread.Sai Kumar Sanagavarapu2015-01-202-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If surface gets destroyed while Camera open thread is still trying to start preview, camera app state machine will go into toss. Next time when surface gets created again, it might try to set preview surface again while previewing leading to app exception. So, sync surface destruction and camera open threads. Change-Id: I6ba4103559766c327d2bc55887a0f7df1b4b0d40
* | | | Merge "SnapdragonCamera: New shutter Icons"Linux Build Service Account2015-01-2355-22/+86
|\ \ \ \ | |_|/ / |/| | |
| * | | SnapdragonCamera: New shutter IconsByunghun Jeon2015-01-2055-22/+86
| | | | | | | | | | | | | | | | | | | | | | | | Add new shutter icons for SnapdragonCamera Change-Id: Ic0abf1b509800133bbd9dbee0cc34ebca02e5bcb
* | | | 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: fix CalledFromWrongThreadException"Linux Build Service Account2015-01-211-1/+6
|\ \ \ \ \
| * | | | | SnapdragonCamera: fix CalledFromWrongThreadExceptionLikai Ding2015-01-201-1/+6
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | updateRemainingPhotos() may be called from background thread. Fix it by posting to main thread. Change-Id: Iad14f0a40c10a245e3a7178f5a7f1383eca72ad8
* | | | | Merge "SnapdragonCamera: Open camera in init for improve start preview KPIs"Linux Build Service Account2015-01-202-4/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | SnapdragonCamera: Open camera in init for improve start preview KPIskaiyiz2015-01-162-4/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "SnapdragonCamera: implement refocus feature"Linux Build Service Account2015-01-1816-15/+522
|\ \ \ \
| * | | | SnapdragonCamera: implement refocus featureLikai Ding2015-01-1416-15/+522
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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