summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trap camera close exceptions on pauseAlan Newberger2014-10-021-2/+11
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Avoid porting null keys when copying preferences into new system" into...Alan Newberger2014-10-051-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid porting null keys when copying preferences into new systemAlan Newberger2014-10-041-2/+6
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / Only set preview size before starting previewAlan Newberger2014-10-041-82/+62
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use NEW_DOCUMENT vs NEW_TASK when starting Activities from CameraAlan Newberger2014-10-022-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix error in settings key from refactorAlan Newberger2014-10-011-1/+1
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only allow one draw call pending at a timeAlan Newberger2014-09-301-30/+12
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stability: call stopPreview() before switching off video module.Senpo Hu2014-09-301-4/+17
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-devBaligh Uddin2014-09-2911-25/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-09-2911-25/+25
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 2d3475ae: Fix crash in VideoModule - Method called after release()Senpo Hu2014-09-291-7/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix crash in VideoModule - Method called after release()Senpo Hu2014-09-281-7/+21
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 022ce61e: Synchronize CaptureModule camera open/close operationsPuneet Lall2014-09-275-35/+161
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synchronize CaptureModule camera open/close operationsPuneet Lall2014-09-265-35/+161
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am feb07ea4: Merge "Stability: add null check for all CameraProxy obj referen...Senpo Hu2014-09-262-19/+42
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Stability: add null check for all CameraProxy obj references in VideoM...Senpo Hu2014-09-262-19/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stability: add null check for all CameraProxy obj references inSenpo Hu2014-09-262-19/+42
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am ad12363e: Revert app workaround for bug 17614203 now that HAL is fixed. Th...Andy Huibers2014-09-261-12/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert app workaround for bug 17614203 now that HAL is fixed.Andy Huibers2014-09-261-12/+0
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 47c4474e: Merge "Force filmstrip images to generate in JPEG compression fo...Alan Newberger2014-09-251-3/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Force filmstrip images to generate in JPEG compression format" into ub...Alan Newberger2014-09-251-3/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Force filmstrip images to generate in JPEG compression formatAlan Newberger2014-09-251-3/+8
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 4d2f3bf4: Merge "Recreate a OneCameraManager instance for each Activity." ...Puneet Lall2014-09-252-14/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Recreate a OneCameraManager instance for each Activity." into ub-camer...Puneet Lall2014-09-252-14/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recreate a OneCameraManager instance for each Activity.Puneet Lall2014-09-252-14/+10
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am ee3123ba: Stability: add null check for all CameraProxy obj references in ...Senpo Hu2014-09-251-6/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stability: add null check for all CameraProxy obj references in PhotoModule.Senpo Hu2014-09-251-6/+13
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am da6f3acc: Skip disk caching for session dataAlan Newberger2014-09-251-2/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip disk caching for session dataAlan Newberger2014-09-241-2/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 6b2d1e0b: Merge "Revert temporary session images in filmstrip to RGB_565" ...Alan Newberger2014-09-251-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert temporary session images in filmstrip to RGB_565" into ub-camer...Alan Newberger2014-09-251-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert temporary session images in filmstrip to RGB_565Alan Newberger2014-09-241-0/+4
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 347dccbe: Ensure Camera doesn\'t attempt access of back camera on NakasiAlan Newberger2014-09-252-4/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure Camera doesn't attempt access of back camera on NakasiAlan Newberger2014-09-242-4/+7
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | / / / / / / / / / / / / / / / / / / / / / / / / / / / am 2631a15a: Don\'t show aspect ratio UI if using API2 portabilityAlan Newberger2014-09-243-3/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't show aspect ratio UI if using API2 portabilityAlan Newberger2014-09-243-3/+10
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | am eeeed4fa: new sounds for timer ticker and pano / photosphere intermediate ...Spike Sprague2014-09-2413-11/+53
|\| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | new sounds for timer ticker and pano / photosphere intermediate capturesSpike Sprague2014-09-2313-11/+53
* | | | | | | | | | | | | | | | | | | | | | | | | | | | am 7d1fb593: Merge "monkey test NPE fix, another null check on mCameraDevice"...Spike Sprague2014-09-241-1/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "monkey test NPE fix, another null check on mCameraDevice" into ub-came...Spike Sprague2014-09-241-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | monkey test NPE fix, another null check on mCameraDeviceSpike Sprague2014-09-221-1/+5
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | am b60af188: Merge "Fix filmstrip item bounds to filmstrip scale" into ub-cam...Alan Newberger2014-09-231-2/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix filmstrip item bounds to filmstrip scale" into ub-camera-glacierAlan Newberger2014-09-231-2/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Fix filmstrip item bounds to filmstrip scaleAlan Newberger2014-09-211-2/+6
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | am 5f86f7fd: Cleanup gesture UI hide codeAlan Newberger2014-09-231-13/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup gesture UI hide codeAlan Newberger2014-09-221-13/+8
* | | | | | | | | | | | | | | | | | | | | | | | | | | | am b2b0e02c: Clean up unused codeAlan Newberger2014-09-237-2012/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Clean up unused codeAlan Newberger2014-09-227-2012/+0
| |/ / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | am 02758e4c: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-came...Baligh Uddin2014-09-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into ub-camera-glacierBaligh Uddin2014-09-193-10/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \