summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fix/simplify comparator of LocalData." into gb-ub-photos-carlsbadAngus Kong2013-05-231-9/+11
|\
| * Fix/simplify comparator of LocalData.Angus Kong2013-05-231-9/+11
* | Merge "Refactor to add FilmStripView.Controller." into gb-ub-photos-carlsbadAngus Kong2013-05-231-83/+122
|\ \
| * | Refactor to add FilmStripView.Controller.Angus Kong2013-05-221-83/+122
| |/
* | am 80a3d636: Make capture thumbnail tappable in video mode.Sascha Haeberling2013-05-223-1/+37
|\ \ | |/ |/|
| * Make capture thumbnail tappable in video mode.Sascha Haeberling2013-05-213-1/+37
* | Keep camera preview in view hierarchy.Angus Kong2013-05-211-5/+29
* | Fix off-position issue after changing orientationAngus Kong2013-05-211-93/+100
* | Fix jitter in FilmStripView.Angus Kong2013-05-201-14/+51
* | Add remove UI in FilmStripViewAngus Kong2013-05-165-58/+257
* | Add new camera activity back and fix build errorsDoris Liu2013-05-1612-3/+7226
* | am 655e208d: Merge "Correct label position after rotation" into gb-ub-photos-...Michael Kolb2013-05-151-1/+1
|\|
| * Merge "Correct label position after rotation" into gb-ub-photos-bryceMichael Kolb2013-05-151-1/+1
| |\
| | * Correct label position after rotationMichael Kolb2013-05-141-1/+1
* | | Merge "Improve bitmap load efficiency." into gb-ub-photos-carlsbadAngus Kong2013-05-153-356/+524
|\ \ \
| * | | Improve bitmap load efficiency.Angus Kong2013-05-143-356/+524
* | | | am 26dbb20c: Merge "Pause face detection when review captured images" into gb...Doris Liu2013-05-141-0/+2
|\ \ \ \ | |/ / / |/| / / | |/ /
| * / Pause face detection when review captured imagesDoris Liu2013-05-141-0/+2
| |/
* / Dropping back FilmStripView codes.Angus Kong2013-05-133-0/+1541
|/
* Merge "Close menu in onPause" into gb-ub-photos-bryceBart Sears2013-05-091-0/+1
|\
| * Close menu in onPauseMichael Kolb2013-05-081-0/+1
* | Add drop shadow to preview thumbMichael Kolb2013-05-083-24/+19
|/
* Fix second level menuMichael Kolb2013-05-084-158/+102
* Merge "Fix video capture intent overlapping buttons" into gb-ub-photos-bryceDoris Liu2013-05-084-2/+14
|\
| * Fix video capture intent overlapping buttonsDoris Liu2013-05-074-2/+14
* | Add animation to slice selectionMichael Kolb2013-05-071-1/+47
|/
* Fix review button placementMichael Kolb2013-05-071-53/+66
* Resize children to avoid laying out outside parentDoris Liu2013-05-061-16/+32
* Merge "Restrict checking for device flip" into gb-ub-photos-bryceDoris Liu2013-05-062-7/+20
|\
| * Restrict checking for device flipDoris Liu2013-05-032-7/+20
* | Set correct label text in tap modeMichael Kolb2013-05-061-0/+1
* | Fix NPE caused by insets never being setDoris Liu2013-05-031-6/+8
|/
* Merge "Anchor camera controls when flipping device" into gb-ub-photos-bryceDoris Liu2013-05-032-68/+124
|\
| * Anchor camera controls when flipping deviceDoris Liu2013-05-032-68/+124
* | Don't show settings when popup is shown.Angus Kong2013-05-021-0/+1
|/
* Fix layout and preview for tabletsMichael Kolb2013-05-011-9/+25
* Update capture animationMichael Kolb2013-05-014-3/+46
* Update location indicator correctlyMichael Kolb2013-04-303-11/+10
* Adjust switcher animationMichael Kolb2013-04-301-11/+27
* Align review controlsMichael Kolb2013-04-301-0/+9
* Remove empty slots from menuMichael Kolb2013-04-305-125/+94
* Remove timer indicatorMichael Kolb2013-04-291-6/+0
* Fix indicator layoutMichael Kolb2013-04-291-1/+1
* Merge "Delegate the texture copy to DrawClient." into gb-ub-photos-bryceAngus Kong2013-04-261-9/+14
|\
| * Delegate the texture copy to DrawClient.Angus Kong2013-04-261-9/+14
* | Add new indicatorsMichael Kolb2013-04-265-28/+70
|/
* Merge "Center Video menu" into gb-ub-photos-bryceMichael Kolb2013-04-261-4/+4
|\
| * Center Video menuMichael Kolb2013-04-261-4/+4
* | Merge "Don't render label on focus ring" into gb-ub-photos-bryceMichael Kolb2013-04-261-0/+4
|\ \
| * | Don't render label on focus ringMichael Kolb2013-04-261-0/+4
| |/