summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* am 6f1dfe69: Merge "Don\'t set mCameraAppUI to null in onDestroy" into ub-cam...Puneet Lall2014-09-161-1/+0
|\
| * Merge "Don't set mCameraAppUI to null in onDestroy" into ub-camera-glacierPuneet Lall2014-09-151-1/+0
| |\
| | * Don't set mCameraAppUI to null in onDestroyPuneet Lall2014-09-151-1/+0
* | | am a16219d5: set proper alpha on shutter button on mode switch, eliminates a ...Spike Sprague2014-09-151-0/+1
|\| |
| * | set proper alpha on shutter button on mode switch,Spike Sprague2014-09-121-0/+1
| |/
* | am 70a96525: Don\'t send redundant requests to start the previewPuneet Lall2014-09-121-26/+55
|\|
| * Don't send redundant requests to start the previewPuneet Lall2014-09-111-26/+55
* | am 486ba1da: Revert layout change for CameraAlan Newberger2014-09-121-1/+1
|\|
| * Revert layout change for CameraAlan Newberger2014-09-111-1/+1
* | am 45f316bc: Establish synchronous camera closing when app utilizes API1/API2Alan Newberger2014-09-111-2/+5
|\|
| * Establish synchronous camera closing when app utilizes API1/API2Alan Newberger2014-09-111-2/+5
* | am e6ebf3d7: If we are using CaptureModule for Gcam only, turn off flash.Andy Huibers2014-09-111-0/+4
|\|
| * If we are using CaptureModule for Gcam only, turn off flash.Andy Huibers2014-09-101-0/+4
* | am 0c9af933: Merge "Revert "Delay PhotoModule preview cover removal to addres...Alan Newberger2014-09-111-8/+3
|\|
| * Merge "Revert "Delay PhotoModule preview cover removal to address jank"" into...Alan Newberger2014-09-111-8/+3
| |\
| | * Revert "Delay PhotoModule preview cover removal to address jank"Alan Newberger2014-09-111-8/+3
* | | am 7351415d: Reset aspect ratio on pauseAlan Newberger2014-09-115-1/+16
|\| |
| * | Reset aspect ratio on pauseAlan Newberger2014-09-105-1/+16
* | | am 87a2300f: Merge "workaround fix" into ub-camera-glacierSpike Sprague2014-09-101-2/+2
|\| |
| * | Merge "workaround fix" into ub-camera-glacierSpike Sprague2014-09-101-2/+2
| |\ \
| | * | workaround fixSpike Sprague2014-09-101-2/+2
* | | | am 3096e672: Merge "Delay PhotoModule preview cover removal to address jank" ...Alan Newberger2014-09-101-3/+8
|\| | |
| * | | Merge "Delay PhotoModule preview cover removal to address jank" into ub-camer...Alan Newberger2014-09-101-3/+8
| |\ \ \ | | | |/ | | |/|
| | * | Delay PhotoModule preview cover removal to address jankAlan Newberger2014-09-101-3/+8
* | | | am d3ee86b7: Merge "Return to filmstrip when video playback finishes." into u...Senpo Hu2014-09-102-5/+4
|\| | |
| * | | Merge "Return to filmstrip when video playback finishes." into ub-camera-glacierSenpo Hu2014-09-102-5/+4
| |\ \ \
| | * | | Return to filmstrip when video playback finishes.Senpo Hu2014-09-102-5/+4
* | | | | am 5675b8af: Fix the upside-down orienation bug in CaptureModule.Senpo Hu2014-09-101-1/+5
|\| | | |
| * | | | Fix the upside-down orienation bug in CaptureModule.Senpo Hu2014-09-101-1/+5
| |/ / /
* | | | am d79b38d6: Merge "Remove jank on camera options switching" into ub-camera-g...Alan Newberger2014-09-103-2/+17
|\| | |
| * | | Merge "Remove jank on camera options switching" into ub-camera-glacierAlan Newberger2014-09-103-2/+17
| |\ \ \
| | * | | Remove jank on camera options switchingAlan Newberger2014-09-093-2/+17
* | | | | am 9cefdd49: Changed double to float. viewFinder -> viewfinder.Jiawen Chen2014-09-103-14/+14
|\| | | |
| * | | | Changed double to float. viewFinder -> viewfinder.Jiawen Chen2014-09-103-14/+14
| | |/ / | |/| |
* | | | am ffc395d6: Reinitialize shutter button in Camera mode upon preview startAlan Newberger2014-09-101-0/+1
|\| | |
| * | | Reinitialize shutter button in Camera mode upon preview startAlan Newberger2014-09-101-0/+1
* | | | am 5c4bd6b5: Reduce logging for unknown camera scopeAlan Newberger2014-09-101-2/+1
|\| | |
| * | | Reduce logging for unknown camera scopeAlan Newberger2014-09-101-2/+1
| | |/ | |/|
* | | am a710f371: Merge "This fixes Bitmap.createBitmap offset bug in L, not sure ...Andy Huibers2014-09-101-0/+12
|\| |
| * | Merge "This fixes Bitmap.createBitmap offset bug in L, not sure why." into ub...Andy Huibers2014-09-101-0/+12
| |\ \
| | * | This fixes Bitmap.createBitmap offset bug in L, not sure why.Andy Huibers2014-09-091-0/+12
| * | | Merge "DO NOT MERGE: Adjust for camera2 API changes" into ub-camera-glacierQiwen Zhao2014-09-101-1/+1
| |\ \ \
| | * | | DO NOT MERGE: Adjust for camera2 API changesEino-Ville Talvala2014-09-091-1/+1
| | |/ /
* | | | am 42a5ad5a: Merge "Granting read permission in the result intent for VIDEO_C...Nicolas Prevot2014-09-101-0/+1
|\| | |
| * | | Merge "Granting read permission in the result intent for VIDEO_CAPTURE." into...Nicolas Prevot2014-09-101-0/+1
| |\ \ \
| | * | | Granting read permission in the result intent for VIDEO_CAPTURE.Nicolas Prevot2014-09-091-0/+1
| | |/ /
* | | | am 5e3bf4cc: Remove toast. This reverts commit 779414e8bfe23d66de310570ff2314...Andy Huibers2014-09-101-9/+0
|\| | |
| * | | Remove toast.Andy Huibers2014-09-091-9/+0
| | |/ | |/|
* | | am b954b3e8: Merge "Always match camera orientation with device orientation r...Senpo Hu2014-09-102-16/+16
|\| |
| * | Merge "Always match camera orientation with device orientation regardless por...Senpo Hu2014-09-102-16/+16
| |\ \