summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera
Commit message (Expand)AuthorAgeFilesLines
* Add more menu options/iconsMichael Kolb2013-04-182-42/+80
* Merge "Change labels so that it doesn't clash with PanoUiLib." into gb-ub-pho...George Mount2013-04-181-1/+1
|\
| * Change labels so that it doesn't clash with PanoUiLib.George Mount2013-04-181-1/+1
* | Merge "Add method for returning SoundPool audio type." into gb-ub-photos-bryceSascha Haeberling2013-04-181-3/+6
|\ \
| * | Add method for returning SoundPool audio type.Sascha Haeberling2013-04-171-3/+6
* | | First part of asset dropMichael Kolb2013-04-172-9/+22
|/ /
* / Don't wait for Mosaic Renderer ready in UI thread.Angus Kong2013-04-161-12/+3
|/
* Merge "Angle menu at edge of screen" into gb-ub-photos-bryceMichael Kolb2013-04-161-6/+34
|\
| * Angle menu at edge of screenMichael Kolb2013-04-151-6/+34
* | Use extra copy of parameters for concurrent accessAngus Kong2013-04-155-25/+19
* | Also, add labels to video menuMichael Kolb2013-04-151-0/+5
|/
* Add menu labelsMichael Kolb2013-04-157-4/+85
* Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryceMichael Kolb2013-04-121-22/+31
|\
| * Add checks for NPE in video pie menu.Jason Noguchi2013-04-111-22/+31
* | Merge "Fix NPE in PieRenderer" into gb-ub-photos-bryceMichael Kolb2013-04-121-1/+1
|\ \
| * | Fix NPE in PieRendererMichael Kolb2013-04-121-1/+1
* | | Merge "Fix ICS recording aspect ratio" into gb-ub-photos-bryceDoris Liu2013-04-121-19/+27
|\ \ \
| * | | Fix ICS recording aspect ratioDoris Liu2013-04-111-19/+27
| | |/ | |/|
* | | Merge "Integrate FilmStripView." into gb-ub-photos-bryceAngus Kong2013-04-115-52/+201
|\ \ \ | |/ / |/| |
| * | Integrate FilmStripView.Angus Kong2013-04-115-52/+201
* | | Fix camera preview being squishedDoris Liu2013-04-102-1/+3
|/ /
* / Refactor CameraDataAdapter for other data types.Angus Kong2013-04-092-174/+215
|/
* Fix to imports in NewPhotoModule.Ruben Brunk2013-04-091-1/+1
* Merge "Moving crop to a separate activity. Refactoring." into gb-ub-photos-b...Ruben Brunk2013-04-091-1/+1
|\
| * Moving crop to a separate activity. Refactoring.Ruben Brunk2013-04-091-1/+1
* | Merge "Add more gestures and animations in FilmStripView." into gb-ub-photos-...Angus Kong2013-04-093-118/+557
|\ \
| * | Add more gestures and animations in FilmStripView.Angus Kong2013-04-083-118/+557
| |/
* | Refresh parameters during recording.Angus Kong2013-04-093-0/+15
* | Work in progress - Put preview in TextureViewDoris Liu2013-04-0916-7/+7295
|/
* Don't add unsupported options to menuMichael Kolb2013-04-051-4/+8
* Merge "Adjust camera menu further" into gb-ub-photos-bryceMichael Kolb2013-04-035-160/+143
|\
| * Adjust camera menu furtherMichael Kolb2013-04-035-160/+143
* | Merge "Don't access mParameters dirty bit in other thread" into gb-ub-photos-...Angus Kong2013-04-031-12/+8
|\ \
| * | Don't access mParameters dirty bit in other threadAngus Kong2013-04-031-12/+8
| |/
* / Improve black bar to keep camera controls in placeDoris Liu2013-04-035-36/+157
|/
* Merge "Make stopPreview synchronous." into gb-ub-photos-bryceAngus Kong2013-04-021-0/+3
|\
| * Make stopPreview synchronous.Angus Kong2013-04-021-0/+3
* | Merge "Usage statistics for photo and video capture" into gb-ub-photos-bryceBobby Georgescu2013-04-022-0/+10
|\ \ | |/ |/|
| * Usage statistics for photo and video captureBobby Georgescu2013-04-022-0/+10
* | Merge "Pie design update" into gb-ub-photos-bryceMichael Kolb2013-04-018-153/+343
|\ \
| * | Pie design updateMichael Kolb2013-04-018-153/+343
| |/
* | Handle InterruptedException in waitDoneAngus Kong2013-04-011-4/+14
* | Merge "Don't use SynchronousQueue to pass results." into gb-ub-photos-bryceAngus Kong2013-04-011-41/+27
|\ \
| * | Don't use SynchronousQueue to pass results.Angus Kong2013-04-011-41/+27
| |/
* / Usage statistics for camera settingsBobby Georgescu2013-04-011-3/+4
|/
* Fix NPE when reconnecting camera.Angus Kong2013-04-011-1/+1
* Make camera releasing synchronous.Angus Kong2013-03-281-0/+3
* Merge "Disable preview gestures when shutter is pressed" into gb-ub-photos-bryceDoris Liu2013-03-282-1/+7
|\
| * Disable preview gestures when shutter is pressedDoris Liu2013-03-272-1/+7
* | Merge "Make camera calls asynchronous" into gb-ub-photos-bryceAngus Kong2013-03-273-107/+112
|\ \ | |/ |/|