summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/ui
Commit message (Expand)AuthorAgeFilesLines
* Fix jitter in FilmStripView.Angus Kong2013-05-201-14/+51
* Add remove UI in FilmStripViewAngus Kong2013-05-162-58/+220
* Add new camera activity back and fix build errorsDoris Liu2013-05-163-3/+146
* am 655e208d: Merge "Correct label position after rotation" into gb-ub-photos-...Michael Kolb2013-05-151-1/+1
|\
| * Correct label position after rotationMichael Kolb2013-05-141-1/+1
* | Improve bitmap load efficiency.Angus Kong2013-05-141-12/+28
* | Dropping back FilmStripView codes.Angus Kong2013-05-132-0/+937
* | Remove new camera activity to avoid build breakageDoris Liu2013-05-084-1036/+1
* | am c3fde4b4: Merge "Fix second level menu" into gb-ub-photos-bryceMichael Kolb2013-05-081-50/+42
|\|
| * Fix second level menuMichael Kolb2013-05-081-50/+42
* | am b281a646: Merge "Fix video capture intent overlapping buttons" into gb-ub-...Doris Liu2013-05-071-1/+1
|\|
| * Merge "Fix video capture intent overlapping buttons" into gb-ub-photos-bryceDoris Liu2013-05-081-1/+1
| |\
| | * Fix video capture intent overlapping buttonsDoris Liu2013-05-071-1/+1
* | | am 0a830ce4: Merge "Add animation to slice selection" into gb-ub-photos-bryceMichael Kolb2013-05-071-1/+47
|\| |
| * | Add animation to slice selectionMichael Kolb2013-05-071-1/+47
| |/
* | am 48ce39b8: Fix review button placementMichael Kolb2013-05-071-53/+66
|\|
| * Fix review button placementMichael Kolb2013-05-071-53/+66
* | am ed1224f1: Resize children to avoid laying out outside parentDoris Liu2013-05-071-16/+32
|\|
| * Resize children to avoid laying out outside parentDoris Liu2013-05-061-16/+32
* | am 3a50eb36: Merge "Restrict checking for device flip" into gb-ub-photos-bryceDoris Liu2013-05-062-7/+20
|\|
| * 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
* | | am 1e3bc7d4: Set correct label text in tap modeMichael Kolb2013-05-061-0/+1
|\| |
| * | Set correct label text in tap modeMichael Kolb2013-05-061-0/+1
* | | am cd0fb7af: Fix NPE caused by insets never being setDoris Liu2013-05-031-6/+8
|\| |
| * | Fix NPE caused by insets never being setDoris Liu2013-05-031-6/+8
| |/
* | am 4b9dea3a: Merge "Anchor camera controls when flipping device" into gb-ub-p...Doris Liu2013-05-032-68/+124
|\|
| * Anchor camera controls when flipping deviceDoris Liu2013-05-032-68/+124
* | am fb936141: Merge "Fix layout and preview for tablets" into gb-ub-photos-bryceMichael Kolb2013-05-011-9/+25
|\|
| * Fix layout and preview for tabletsMichael Kolb2013-05-011-9/+25
* | am c43e5b6b: Update capture animationMichael Kolb2013-05-011-1/+11
|\|
| * Update capture animationMichael Kolb2013-05-011-1/+11
* | am 64c9c183: Adjust switcher animationMichael Kolb2013-05-011-11/+27
|\|
| * Adjust switcher animationMichael Kolb2013-04-301-11/+27
* | am b048226f: Merge "Align review controls" into gb-ub-photos-bryceMichael Kolb2013-05-011-0/+9
|\|
| * Align review controlsMichael Kolb2013-04-301-0/+9
* | am ce8f6d1b: Remove empty slots from menuMichael Kolb2013-05-012-43/+32
|\|
| * Remove empty slots from menuMichael Kolb2013-04-302-43/+32
* | am ef878669: Fix indicator layoutMichael Kolb2013-04-291-1/+1
|\|
| * Fix indicator layoutMichael Kolb2013-04-291-1/+1
* | am 132eb666: Merge "Don\'t render label on focus ring" into gb-ub-photos-bryceMichael Kolb2013-04-261-0/+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
| * | Merge "Remove new camera activity code from Bryce" into gb-ub-photos-bryceDoris Liu2013-04-264-1036/+1
| |\ \
| | * | Remove new camera activity code from BryceDoris Liu2013-04-254-1036/+1
| | |/
* | | am 37177f96: Merge "Make sure the initial rotation is set" into gb-ub-photos-...Doris Liu2013-04-261-1/+1
|\| |
| * | Make sure the initial rotation is setDoris Liu2013-04-251-1/+1
| |/
* | am 2e7f1704: Merge "Avoid rendering underneath nav bar" into gb-ub-photos-bryceDoris Liu2013-04-251-7/+32
|\|
| * Avoid rendering underneath nav barDoris Liu2013-04-241-7/+32
* | am 474c2273: Merge "New capture animation" into gb-ub-photos-bryceMichael Kolb2013-04-241-3/+154
|\|