summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix incorrect texture size causing artifacts in animation" into ↵Bobby Georgescu2012-09-183-9/+7
|\ | | | | | | gb-ub-photos-arches
| * Fix incorrect texture size causing artifacts in animationBobby Georgescu2012-09-173-9/+7
| | | | | | | | | | Bug: 7181383 Change-Id: I3895b89ccdd03e55acc656f0d6944f4a9d398ad5
* | Do not show edit button in secure album.Wu-cheng Li2012-09-181-0/+2
|/ | | | | bug:7183052 Change-Id: I94ca6703e5c3a0e2af552be2065be361210185b2
* Merge "Fix bugs relating to grid/filmstrip switching" into gb-ub-photos-archesBobby Georgescu2012-09-173-1/+2
|\
| * Fix bugs relating to grid/filmstrip switchingBobby Georgescu2012-09-173-1/+2
| | | | | | | | | | | | Bug: 7180582 Bug: 7146147 Change-Id: I3d2ad8866a938f9f162e14f11bc2e021834ba513
* | Don't switch back to fullscreen camera when flingingBobby Georgescu2012-09-171-1/+5
|/ | | | | | | | | | | | Bug: 7145903 Bug: 7050303 It was very annoying to users to fling in the filmstrip and end up in the fullscreen camera mode, so disabling that. Long-term, we want to be smarter about this and do the zoom to the full-screen if it's a short swipe rather than a fling. Change-Id: I40ac4848a267c06fc41e161a7a292b8f03b2ef4c
* Reskin: do not show edit (FX) button in filmstrip modeBobby Georgescu2012-09-171-1/+1
| | | | | Bug: 7050303 Change-Id: Ibab686bc8581e8cc24a722950ff3b8b77023edd4
* Fix build breakageBobby Georgescu2012-09-171-1/+1
| | | | Change-Id: I88f1a9f2f1306d959d6a5398faa2c6f50cb24501
* Show large button to open the camera when gallery is emptyBobby Georgescu2012-09-171-2/+57
| | | | | Bug: 7156303 Change-Id: I0447c3eaee680e80f09cc3aff714aace85ee77d9
* Merge "Only show FX button for photos" into gb-ub-photos-archesBobby Georgescu2012-09-141-1/+3
|\
| * Only show FX button for photosBobby Georgescu2012-09-131-1/+3
| | | | | | | | | | Bug: 7165294 Change-Id: Ia35f5981cba5a69f94964a9c38361b01ea1cdbfd
* | Merge "Show animation when opening albums directly in filmstrip" into ↵Bobby Georgescu2012-09-141-5/+3
|\ \ | | | | | | | | | gb-ub-photos-arches
| * | Show animation when opening albums directly in filmstripBobby Georgescu2012-09-131-5/+3
| |/ | | | | | | | | Bug: 7166947 Change-Id: Id67e93431365043673e08b400aea5df9ae53f14c
* | Merge "Cancel the loading task when clicking on back in Cropping." into ↵Owen Lin2012-09-141-1/+9
|\ \ | |/ |/| | | gb-ub-photos-arches
| * Cancel the loading task when clicking on back in Cropping.Owen Lin2012-09-131-1/+9
| | | | | | | | | | bug: 5636363 Change-Id: I0e00b6119c4d184328002d1b2128e33ababc798b
* | Animate correctly when opening single-photo albumBobby Georgescu2012-09-135-36/+45
|/ | | | | Bug: 7164177 Change-Id: I5ce60a8e842e3ddf0e356568f17ee488edef23cd
* When tapping single-photo albums, launch photo directlyBobby Georgescu2012-09-122-2/+3
| | | | | Bug: 7145102 Change-Id: I75c66f2f37fc11f3846fdbd40083787ba38af207
* Reskin: Fix stability bugs introduced by reskinBobby Georgescu2012-09-122-50/+62
| | | | | | | | | | | | | | Bug: 7150348 Bug: 7144206 Bug: 7050303 If PhotoPage is launched/resumed on a completely empty album (for instance, if Gallery was opened to the Camera folder and paused, all photos were deleted via the Camera app, and then Gallery is resumed), bail out of PhotoPage since it cannot handle this. Also fixes an NPE. Change-Id: I162ff5ad149c322704c8af7d4705d87ae6c6098a
* Merge "Reskin: fix bug introduce by Gallery reskin" into gb-ub-photos-archesBobby Georgescu2012-09-121-0/+1
|\
| * Reskin: fix bug introduce by Gallery reskinBobby Georgescu2012-09-111-0/+1
| | | | | | | | | | | | Bug: 7146147 Bug: 7050303 Change-Id: Ia9782868937cc9a03e4c8b5f77033d13d80d5d8a
* | Launch next-gen editor if present and show FX buttonBobby Georgescu2012-09-112-5/+77
|/ | | | | | | | Bug: 7050303 Shows editor button on the photo page and launches the next-gen photo editor if it is present on the device. Change-Id: I4058cffaec3fc4b446bd90dbecb809681d3255ea
* Merge "Reskin: stop at first photo after swipe from camera" into ↵Bobby Georgescu2012-09-111-1/+5
|\ | | | | | | gb-ub-photos-arches
| * Reskin: stop at first photo after swipe from cameraBobby Georgescu2012-09-111-1/+5
| | | | | | | | | | | | Bug: 6399763 Bug: 7050303 Change-Id: I433bead637416f3c6e47fdc7567bb5de7575c01c
* | Add the UI elements for video trim activity.Teng-Hui Zhu2012-09-1110-479/+1207
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Refactored the classes to support both the video play and trim. Now the common code for controller overlay is in CommonControllerOverlay, which is basically the same as the original MovieControllerOverlay without animation. Because in trimming, we don't want to hide all the controller. The specific animations are implemented in the sub-classes which are TrimControllerOverlay and MovieControllerOverlay. At the same time, TrimTimeBar extended TimeBar to support the extra trimming start scrubber and end scrubber. The interface between the timebar and the controllerOverlay are kept almost the same way, except adding the trimming info when necessary. With all these, the activity of TrimVideo now relied on the TrimTimeBar and TrimControllerOverlay. Similarily, the MovieActivity relied on the TimeBar and MovieControllerOverlay. 2. Hook the TrimVideo activity with the trim menu. Note that the icons are temporary for now, still need UX input on that. bug:7093055 Change-Id: Ib9bfbc090106744a569fce4c451ddffc0a2c699b
* 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-101-2/+1
| | | | | | | | | | | | 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-065-327/+493
|\| | |
| * | | Rearrange the constants in ExifTagEarl Ou2012-09-065-327/+493
| | | | | | | | | | | | | | | | 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-051-3/+0
|\ \ \ | | | | | | | | | | | | gb-ub-photos-arches