summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | am 0dff7ce1: Merge "Reset zoom view when user exits app or rotate device" int...Doris Liu2013-08-301-0/+27
|\|
| * Merge "Reset zoom view when user exits app or rotate device" into gb-ub-photo...Doris Liu2013-08-311-0/+27
| |\
| | * Reset zoom view when user exits app or rotate deviceDoris Liu2013-08-301-0/+27
* | | am b2f0968c: Merge "Make the preview thumbnail clicable after scaling." into ...Angus Kong2013-08-301-4/+29
|\| |
| * | Merge "Make the preview thumbnail clicable after scaling." into gb-ub-photos-...Angus Kong2013-08-311-4/+29
| |\ \ | | |/ | |/|
| | * Make the preview thumbnail clicable after scaling.Angus Kong2013-08-301-4/+29
* | | am 72a57ddf: Merge "Automatic versioning for Camera." into gb-ub-photos-carlsbadSascha Haeberling2013-08-303-5/+106
|\| |
| * | Merge "Automatic versioning for Camera." into gb-ub-photos-carlsbadSascha Haeberling2013-08-303-5/+106
| |\ \
| | * | Automatic versioning for Camera.Sascha Haeberling2013-08-283-5/+106
* | | | am 750e73c4: Merge "Measure all children to ensure correct layout position" i...Doris Liu2013-08-301-0/+2
|\| | |
| * | | Merge "Measure all children to ensure correct layout position" into gb-ub-pho...Doris Liu2013-08-301-0/+2
| |\ \ \
| | * | | Measure all children to ensure correct layout positionDoris Liu2013-08-301-0/+2
* | | | | am 8d2c6b83: Merge "Skip bitmaps with 0 dimension." into gb-ub-photos-carlsbadAngus Kong2013-08-301-3/+9
|\| | | |
| * | | | Merge "Skip bitmaps with 0 dimension." into gb-ub-photos-carlsbadAngus Kong2013-08-301-3/+9
| |\ \ \ \
| | * | | | Skip bitmaps with 0 dimension.Angus Kong2013-08-301-3/+9
| | | |_|/ | | |/| |
* | | | | am 5f6b50de: Add back button handlng to CameraActivity.Alan Newberger2013-08-301-0/+9
|\| | | |
| * | | | Add back button handlng to CameraActivity.Alan Newberger2013-08-301-0/+9
* | | | | am 2581af9b: Merge "add up button support for filmstrip" into gb-ub-photos-ca...Alan Newberger2013-08-302-23/+35
|\| | | |
| * | | | Merge "add up button support for filmstrip" into gb-ub-photos-carlsbadAlan Newberger2013-08-302-23/+35
| |\ \ \ \
| | * | | | add up button support for filmstripAlan Newberger2013-08-302-23/+35
* | | | | | am 1b44336b: Merge "Let the Camera app remember which mode it was started in ...Sascha Haeberling2013-08-301-15/+47
|\| | | | |
| * | | | | Merge "Let the Camera app remember which mode it was started in last." into g...Sascha Haeberling2013-08-301-15/+47
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Let the Camera app remember which mode it was started in last.Sascha Haeberling2013-08-281-15/+47
* | | | | | am 6447ef1e: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-08-300-0/+0
|\| | | | |
| * | | | | Import translations. DO NOT MERGEBaligh Uddin2013-08-2949-17588/+31547
* | | | | | am b3d4d8e5: Merge "Fix gap between camera controls and nav bar" into gb-ub-p...Doris Liu2013-08-303-7/+19
|\| | | | |
| * | | | | Merge "Fix gap between camera controls and nav bar" into gb-ub-photos-carlsbadDoris Liu2013-08-303-7/+19
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Fix gap between camera controls and nav barDoris Liu2013-08-293-7/+19
| | | |/ / | | |/| |
* | | | | am c09c5f03: Merge "Fix of memory issues with bitmaps in filmstrip." into gb-...Sascha Haeberling2013-08-301-1/+1
|\| | | |
| * | | | Merge "Fix of memory issues with bitmaps in filmstrip." into gb-ub-photos-car...Sascha Haeberling2013-08-301-1/+1
| |\ \ \ \
| | * | | | Fix of memory issues with bitmaps in filmstrip.Sascha Haeberling2013-08-301-1/+1
* | | | | | am f3d3a5c6: Merge "Disable shutter button while picture is being taken." int...Sascha Haeberling2013-08-292-0/+7
|\| | | | |
| * | | | | Merge "Disable shutter button while picture is being taken." into gb-ub-photo...Sascha Haeberling2013-08-302-0/+7
| |\| | | | | | |/ / / | |/| | |
| | * | | Disable shutter button while picture is being taken.Sascha Haeberling2013-08-282-0/+7
| | |/ /
* | | | am 8de13111: 1:1 zoom integrationDoris Liu2013-08-294-362/+351
|\| | |
| * | | 1:1 zoom integrationDoris Liu2013-08-294-362/+351
* | | | am 0df03318: Merge "Flip capture thumb when using front facing camera" into g...Doris Liu2013-08-282-10/+18
|\| | |
| * | | Merge "Flip capture thumb when using front facing camera" into gb-ub-photos-c...Doris Liu2013-08-292-10/+18
| |\ \ \ | | |/ / | |/| |
| | * | Flip capture thumb when using front facing cameraDoris Liu2013-08-282-10/+18
* | | | am 2d1c49c2: Merge "Add rotate support in Film Strip" into gb-ub-photos-carlsbadztenghui2013-08-2830-217/+437
|\| | |
| * | | Merge "Add rotate support in Film Strip" into gb-ub-photos-carlsbadztenghui2013-08-2830-217/+437
| |\ \ \ | | |/ / | |/| |
| | * | Add rotate support in Film Stripztenghui2013-08-2830-217/+437
* | | | am 09d5983d: Merge "Revert "Add rotate support in Film Strip"" into gb-ub-pho...Tenghui Zhu2013-08-2828-437/+189
|\| | |
| * | | Merge "Revert "Add rotate support in Film Strip"" into gb-ub-photos-carlsbadTenghui Zhu2013-08-2828-437/+189
| |\ \ \
| | * | | Revert "Add rotate support in Film Strip"Tenghui Zhu2013-08-2828-437/+189
* | | | | am 80e2e1ec: Merge "Add rotate support in Film Strip" into gb-ub-photos-carlsbadztenghui2013-08-2828-189/+437
|\| | | |
| * | | | Merge "Add rotate support in Film Strip" into gb-ub-photos-carlsbadztenghui2013-08-2828-189/+437
| |\| | | | | |/ / | |/| |
| | * | Add rotate support in Film Stripztenghui2013-08-2728-189/+437
* | | | am 7446e9fd: Use the well-translated camera_label instead of app_name.Sascha Haeberling2013-08-272-5/+4
|\| | |
| * | | Use the well-translated camera_label instead of app_name.Sascha Haeberling2013-08-272-5/+4
| | |/ | |/|