summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | am 0dff7ce1: Merge "Reset zoom view when user exits app or rotate device" ↵Doris Liu2013-08-301-0/+27
|\| | | | | | | | | | | | | into gb-ub-photos-carlsbad * commit '0dff7ce1f701816b4a634b612bcaaaae6de0da34': Reset zoom view when user exits app or rotate device
| * Merge "Reset zoom view when user exits app or rotate device" into ↵Doris Liu2013-08-311-0/+27
| |\ | | | | | | | | | gb-ub-photos-carlsbad
| | * Reset zoom view when user exits app or rotate deviceDoris Liu2013-08-301-0/+27
| | | | | | | | | | | | | | | Bug:10308195 Change-Id: Icf1acc4b17611b28a9c65ec809083ac58da5bd8f
* | | am b2f0968c: Merge "Make the preview thumbnail clicable after scaling." into ↵Angus Kong2013-08-301-4/+29
|\| | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit 'b2f0968c90a352cca43f508d216c3f28c3d2cc16': Make the preview thumbnail clicable after scaling.
| * | Merge "Make the preview thumbnail clicable after scaling." into ↵Angus Kong2013-08-311-4/+29
| |\ \ | | |/ | |/| | | | gb-ub-photos-carlsbad
| | * Make the preview thumbnail clicable after scaling.Angus Kong2013-08-301-4/+29
| | | | | | | | | | | | | | | | | | bug:10552110 Change-Id: I81abd96ad971543412597dbe8f7f57eeb6d3c1fa
* | | am 72a57ddf: Merge "Automatic versioning for Camera." into gb-ub-photos-carlsbadSascha Haeberling2013-08-303-5/+106
|\| | | | | | | | | | | | | | * commit '72a57ddf178b410ffb3c4532fc4e56b8b1d99706': Automatic versioning for Camera.
| * | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10461009 This is the scheme copied from GMS Core and modified by Babel, which allows us to generate version number more easily and also incorporate build numbers into it. Change-Id: I6ed4bf03e545a22423cb9936a5fcb67a50133490
* | | | am 750e73c4: Merge "Measure all children to ensure correct layout position" ↵Doris Liu2013-08-301-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | into gb-ub-photos-carlsbad * commit '750e73c4a4b04a5695540d3c982774662307b58e': Measure all children to ensure correct layout position
| * | | Merge "Measure all children to ensure correct layout position" into ↵Doris Liu2013-08-301-0/+2
| |\ \ \ | | | | | | | | | | | | | | | gb-ub-photos-carlsbad
| | * | | Measure all children to ensure correct layout positionDoris Liu2013-08-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10412775 Change-Id: Ia64d6d4d0d023b208edb70066b4d4670e4ad2bbb
* | | | | am 8d2c6b83: Merge "Skip bitmaps with 0 dimension." into gb-ub-photos-carlsbadAngus Kong2013-08-301-3/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '8d2c6b830131a3d2e6ec7f2f8158b37506403dbd': Skip bitmaps with 0 dimension.
| * | | | 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
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | bug:10514553 Change-Id: I0d26a324ede55b281e60cedc174869f5b863ca31
* | | | | am 5f6b50de: Add back button handlng to CameraActivity.Alan Newberger2013-08-301-0/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '5f6b50deaf46fb546ebf6d0d6244ebf7fb79c7ca': Add back button handlng to CameraActivity.
| * | | | Add back button handlng to CameraActivity.Alan Newberger2013-08-301-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL first detects whether user is in filmstrip mode i.e. not in Camera, if so brings user back to the first item which is the Camera. If in Camera, we route back handling to the current Camera module which enables already- written module handling for back button e.g. backing out of pie menus. Bug: 8781981 Change-Id: I18377ea5fbdcd8bd8c6fc3af9cb5322d5f5a889a
* | | | | am 2581af9b: Merge "add up button support for filmstrip" into ↵Alan Newberger2013-08-302-23/+35
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit '2581af9b08ac913465303795745c3ce24eb0f20c': add up button support for filmstrip
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL adds up affordance handling to CameraActivity. There was no working call to reset the filmstrip back to the camera, so this CL adds a controller which then calls reload, which is itself fixed to work as desired. Note that during testing I identified issue 10563392, I've decided to file that separately since it is orthogonal to up button function, but it does affect the overall experience and should be fixed. Bug: 10414498 Change-Id: I1ee914dc1d264adb1fb5a363c2d6174070cd7b71
* | | | | | am 1b44336b: Merge "Let the Camera app remember which mode it was started in ↵Sascha Haeberling2013-08-301-15/+47
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | last." into gb-ub-photos-carlsbad * commit '1b44336b29d2145eaaf0786be47c08e2b5304bcf': Let the Camera app remember which mode it was started in last.
| * | | | | Merge "Let the Camera app remember which mode it was started in last." into ↵Sascha Haeberling2013-08-301-15/+47
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | gb-ub-photos-carlsbad
| | * | | | Let the Camera app remember which mode it was started in last.Sascha Haeberling2013-08-281-15/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7320368 Change-Id: Ia2ae47693f453c9bcff315af87fe1e5a44b6e5c7
* | | | | | am 6447ef1e: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-08-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6447ef1e7cef4dad424f9e91c8fb730a6c8d0376': Import translations. DO NOT MERGE
| * | | | | Import translations. DO NOT MERGEBaligh Uddin2013-08-2949-17588/+31547
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I27af5d736c885d9dbadfb635c5c6ea3a8f570543 Auto-generated-cl: translation import
* | | | | | am b3d4d8e5: Merge "Fix gap between camera controls and nav bar" into ↵Doris Liu2013-08-303-7/+19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit 'b3d4d8e58831f6fffc078c8a6ee750dfe0f2a123': Fix gap between camera controls and nav bar
| * | | | | 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
| | | |/ / | | |/| | | | | | | | | | | | | | | | | Bug: 10097187 Change-Id: I9918a09a1e0b2d3c5a89330b800a9b7f2c2a6408
* | | | | am c09c5f03: Merge "Fix of memory issues with bitmaps in filmstrip." into ↵Sascha Haeberling2013-08-301-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit 'c09c5f0328a28ccfe9a0a9b37d028e91a94ded94': Fix of memory issues with bitmaps in filmstrip.
| * | | | Merge "Fix of memory issues with bitmaps in filmstrip." into ↵Sascha Haeberling2013-08-301-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad
| | * | | | Fix of memory issues with bitmaps in filmstrip.Sascha Haeberling2013-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10495593 We should use the bigger scale factor of the two, and not the smaller. Change-Id: I5a1ff6fe7d6b50c0128ff17709daa94cef9cb65b
* | | | | | am f3d3a5c6: Merge "Disable shutter button while picture is being taken." ↵Sascha Haeberling2013-08-292-0/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gb-ub-photos-carlsbad * commit 'f3d3a5c63bd0d88882f0180ac79186c03c644c70': Disable shutter button while picture is being taken.
| * | | | | Merge "Disable shutter button while picture is being taken." into ↵Sascha Haeberling2013-08-302-0/+7
| |\| | | | | | |/ / / | |/| | | | | | | | gb-ub-photos-carlsbad
| | * | | Disable shutter button while picture is being taken.Sascha Haeberling2013-08-282-0/+7
| | |/ / | | | | | | | | | | | | | | | | | | | | Bug: 7328018 Change-Id: I98160d52c542186aa9f2d85f66a4e0120a917e38
* | | | am 8de13111: 1:1 zoom integrationDoris Liu2013-08-294-362/+351
|\| | | | | | | | | | | | | | | | | | | * commit '8de13111cc4e62da3462ea321d18c7951282e0d0': 1:1 zoom integration
| * | | 1:1 zoom integrationDoris Liu2013-08-294-362/+351
| | | | | | | | | | | | | | | | | | | | Bug: 10308195 Change-Id: I940891f6aa3e24575174ff888c384fddaaa5b3c8
* | | | am 0df03318: Merge "Flip capture thumb when using front facing camera" into ↵Doris Liu2013-08-282-10/+18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit '0df03318d36f77aaec11238854921bd45f50c035': Flip capture thumb when using front facing camera
| * | | Merge "Flip capture thumb when using front facing camera" into ↵Doris Liu2013-08-292-10/+18
| |\ \ \ | | |/ / | |/| | | | | | gb-ub-photos-carlsbad
| | * | Flip capture thumb when using front facing cameraDoris Liu2013-08-282-10/+18
| | | | | | | | | | | | | | | | | | | | Bug: 10495008 Change-Id: I9f444625e64be35afe44b0d7f50d81fbd1936ae8
* | | | am 2d1c49c2: Merge "Add rotate support in Film Strip" into gb-ub-photos-carlsbadztenghui2013-08-2830-217/+437
|\| | | | | | | | | | | | | | | | | | | * commit '2d1c49c2959d8b5adecd8bb5668fd50c1bf0190c': Add rotate support in Film Strip
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the exif related code under src.com.android.camera.exif. Refactor the member variables under LocalMediaData.java. Refactor the LocalData to make sure they are immutables for thread safety. bug:10367037 Change-Id: I0e84bcc0097925b2be749fe016984177a68e0a4d
* | | | am 09d5983d: Merge "Revert "Add rotate support in Film Strip"" into ↵Tenghui Zhu2013-08-2828-437/+189
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit '09d5983dfbd252fca56ee8368906156e69a9fed0': Revert "Add rotate support in Film Strip"
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 568ad02f9fd3993abf4b973bdd49a34737267c77. Change-Id: I300376126b55191e4112b8aabf3f9f61cc27fef6
* | | | | am 80e2e1ec: Merge "Add rotate support in Film Strip" into gb-ub-photos-carlsbadztenghui2013-08-2828-189/+437
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '80e2e1eca93d1df72420eb6d1b7db88460620b6e': Add rotate support in Film Strip
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the exif related code under src.com.android.camera.exif. Refactor the member variables under LocalMediaData.java. Refactor the LocalData to make sure they are immutables for thread safety. bug:10367037 Change-Id: I0b8128a806fa9e777a87967b294555daadced1c5
* | | | am 7446e9fd: Use the well-translated camera_label instead of app_name.Sascha Haeberling2013-08-272-5/+4
|\| | | | | | | | | | | | | | | | | | | * commit '7446e9fde7cd8dd7904beff592e8819513797ab9': Use the well-translated camera_label instead of app_name.
| * | | Use the well-translated camera_label instead of app_name.Sascha Haeberling2013-08-272-5/+4
| | |/ | |/| | | | | | | | | | | | | Bug: 10509953 Change-Id: Ia5522fce1892e521c12fcc2f152afe7009026ac5
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-27 23:49:23 +0000