summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Do not accept fling gesture after we changed from/to filmstrip mode.Chih-Chung Chang2012-09-111-6/+2
| | | | Change-Id: Ifb3d692bcf621ff02c6d4e6d91ba8484d702f905
* Merge "Don't start filmstrip mode in Get Content mode." into gb-ub-photos-archesOwen Lin2012-09-101-2/+1
|\
| * Don't start filmstrip mode in Get Content mode.Owen Lin2012-09-111-2/+1
| | | | | | | | | | Change-Id: Ib04f5c134d44b2d8e80e7fdecf2503e950487837 fix: 7135936
* | Ensure peekObject is called in the syncrhonization block.Owen Lin2012-09-119-128/+125
| | | | | | | | | | bug: 7019598 Change-Id: If153287078826afc9827ea64364b4fb64f2b3a5f
* | Merge "Remove the space before colons in details." into gb-ub-photos-archesOwen Lin2012-09-101-2/+2
|\ \ | |/ |/|
| * Remove the space before colons in details.Owen Lin2012-09-051-2/+2
| | | | | | | | | | bug: 6587084 Change-Id: Ifdbe24e84fb55c1892edb5652455274fc3775291
* | Merge "Improvements to empty album behavior in Gallery" into gb-ub-photos-archesBobby Georgescu2012-09-102-43/+56
|\ \
| * | Improvements to empty album behavior in GalleryBobby Georgescu2012-09-102-43/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7131332 Bug: 7009464 Toasts are now immediately dismissed if a non-empty album is selected, and dismissed once Picasa Albums load at an otherwise empty gallery root. The alert added in a previous prompt has been replaced with a Toast also. Change-Id: Icca79ab264b94979eedcf78e5c3899af745d8813
* | | More logging added for monkey crashDoris Liu2012-09-101-1/+3
|/ / | | | | | | | | | | | | The crash is difficult to repro. So I'm adding more logging here to help figure out what caused the crash next time it happens. Bug: 6495745 Change-Id: Ib6a47f45e0508bc5def61fdc9f4e4a488b48ad92
* | Remove VIEW activity from LightCycle.George Mount2012-09-102-4/+2
| | | | | | | | | | | | Bug 7133257 Change-Id: I4b3c968ceaa01d9461a788553f23bf7694ac4b3c
* | Show play icon for panorama.George Mount2012-09-106-2/+40
| | | | | | | | | | | | Bug 7124494 Change-Id: I17fdb5d6bcab1f3997a1ab92fcf45e0309b394b3
* | Merge "Back button should progress through the app" into gb-ub-photos-archesDoris Liu2012-09-101-0/+5
|\ \
| * | Back button should progress through the appDoris Liu2012-09-071-0/+5
| | | | | | | | | | | | | | | | | | | | | When Gallery is launched via notification, back button should progress through the app before return to Home Bug: 6925612 Change-Id: I9da2120c6f607f8b6d3fa57d8a70225bc66fb8ef
* | | Do not allow panorama viewer in secure album.Wu-cheng Li2012-09-101-1/+1
| | | | | | | | | | | | | | | bug:7053266 Change-Id: I5195638e03e5eb32d47b50b7b568a40cd8a222d9
* | | Fix build error in old version of java.Wu-cheng Li2012-09-101-1/+2
| | | | | | | | | | | | Change-Id: I2f88846a10afd696d7dd94ddeee767c3d89d5ccf
* | | Fix import statement breaking buildBobby Georgescu2012-09-091-1/+1
| | | | | | | | | | | | Change-Id: I0d2acb3ece6ed2aea04033f911a69b266b6cc7de
* | | Reskin: switching between filmstrip and grid in albumBobby Georgescu2012-09-099-40/+221
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7050303 Bug: 6541425 Allows switching between the filmstrip and the grid views within albums and launches camera roll in filmstrip mode by default. Also fixes animation issue when animating from full-screen to grid view. Change-Id: I2a37b92c129cc090fd807973f7e3e82fed207cd3
* | | Merge "Use XmpUtil to detect panorama instead of caption." into ↵George Mount2012-09-071-1/+1
|\ \ \ | | | | | | | | | | | | gb-ub-photos-arches
| * | | Use XmpUtil to detect panorama instead of caption.George Mount2012-09-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Bug 7124493 Change-Id: I7a21206b47aea701428132d8500fa0873cb3c91a
* | | | Update media items when a picture is deleted in secure album.Wu-cheng Li2012-09-071-7/+69
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Query the database and only show the media items that still exist. bug:7053266 Change-Id: Ic8c1b8c514e59741436bca14e918ef100eaf14f8
* | | Merge "Fix some typos and style in ExifTag" into gb-ub-photos-archesHung-ying Tyan2012-09-061-8/+8
|\ \ \
| * | | Fix some typos and style in ExifTagEarl Ou2012-09-061-8/+8
| | | | | | | | | | | | | | | | Change-Id: I2f8a8f0e529d6db9132ac57e09e86fcc18aba842
* | | | Merge "Rearrange the constants in ExifTag" into gb-ub-photos-archesHung-ying Tyan2012-09-067-341/+507
|\| | |
| * | | Rearrange the constants in ExifTagEarl Ou2012-09-067-341/+507
| | | | | | | | | | | | | | | | Change-Id: I62ab6e52869dfa5b3fee7993bd109f4c5eed91a9
* | | | Fix tap to focus, back button to camera on MantaDoris Liu2012-09-051-2/+3
| |/ / |/| | | | | | | | | | | | | | | | | | | | Changed the move threshold from a hard coded value to be proportional to the size of the view. Bug: 7080033 Bug: 7066859 Change-Id: Id7b81fb3da1783951886d43fe9a3df35186af985
* | | Merge "Change lightcycle call to be in Gallery's package" into ↵George Mount2012-09-052-16/+1
|\ \ \ | | | | | | | | | | | | gb-ub-photos-arches
| * | | Change lightcycle call to be in Gallery's packageGeorge Mount2012-09-052-16/+1
| | | | | | | | | | | | | | | | | | | | | | | | Bug 7076869 Change-Id: I315b660d8a7cd84db6d06f0aa38275c7f5e4b4a6
* | | | Merge "Increase threshold for logging texture size warnings" into ↵Bobby Georgescu2012-09-051-1/+2
|\ \ \ \ | |/ / / |/| | | | | | | gb-ub-photos-arches
| * | | Increase threshold for logging texture size warningsBobby Georgescu2012-09-041-1/+2
| |/ / | | | | | | | | | | | | Bug: 7094140 Change-Id: I0dc56dc92db6821527ceb71e49c3e83d818340c2
* / / Move LightCycle checking to the closed source.Angus Kong2012-09-055-101/+61
|/ / | | | | | | | | bug:7076779 Change-Id: Ieebe0343a46257ca07f06483beb9391a90d7727a
* | Merge "Make a time jump when user clicks outsides the scrubber." into ↵Owen Lin2012-09-041-25/+21
|\ \ | | | | | | | | | gb-ub-photos-arches
| * | Make a time jump when user clicks outsides the scrubber.Owen Lin2012-09-041-25/+21
| |/ | | | | | | | | bug: 7080593 Change-Id: I913aee6e416c10d68403d7f9d4102d4dcc41e1d4
* | Merge "Set inMutable to true if we may reuse the bitmap." into ↵Owen Lin2012-09-042-0/+14
|\ \ | | | | | | | | | gb-ub-photos-arches
| * | Set inMutable to true if we may reuse the bitmap.Owen Lin2012-09-042-0/+14
| |/ | | | | | | | | bug: 7092330 Change-Id: I0def7e2e9ce57d09ba7f5e001b33cc605a6af44c
* / Fix NPE in CropImage.changeExifImageSizeTag().Hung-ying Tyan2012-09-041-5/+17
|/ | | | | Bug: 7099850 Change-Id: Ib7b3b7d9fddaf53853bcc98b9588dfadda0aee6f
* 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
|\ \ \ | |/ / |/| |