summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix ambiguous naming and typo" into gb-ub-photos-carlsbadztenghui2013-06-265-6/+6
|\
| * Fix ambiguous naming and typoztenghui2013-06-265-6/+6
| | | | | | | | | | bug:9468909 Change-Id: Ic52f3b6f6b5d0c874e8291ce7b3a76cb6c22f60f
* | Merge "Cleanup ImagePreset to remove special-casing for borders" into ↵nicolasroard2013-06-261-75/+60
|\ \ | |/ |/| | | gb-ub-photos-carlsbad
| * Cleanup ImagePreset to remove special-casingnicolasroard2013-06-251-75/+60
| | | | | | | | | | | | for borders Change-Id: I6410a7a44d72c3dfa51c1d18f5a6fcba854ba9c2
* | Merge "Fix the missing filter name after deserialization." into ↵ztenghui2013-06-251-1/+2
|\ \ | |/ |/| | | gb-ub-photos-carlsbad
| * Fix the missing filter name after deserialization.ztenghui2013-06-241-1/+2
| | | | | | | | | | | | bug:9468909 Change-Id: I63aaf0bad02c2afdddf9b162f695fc0a9165befa
* | Merge "Add a MatrixFit class" into gb-ub-photos-carlsbadnicolasroard2013-06-241-0/+200
|\ \
| * | Add a MatrixFit classnicolasroard2013-06-191-0/+200
| | | | | | | | | | | | Change-Id: I67d2eb92fe5bbdff56ff50330c7eed48e7593f75
* | | MTP Importer: show overlay icon on video itemsBobby Georgescu2013-06-211-0/+44
| | | | | | | | | | | | | | | Bug: 4099088 Change-Id: Ia785f889aff91329e9d7c7026238b2588336963d
* | | MTP Importer: improve experience when importing large filesBobby Georgescu2013-06-201-0/+21
| |/ |/| | | | | | | Bug: 4099088 Change-Id: Ie5d9da1be0b8891b9123eceaadfe9c2ec2d3e408
* | Merge "Add support for importing videos in MTP importer" into ↵Bobby Georgescu2013-06-203-9/+40
|\ \ | | | | | | | | | gb-ub-photos-carlsbad
| * | Add support for importing videos in MTP importerBobby Georgescu2013-06-193-9/+40
| | | | | | | | | | | | | | | | | | Bug: 4099088 Change-Id: Ic3ac00cb730381dd2d7f4802aa8001a60e439748
* | | Merge "Fix LUT3D information lost after re-edit" into gb-ub-photos-carlsbadztenghui2013-06-191-0/+1
|\ \ \
| * | | Fix LUT3D information lost after re-editztenghui2013-06-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | bug:9427243 Change-Id: I8535c8776c866fd6c84d391a8de82df9cb214694
* | | | Merge "Setup the saving framework to support hiding original photo for ↵ztenghui2013-06-195-63/+274
|\ \ \ \ | |_|/ / |/| | | | | | | editor." into gb-ub-photos-carlsbad
| * | | Setup the saving framework to support hiding original photo for editor.ztenghui2013-06-195-63/+274
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This new approach will try to hide the original image into an auxiliary directory. User will only see one edited image, while being able to go back to the original image in the editor. Refactor SaveCopyTask for more private funcs and more comments. bug:9468909 Change-Id: I866321d23e6db0b3dbd08fec2a6a7e3142b17b65
* | | Switch over to use new camera activityDoris Liu2013-06-181-8/+4
| | | | | | | | | | | | Change-Id: Ib907b5ab5d0e818261e95edd182f2e20c3bbebe0
* | | Add more metrics to EditorBobby Georgescu2013-06-173-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9467671 Instrument - Editor opened - Number of filters used in save - Undo/redo/reset/state panel - Save completed Change-Id: I4722f36496ccd089829bd616f89d760078922573
* | | Added serialization IDs for frames, adds frames to analytics.Ruben Brunk2013-06-172-2/+4
| | | | | | | | | | | | | | | Bug: 9467671 Change-Id: I6f21e7bc9ca7255a290ba7cd1a94e9b07e7b06cb
* | | Fix IDs for analytics, unlocalize serialization IDs.Ruben Brunk2013-06-173-3/+15
| | | | | | | | | | | | | | | | | | Bug: 9467671 Bug: 9336168 Change-Id: Icb0037ab853598b8ad6b931808074f824ea706ed
* | | Merge "fix start up crash" into gb-ub-photos-carlsbadJohn Hoford2013-06-131-0/+8
|\ \ \ | |_|/ |/| |
| * | fix start up crashJohn Hoford2013-06-131-0/+8
| |/ | | | | | | | | | | bug:8734160 Change-Id: Iaf7f6bdbd70ab04011b9af7816a6991724363e49
* / Fix icon sizes and jaggiesnicolasroard2013-06-112-2/+2
|/ | | | | | bug:9105608 bug:8791729 Change-Id: I828e9d4daf4025f53d505a3412c27dd8c54a607e
* Mirror CL 319301 in Bryce.Ruben Brunk2013-06-111-20/+36
| | | | Change-Id: If84a08aa1969415a0d5d9ad3b9153743b1951108
* Fix panel anim in ICSnicolasroard2013-06-101-1/+6
| | | | Change-Id: Ie2e5a6a36c5bec309b5848e50a90f089f9aeffa9
* Fix state panel text sizenicolasroard2013-06-101-0/+1
| | | | | | bug:9377153 Change-Id: Id5243539e2f8d3ee737e24eeb204145fbaa9138d
* Fix warningsnicolasroard2013-06-101-3/+3
| | | | Change-Id: I736364e538c2cb03f58c05b9b38252e7771f23e8
* Fix NPE in PreparePageFadeoutTextureBobby Georgescu2013-06-071-0/+4
| | | | | Bug: 8837688 Change-Id: Ie8fbd9a42497195b8a01cc5638cb0c44d4532d09
* Merge "Fix graphical corruption due to tear down race" into ↵John Reck2013-06-051-0/+3
|\ | | | | | | gb-ub-photos-carlsbad
| * Fix graphical corruption due to tear down raceJohn Reck2013-06-051-0/+3
| | | | | | | | | | | | Bug: 9278945 Change-Id: I7594680322768f60eaed8a1037d139cbadf9706b
* | Removing unused UI fields in FilterRepresentation.Ruben Brunk2013-06-0527-95/+31
| | | | | | | | | | | | Bug: 9170644 Change-Id: Ic197123286e06d9eb64d30eb345f8cc5797659a2
* | Fixes save filename for panos after edit.Ruben Brunk2013-06-031-3/+36
|/ | | | | Bug: 9258209 Change-Id: Ib7404242e5886a38b9e6f9fd6f28a52f1a703590
* am 8bb4e1a0: Fixes reading exif tags in editor.Ruben Brunk2013-06-031-1/+1
|\ | | | | | | | | * commit '8bb4e1a036e67a3bf4f9cdb8f55d6f558189e5b9': Fixes reading exif tags in editor.
| * Fixes reading exif tags in editor.Ruben Brunk2013-06-031-1/+1
| | | | | | | | | | Bug: 9140401 Change-Id: Ic84efca90c5297ab2c6a65b13d512c4799e623f6
* | Merge "Add LUT3D filter state saving" into gb-ub-photos-carlsbadztenghui2013-06-032-6/+9
|\ \
| * | Add LUT3D filter state savingztenghui2013-05-312-6/+9
| | | | | | | | | | | | Change-Id: I195fad1dcad5639c30a2eb94ce28cfd0a2464018
* | | Mirroring google3 for CL 47368174.Ruben Brunk2013-05-301-0/+5
|/ / | | | | | | Change-Id: Ic29d8d6784870660e0bd83f870ec2cf0c244746d
* | Cleaning up ImageShow.Ruben Brunk2013-05-297-217/+25
| | | | | | | | | | Bug: 9170644 Change-Id: Iab44ec425462e9afe8c104c52e4a28c4145d4690
* | Merge "zoom to center of double tap" into gb-ub-photos-carlsbadJohn Hoford2013-05-292-1/+24
|\ \
| * | zoom to center of double tapJohn Hoford2013-05-282-1/+24
| | | | | | | | | | | | Change-Id: Idfc257f92dd1a97d9109b9f5325299b8e1432c37
* | | Removed unused ZoomCache class.Ruben Brunk2013-05-282-57/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9170644 Note: this class doesn't appear to have been used by the zoom on doubletap. Change-Id: Ie3319511ade7732976488f2bb7d76c5e1c130db9
* | | Removed unused handling for intent extras in editor.Ruben Brunk2013-05-287-311/+38
| | | | | | | | | | | | | | | Bug: 9170644 Change-Id: I569b16d278d1813f5a96f9e0231ed71ff9e33687
* | | am e3336dc3: Merge "Prevent lock screen appearing during active slideshow" ↵Bobby Georgescu2013-05-281-2/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | into gb-ub-photos-bryce * commit 'e3336dc35f514e3b5dd7a15f9a86eaf6d1572b5e': Prevent lock screen appearing during active slideshow
| * | Merge "Prevent lock screen appearing during active slideshow" into ↵Bobby Georgescu2013-05-281-2/+1
| |\ \ | | | | | | | | | | | | gb-ub-photos-bryce
| | * | Prevent lock screen appearing during active slideshowBobby Georgescu2013-05-241-2/+1
| | | | | | | | | | | | | | | | | | | | Bug: 9094678 Change-Id: I8efb988911c75275430da934474df1e65265b234
* | | | functionality added to transport filter parameter values to following ↵Christian Wichner2013-05-242-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | filters. e.g. FixedFrames use the style from Retrolux or Film to tinting the frame. Change-Id: I87f2497bdaccf8de5d153cbebf9641b979ea15a3
* | | | am a7a6a3a5: Fix issues with LocalJohn Hoford2013-05-231-0/+1
|\| | | | | | | | | | | | | | | | | | | * commit 'a7a6a3a5efaf62cdd5d562a9141678671952d27d': Fix issues with Local
| * | | Fix issues with LocalJohn Hoford2013-05-221-0/+1
| | | | | | | | | | | | | | | | | | | | bug:9085638 Change-Id: I8d10373b4cd65b3f1338d88f1816ccb0b3a0166d
* | | | am 4d25d129: Merge "fix ellipse logic for portrait" into gb-ub-photos-bryceJohn Hoford2013-05-221-4/+21
|\| | | | | | | | | | | | | | | | | | | * commit '4d25d129d1c9f92033382e12260d3f40521cf3fd': fix ellipse logic for portrait
| * | | Merge "fix ellipse logic for portrait" into gb-ub-photos-bryceJohn Hoford2013-05-221-4/+21
| |\ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 02:34:41 +0000