summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add new gallery assetsBobby Georgescu2012-09-3021-0/+0
| | | | | Bug: 7258964 Change-Id: I02600bff90de1f665d6a5958d3235346cbfdaa01
* Remove the individual Curves channel filtersnicolasroard2012-09-282-40/+22
| | | | | | | Reorder the filters bug:7234317 Change-Id: Ia726fa8ea82580c97784eb03d4c6740cf4a603c4
* Add contrast & brightness filtersJohn Hoford2012-09-282-0/+7
| | | | | | | | Added hue fixed contrast Stablized Contrast, Saturation, Tint, Exposure bug:7234321 Change-Id: Iadd1e3ab215b60f920b718fa56611a07f24effee
* Improve ActionBarnicolasroard2012-09-282-3/+28
| | | | | | | | | - show both undo and redo - add the checkmark with done instead of the up mark bug:7233986 Change-Id: I32af8068b08763461b720054f270cb6acabefbbf
* Import translations. DO NOT MERGEBaligh Uddin2012-09-2849-1/+197
| | | | | Change-Id: I14dfb266d984cb34719216018aecae3d07e79e9f Auto-generated-cl: translation import
* Merge "Update to sharing panorama" into gb-ub-photos-archesMangesh Ghiware2012-09-273-3/+23
|\
| * Update to sharing panoramaMangesh Ghiware2012-09-273-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7150324 Use separate share intents for sharing panoarma and regular JPGs. If photo is a 360 panorama, promote sharing it on the action bar, and move sharing as JPG to overflow menu. MIME type changed to specify panorama360. Change-Id: I8d52733d105820ac17ff36a6ad9d7525893f6d27
* | Merge "Use an actionbar - move the "show original" button to the bottom left ↵nicolasroard2012-09-273-61/+65
|\ \ | | | | | | | | | - move the history button to the overflow menu for now - add a reset item in the overflow menu." into gb-ub-photos-arches
| * | Use an actionbarnicolasroard2012-09-273-61/+65
| |/ | | | | | | | | | | | | | | | | | | | | - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu. bug:7234317 bug:7233975 bug:7233986 Change-Id: Icc1d03d1e1ce18f38b1169b466be62645424bc7e
* / Import translations. DO NOT MERGEBaligh Uddin2012-09-271-1/+1
|/ | | | | Change-Id: I7669fd2cd14f553106779c0a60e60400d6c9f196 Auto-generated-cl: translation import
* Only apply the parameter to the currently edited filternicolasroard2012-09-271-17/+1
| | | | | bug:7247494 Change-Id: I88b90ee5ea1d5bb83342a4be392308ea756375a1
* Trimming: clean up the UI for trimming.Teng-Hui Zhu2012-09-272-21/+30
| | | | | | | | | | Get rid of the home button and use the done button only in the action bar. Switch back to use system actionbar / activity. Rename the ShortenExample. bug:7093240 Change-Id: I61684e9723af12cecc212bbd911c23aab0258463
* Merge "Import translations. DO NOT MERGE" into gb-ub-photos-archesBaligh Uddin2012-09-273-5/+5
|\
| * Import translations. DO NOT MERGEBaligh Uddin2012-09-263-5/+5
| | | | | | | | | | Change-Id: I088c132a236954dd59ea069ab107dd0d4427b54d Auto-generated-cl: translation import
* | Merge "Trimming: switch to use sherlock action bar" into gb-ub-photos-archesTeng-Hui Zhu2012-09-271-2/+1
|\ \
| * | Trimming: switch to use sherlock action barTeng-Hui Zhu2012-09-261-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Show a "done" instead of the icon according to the UX team. And we don't have API level dependency. bug:7093240 Change-Id: Ib331495dd233c4dcbeb3d587bd5a4d0d89039d49
* | | Several secure album changes.Wu-cheng Li2012-09-276-0/+0
|/ / | | | | | | | | | | | | | | | | | | | | | | - Make the lock screen photo be a standard portrait size photo - In the filmstrip, have the first tap on the lock screen photo take the user directly to the unlock screen. - Switch the asset to be a "locked" lock rather than an "unlocked" lock. bug:7192331 Change-Id: If7541cd67cdfb711f8dd721796db3343ae91343a
* / Initial import of the new image editornicolasroard2012-09-2648-0/+1080
|/ | | | | bug:7165910 Change-Id: I756d6594f5bddd233772c979410362ca22e232a3
* Merge "Trimming: switch to use selectors." into gb-ub-photos-archesTeng-Hui Zhu2012-09-266-0/+0
|\
| * Trimming: switch to use selectors.Teng-Hui Zhu2012-09-266-0/+0
| | | | | | | | | | | | | | | | 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
* | Remove icon attributon.Wu-cheng Li2012-09-261-1/+0
| | | | | | | | | | bug:6855540 Change-Id: Ia2ab04523797da907aa73a013b6146ff929838b9
* | Merge "Revert "Update gallery launcher icons."" into gb-ub-photos-archesBart Sears2012-09-253-0/+0
|\ \
| * | Revert "Update gallery launcher icons."Bart Sears2012-09-253-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For now, go back to JB icons for Gallery Bug: 6855540 This reverts commit 9bf98d94d59571d220f7e288f565f599422f9b82 Change-Id: I1659134d54f7baa8488b791b903d3da37ab01662
* | | Add an unlock image in the end of secure album.Wu-cheng Li2012-09-253-0/+0
| |/ |/| | | | | | | | | | | | | | | | | 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
* | Import translations. DO NOT MERGEBaligh Uddin2012-09-211-1/+1
| | | | | | | | | | Change-Id: Idc80521ca1c53d1fc8f6a776baefa9986b8a4ea1 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBaligh Uddin2012-09-203-3/+3
| | | | | | | | | | Change-Id: I799c19e091b38fa5bcabe8f8c8c42d56ef933a41 Auto-generated-cl: translation import
* | Add bottom bar UI for photo pageBobby Georgescu2012-09-191-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Import translations. DO NOT MERGEBaligh Uddin2012-09-191-1/+1
| | | | | | | | | | Change-Id: Ifa642d4cd44fa4751660dc13593b12e419ff356f Auto-generated-cl: translation import
* | Reskin: increase album icon sizeBobby Georgescu2012-09-171-2/+2
| | | | | | | | | | Bug: 7050303 Change-Id: I29c804ec74c797f112950481ea2b606508950033
* | Merge "Reskin: update colors to match latest mocks" into gb-ub-photos-archesBobby Georgescu2012-09-171-8/+8
|\ \
| * | Reskin: update colors to match latest mocksBobby Georgescu2012-09-171-8/+8
| | | | | | | | | | | | | | | Bug: 7050303 Change-Id: Ie582fe561d763a5010a0aea8b3a391237f5fbc1e
* | | Import translations. DO NOT MERGEBaligh Uddin2012-09-1737-127/+64
|/ / | | | | | | | | Change-Id: I890266e488c3478118e471e3f84217e654ecb589 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBaligh Uddin2012-09-1435-158/+79
| | | | | | | | | | Change-Id: I223da3a3d940255346be9eef7d8234f7f845cd2d Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBaligh Uddin2012-09-1349-4/+100
| | | | | | | | | | Change-Id: I726d6cc6d3948b7a6ddf248ec17e4db91689344a Auto-generated-cl: translation import
* | Add the UI elements for video trim activity.Teng-Hui Zhu2012-09-113-1/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Add attribution of icons.Wu-cheng Li2012-09-101-0/+1
| | | | | | | | Change-Id: I5c7a5580ec4bd6313a3f536f0b9e3927d8ab624e
* | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-archesBaligh Uddin2012-09-101-1/+1
|\ \
| * | Import translations. DO NOT MERGEBaligh Uddin2012-09-101-1/+1
| | | | | | | | | | | | | | | Change-Id: I432b178fd229f51b6a9f780471801f6a2172abbd Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBaligh Uddin2012-09-1049-5/+201
|/ / | | | | | | | | Change-Id: I7434d5a9fd137cf2ee2931f0f9df7eeae7c8ad54 Auto-generated-cl: translation import
* | Reskin: switching between filmstrip and grid in albumBobby Georgescu2012-09-093-1/+15
| | | | | | | | | | | | | | | | | | | | | | 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 "Import translations. DO NOT MERGE" into gb-ub-photos-archesBaligh Uddin2012-09-064-7/+4
|\ \
| * | Import translations. DO NOT MERGEBaligh Uddin2012-09-054-7/+4
| | | | | | | | | | | | | | | Change-Id: I80a4c7ddfb4d26b59b7adcd9c34248aae768f861 Auto-generated-cl: translation import
* | | Merge "Reskin: darker gray placeholder colors in gallery" into ↵Bobby Georgescu2012-09-051-5/+5
|\ \ \ | |/ / |/| | | | | gb-ub-photos-arches
| * | Reskin: darker gray placeholder colors in galleryBobby Georgescu2012-09-041-5/+5
| | | | | | | | | | | | | | | | | | Bug: 7106371 Bug: 7050303 Change-Id: I68eaa46ef4632778d5f9b6fb2c57d513e8c4c433
* | | Merge "Revert "Remove the previewImage and staticWallpaperPreview."" into ↵Owen Lin2012-09-054-42/+4
|\ \ \ | | | | | | | | | | | | gb-ub-photos-arches
| * | | Revert "Remove the previewImage and staticWallpaperPreview."Owen Lin2012-08-214-42/+4
| | | | | | | | | | | | | | | | This reverts commit 47c247e7c575d712546814b8dc4c737de93c2e61.
* | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-3128-56/+28
| |/ / |/| | | | | | | | | | | Change-Id: I7c4f92160aade1405f96383212cda95f6b75f38f Auto-generated-cl: translation import
* | | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-archesBaligh Uddin2012-08-3017-34/+17
|\ \ \
| * | | Import translations. DO NOT MERGEBaligh Uddin2012-08-2917-34/+17
| | | | | | | | | | | | | | | | | | | | Change-Id: I381c77c04e94bce19bde5edd7ce7057b54fa2a8f Auto-generated-cl: translation import
* | | | Remove unused resources and fix some warnings.Owen Lin2012-08-301-31/+0
|/ / / | | | | | | | | | Change-Id: I075977150c7da7650e723e29406f24ae2e23ea97