summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix NPE when deleting a photo in Clustering mode." into ↵Owen Lin2012-09-021-1/+3
|\ | | | | | | gb-ub-photos-arches
| * Fix NPE when deleting a photo in Clustering mode.Owen Lin2012-08-301-1/+3
| | | | | | | | | | bug: 7075760 Change-Id: I64b278b8c9436ada23738f28510736dcf7e18755
* | Merge "Handle other header tag in ExifParser before APP1" into ↵Hung-ying Tyan2012-09-023-42/+59
|\ \ | | | | | | | | | gb-ub-photos-arches
| * | Handle other header tag in ExifParser before APP1Earl Ou2012-08-313-42/+59
| | | | | | | | | | | | Change-Id: I44398e3ed054de441810b795daff8d1edb06df59
* | | Merge "Handle mis-ordered APP segment in ExifOutputStream" into ↵Hung-ying Tyan2012-09-021-11/+36
|\| | | | | | | | | | | gb-ub-photos-arches
| * | Handle mis-ordered APP segment in ExifOutputStreamEarl Ou2012-08-311-11/+36
| | | | | | | | | | | | Change-Id: Ic5ce13d17658e24d1ae42009d3ab30ae538cee10
* | | Merge "Remove the parameter of getAllExifTags() in IfdData" into ↵Hung-ying Tyan2012-09-023-6/+6
|\| | | | | | | | | | | gb-ub-photos-arches
| * | Remove the parameter of getAllExifTags() in IfdDataEarl Ou2012-08-313-6/+6
| | | | | | | | | | | | Change-Id: Iec7f04a9866c53caa2d66d5ea6f679460980b378
* | | Merge "Fix some typos and style in previous CL" into gb-ub-photos-archesHung-ying Tyan2012-09-023-12/+13
|\| |
| * | Fix some typos and style in previous CLEarl Ou2012-08-313-12/+13
| | | | | | | | | | | | Change-Id: If78c0bfebccb20b0c4dad42a11b5dd0946b4e172
* | | Merge "Save EXIF info to cropped picasa image with the new EXIF lib." into ↵Hung-ying Tyan2012-09-024-21/+43
|\| | | | | | | | | | | gb-ub-photos-arches
| * | Save EXIF info to cropped picasa image with the new EXIF lib.Earl Ou2012-08-314-21/+43
| | | | | | | | | | | | | | | Bug:5248023 Change-Id: I35f401826f4fa586e9899e3ca5f5f9b9ab39b28e
* | | Merge "Use FLAG_SHOW_WHEN_LOCKED for secure album." into gb-ub-photos-archesWu-cheng Li2012-08-313-13/+22
|\ \ \
| * | | Use FLAG_SHOW_WHEN_LOCKED for secure album.Wu-cheng Li2012-08-313-13/+22
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | The activity needs this flag to be on top of the lock screen when the camera is started from the secure lock screen. bug:5955016 Change-Id: If554a3f7fef4c03a981c83afe22b8c4980b954d1
* | | Merge "Add api check for FLAG_SECURE." into gb-ub-photos-archesWu-Cheng Li2012-08-301-0/+3
|\ \ \ | |/ / |/| |
| * | Add api check for FLAG_SECURE.Ahbong Chang2012-08-311-0/+3
| | | | | | | | | | | | | | | Bug: 7023285 Change-Id: I515123a7454595846bbea6369c05cd22b7d2ec60
* | | Add prefix to GPS tag in ExifTagEarl Ou2012-08-301-31/+31
| | | | | | | | | | | | Change-Id: Ib07d2847ddcbed3b06d07afa2a6d5851c27760b1
* | | Re-save Exif info for cropped local imageEarl Ou2012-08-301-83/+50
| | | | | | | | | | | | | | | | | | Bug:5248023 Change-Id: I744330f28b887bff4d12937e06f8d20db153ac7e
* | | Merge "ExifOutputStream" into gb-ub-photos-archesOwen Lin2012-08-306-0/+518
|\ \ \
| * | | ExifOutputStreamEarl Ou2012-08-306-0/+518
| | | | | | | | | | | | | | | | Change-Id: I9f2de77e87a502ccdadba0b18658621028c538c9
* | | | Remove unused resources and fix some warnings.Owen Lin2012-08-3016-91/+86
| | | | | | | | | | | | | | | | Change-Id: I075977150c7da7650e723e29406f24ae2e23ea97
* | | | Merge "Add equals() function in ExifData, IfdData, and ExifTag" into ↵Hung-ying Tyan2012-08-295-4/+122
|\| | | | | | | | | | | | | | | gb-ub-photos-arches
| * | | Add equals() function in ExifData, IfdData, and ExifTagEarl Ou2012-08-305-4/+122
| | | | | | | | | | | | | | | | Change-Id: I96c5767354548d0f0d7571fd1d8812e1ab54a5c4
* | | | Merge "Redesign the set function of ExifTag" into gb-ub-photos-archesHung-ying Tyan2012-08-294-67/+160
|\| | | | |/ / |/| |
| * | Redesign the set function of ExifTagEarl Ou2012-08-304-67/+160
| | | | | | | | | | | | Change-Id: Iaf5632d759fe14c167cba54099b99719b31e3431
* | | Merge "Fix OOM in TileImageView." into gb-ub-photos-archesOwen Lin2012-08-292-6/+9
|\ \ \
| * | | Fix OOM in TileImageView.Owen Lin2012-08-292-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is we keep too many decoded images in the upload queue. Those images will be free after it getting uploaded. However, there is a bug which suspend the uploading sometimes. Change-Id: Id97c04eba974cc77e5d8c50588b0cbef776f79da fix: 6995091
* | | | Merge "Reskin: Correctly position rotated thumbs in album listing" into ↵Bobby Georgescu2012-08-291-5/+3
|\ \ \ \ | | | | | | | | | | | | | | | gb-ub-photos-arches
| * | | | Reskin: Correctly position rotated thumbs in album listingBobby Georgescu2012-08-291-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7067732 Bug: 7050303 Changing the slots to be non-square surfaced a small math error, and also raised the question of where exactly to render the texture. The solution that makes the most sense given the current design is to fit the thumbnail (which is always square in our case) in the largest square that fits inside the slot, and aligned to the top. Change-Id: I98d94ad9255399aa4f1e5c403ff81811674bb264
* | | | | Invoke LightCycle viewer for panoramas.Angus Kong2012-08-294-13/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Add SUPPORT_PANORAMA_VIEW to supported operations. 2. Add helper methods in LightCycleHelper: a. checks if the image file is a panorama. b. invokes the panorama view activity. bug:6912297 Change-Id: I7909e49632cad02a795943a113bca6aec17df9dd
* | | | | Merge "Fix pinch out gesture for film strip mode on gingerbread." into ↵Hung-ying Tyan2012-08-291-0/+15
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | gb-ub-photos-arches
| * | | | Fix pinch out gesture for film strip mode on gingerbread.Hung-ying Tyan2012-08-291-0/+15
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On crespo running Android 2.3.6, a pinch out gesture results in the following call sequence: onDown(), onUp() and then onSingleTapUp(). The correct sequence for a single-tap-up gesture should be: onDown(), onSingleTapUp() and onUp(). The call sequence for a pinch out gesture in JB is: onDown() and then onUp(). Base on these observations, a condition is added in onSingleTapUp() to filter out the false alarm where onSingleTapUp() is called within a pinch out gesture. Bug: 7023717 Change-Id: I010b87f95c3197a299a7d907ce32e93a1d5e958f
* | | | Merge "Fix NPE in viewing single image." into gb-ub-photos-archesOwen Lin2012-08-292-27/+25
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix NPE in viewing single image.Owen Lin2012-08-292-27/+25
| |/ / | | | | | | | | | | | | bug: 7052228 Change-Id: Iaca5ed062cd3c8233f212551cf4312f0828f12dc
* | | Save the offset of next IFD in the IfdDataEarl Ou2012-08-291-0/+14
| | | | | | | | | | | | Change-Id: I2c5d2ad390d970603a7a9ce2145029d871098fdb
* | | Merge "Save ByteOrder in the ExifData" into gb-ub-photos-archesHung-ying Tyan2012-08-293-1/+21
|\ \ \
| * | | Save ByteOrder in the ExifDataEarl Ou2012-08-293-1/+21
| |/ / | | | | | | | | | | | | | | | This is useful for decoding undefined data. Change-Id: Ied6864c4d3a8e05ca47215bf5358bd4196f2d3a0
* / / Old panorama only supports ICS and forward.Wu-cheng Li2012-08-291-2/+2
|/ / | | | | | | | | bug:7075249 Change-Id: I0b5884459a417444966ac88284056a182104a68b
* | Reskin: Launch photos in lights-out modeBobby Georgescu2012-08-283-5/+8
| | | | | | | | | | | | | | | | | | Bug: 7050303 - Launch photos in lights out mode when opening from album - One last missing call to super.onCreate added in ManageCachePage Change-Id: I7ad0e64f30748b724d184791e0e0a6a030850049
* | Fix some UI bugs in using SherlockActionBar.Owen Lin2012-08-285-6/+8
| | | | | | | | | | | | | | | | - Use sherlock's verion of requestWindowFeature. - Use sherlock's theme in Custom selection list. bug: 6927267 Change-Id: I706e45378b10e6e088e048d97fcaca57fb4bf3f4
* | Disable action bar home button and menu items in secure album.Wu-cheng Li2012-08-281-9/+13
| | | | | | | | | | | | | | | | All menu items are disabled except delete. bug:5955016 Change-Id: Ibf947b0c50b0591a774d298fbfbe692c9a88575d
* | Add api check for camera HDR.Wu-cheng Li2012-08-281-0/+4
| | | | | | | | | | bug:7054776 Change-Id: Id551b7f1d76168b7735f0a48c19619431b93b66e
* | add the menu button to support trimmingTeng-Hui Zhu2012-08-274-1/+8
| | | | | | | | | | | | This is only visible for video item. Change-Id: I17f8e902f3560cc8524f890705c020901331df74
* | Reskin: tweaks to colors and spacings to match mocksBobby Georgescu2012-08-274-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 7050303 - Call super.onCreate in ActivityState subclasses in order to correctly initialize background colors, correcting oversight in previous change - Tweak background and label colors to match mocks - Tweak grid spacings to match mocks Change-Id: Iba5cba6c60e8a750d8e50c1d0c14c916754a95c2
* | Merge "Add secure album support for lock screen camera." into ↵Wu-cheng Li2012-08-277-11/+176
|\ \ | | | | | | | | | gb-ub-photos-arches
| * | Add secure album support for lock screen camera.Wu-cheng Li2012-08-277-11/+176
| | | | | | | | | | | | | | | | | | | | | | | | | | | Secure album only shows the media items added by the camera. bug:5955016 Change-Id: Id26abec4dfcc036cf9de682398fed25eed73d1a5
* | | Merge "Add LightCycle helper class." into gb-ub-photos-archesAngus Kong2012-08-272-0/+83
|\ \ \ | |/ / |/| |
| * | Add LightCycle helper class.Angus Kong2012-08-272-0/+83
| | | | | | | | | | | | | | | | | | | | | LightCycleHelper also receives event of package changes to get updated. bug:6912297 Change-Id: Ib822ee778537b64986389bf8eeec36f61c9289f2
* | | Reskin: show placeholder color before album label is readyBobby Georgescu2012-08-261-4/+6
| | | | | | | | | | | | | | | Bug: 7050303 Change-Id: I679ecf6360f2ae3bfe19fc0677998ac8b1589bcf
* | | Make transition from album page to photo page even smootherBobby Georgescu2012-08-263-8/+5
| | | | | | | | | | | | | | | | | | Bug: 6979922 Bug: 7050303 Change-Id: Iaa2582125f0706a34317fa90fea73749cd2cf995