summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Only create debugTag if necessaryJohn Reck2012-09-261-5/+8
| | | | | | | Bug: 7238418 String concatenation isn't free Change-Id: I510a89ef8b673efb631d6f8929ab3d9d9b454931
* Don't requery a constantJohn Reck2012-09-261-1/+8
| | | | | | Bug: 7238418 Change-Id: I1b7117cd30ffc51b51980830791779ec899c2f4b
* Initial import of the new image editornicolasroard2012-09-2638-0/+4036
| | | | | bug:7165910 Change-Id: I756d6594f5bddd233772c979410362ca22e232a3
* Fix behavior of up button in Camera appBobby Georgescu2012-09-263-8/+12
| | | | | | | Bug: 7233448 - Up button now goes to gallery root when appropriate. Change-Id: Ib474335b2ac4139e7c5a213bda3efa481b24f224
* Merge "Avoid unnecessary allocation" into gb-ub-photos-archesJohn Reck2012-09-261-6/+20
|\
| * Avoid unnecessary allocationJohn Reck2012-09-261-6/+20
| | | | | | | | | | | | Bug: 7238418 Change-Id: Ic0a1ef0368368526401a53f02f680ef9d42ea310
* | Merge "Trimming: switch to use selectors." into gb-ub-photos-archesTeng-Hui Zhu2012-09-262-69/+118
|\ \
| * | Trimming: switch to use selectors.Teng-Hui Zhu2012-09-262-69/+118
| | | | | | | | | | | | | | | | | | | | | | | | Switch into using 2 selectors for the starting and end point of triming. Shift the bar up a bit to accommandate the selectors. bug:7093240 Change-Id: If3b6fe285cd69756ecbfe1d52efd90b499150c72
* | | Fix display of clustering items in album set pageBobby Georgescu2012-09-261-0/+8
| |/ |/| | | | | | | | | | | | | Bug: 7217602 There was an incorrect assumption that onCreateActionBar would always be called before onResume. Change-Id: Id50c2dc3fd8167958501e12c66d11ac82a86349b
* | Merge "Making switchState public" into gb-ub-photos-archesDoris Liu2012-09-251-1/+1
|\ \
| * | Making switchState publicDoris Liu2012-09-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7208910 switchState was only accessible within package com.android.gallery3d.app . Now changing it to public so that it can be called from camera. This is part 1 of 2 in fixing the bug. Not sure if it's the best way to fix it. Comments are welcome. Change-Id: I4aac46f640f2dd3aa973abd9610a37fa2842ed29
* | | Grid/filmstrip switching behavior improvementsBobby Georgescu2012-09-254-50/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7200453 Bug: 7196483 Bug: 7222179 Bug: 7224619 Changes: - Launch camera in capture even if paused in grid/filmstrip - Fixed behavior of filmstrip button after launching grid from camera - Refresh bar timeouts after swiping a photo - Partially swiping from camera to filmstrip without lifting finger and then swiping back no longer results in unwanted switch to filmstrip - Removed hacky solution to switching to filmstrip mode Change-Id: I5cdde927e6a27a03b99a7f4883c5601bc281f4c8
* | | Add API check for "context" input port of effects recording.Wu-cheng Li2012-09-251-0/+4
| | | | | | | | | | | | | | | bug:7106963 Change-Id: Ia065903dd120bf20862c6adfd8a699277a27ac50
* | | Merge "Add an unlock image in the end of secure album." into gb-ub-photos-archesWu-cheng Li2012-09-255-7/+127
|\ \ \
| * | | Add an unlock image in the end of secure album.Wu-cheng Li2012-09-255-7/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When camera is started from secure lock screen, put placeholder "proto-photo" at the end of the camera roll. When it is clicked, it takes the user to the lock screen. bug:7192331 Change-Id: Ia444d3bb8a88ba69bba4c47cb9783a60a6986c34
* | | | Enable effects recording in JellyBean.Pin Ting2012-09-251-1/+2
|/ / / | | | | | | | | | | | | Bug:7106963 Change-Id: I2ef0a30d1b9c970fdd9ce01459173db3bde99c6b
* | | Restore missing "Group by" option in camera roll grid viewBobby Georgescu2012-09-241-0/+3
| | | | | | | | | | | | | | | Bug: 7217410 Change-Id: I1488f02919a8702be2eb41696f627f9e3d94ce88
* | | Fix occasional crash when restoring photo page stateBobby Georgescu2012-09-241-1/+4
| |/ |/| | | | | | | | | | | | | | | Bug: 7216012 If the saved state being used to restore the photo page includes an out-of-bounds index, ignore it and reset the index to 0. Change-Id: I1b8aa82cbc553297189abb57bd274d7eb53f61e0
* | The trimming solution with the mp4parser library.Teng-Hui Zhu2012-09-244-6/+332
| | | | | | | | | | | | bug:7093055 Change-Id: I598a81d80c9c5107696f3af7761207e3ec88f3ff
* | Use vendor specific MIME type for sharing LightCycle panoramasMangesh Ghiware2012-09-236-14/+27
|/ | | | | Bug: 7150324 Change-Id: I78d426672e9a8fc69f0b9b564438e40eb0230719
* Snap a photo to the center after fling ends in filmstripBobby Georgescu2012-09-211-3/+1
| | | | | Bug: 7050303 Change-Id: I7770d5642b376a1b888f34c5806f2291b64ecf68
* Support secure image capture mode.Wu-cheng Li2012-09-212-2/+12
| | | | | | bug:7141738 Change-Id: I4ea010609d16da469998ebb40ad8282b9468de25
* Merge "Remove CAN_USE_FLAG_SECURE constant." into gb-ub-photos-archesWu-cheng Li2012-09-201-3/+0
|\
| * Remove CAN_USE_FLAG_SECURE constant.Wu-cheng Li2012-09-201-3/+0
| | | | | | | | | | | | bug:7191713 Change-Id: Ia439970d9b51316ccf003fa17453deed7a27cf2b
* | Merge "Hide grid view menu item in secure album." into gb-ub-photos-archesWu-cheng Li2012-09-201-1/+1
|\ \
| * | Hide grid view menu item in secure album.Wu-cheng Li2012-09-201-1/+1
| |/ | | | | | | | | bug:7200451 Change-Id: I23b6fbc48aac46e9b25b159416bc9f64a357d038
* / Fix metadata of cropped image for details display.Earl Ou2012-09-205-9/+40
|/ | | | | | | | | | + drop the old thumbnail of the cropped image + update DateTime tag in EXIF + add EXIF Software tag + display DATE_MODIFIED in details instead of DATE_TAKEN Bug:7192433 Change-Id: I89dcb29dd3242f58fe96cd25398217e94f42fc97
* Merge "Tests for ExifData" into gb-ub-photos-archesHung-ying Tyan2012-09-197-26/+304
|\
| * Tests for ExifDataEarl Ou2012-09-197-26/+304
| | | | | | | | | | | | Bug:7192363 Change-Id: Ic74ecad2eff50e26efa85f928ef7904a2c51ecc7
* | Merge "Simplify the usage of ExifData" into gb-ub-photos-archesHung-ying Tyan2012-09-198-175/+817
|\|
| * Simplify the usage of ExifDataEarl Ou2012-09-198-175/+817
| | | | | | | | | | | | Bug:7192363 Change-Id: I2c6ab9974f4472f63483a4de814728584944535e
* | Add bottom bar UI for photo pageBobby Georgescu2012-09-192-48/+176
| | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7050303 Bug: 7170148 Pulled the handling of the display of the edit (FX) button out into a separate file and put in the groundwork for supporting multiple buttons within a container along the bottom of the screen and managing their display as well as animating them in and out. Also added a button for launching the panorama viewer when appropriate Change-Id: Iee3083e0693ef3c1f55264b922f02b9a702d2103
* | Make ActionBar always present in filmstripBobby Georgescu2012-09-192-3/+5
| | | | | | | | | | Bug: 7196718 Change-Id: Id297f28402da20efd99a9f90376a18f041fe8448
* | Merge "Use 565 pixel format for pre-JB; use 888 otherwise." into ↵Pin Ting2012-09-193-6/+27
|\ \ | |/ |/| | | gb-ub-photos-arches
| * Use 565 pixel format for pre-JB; use 888 otherwise.Pin Ting2012-09-193-6/+27
| | | | | | | | | | Bug:7189512 Change-Id: Iec5d528fef4f4fc589370339add299a40fc8f26e
* | Add UriImage support for viewing LightCycle panoramas.George Mount2012-09-187-11/+47
| | | | | | | | Change-Id: I7f61cef39370fd23b9481708dc3c902c17873074
* | 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