summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix totnicolasroard2013-06-262-1/+1
| | | | Change-Id: I75b28ac56f9c3b295280690078f5c854fda7eb66
* Merge "Cleanup in ImagePreset" into gb-ub-photos-carlsbadnicolasroard2013-06-267-63/+99
|\
| * Cleanup in ImagePresetnicolasroard2013-06-267-63/+99
| | | | | | | | | | | | Move GeometryMetadata to the list of filters Change-Id: I0bef13ca0d9cb41e68eddd108000ff7bd426b313
* | Merge "Clean up PreviewGestures" into gb-ub-photos-carlsbadMichael Kolb2013-06-262-64/+3
|\ \ | |/ |/|
| * Clean up PreviewGesturesMichael Kolb2013-06-262-64/+3
| | | | | | | | | | | | | | - remove dead code and state - fix zoom only mode during video recording Change-Id: I2238f99b9823ba091d300046d07448c67bc2ad78
* | 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 "Add fullscreen mode." into gb-ub-photos-carlsbadAngus Kong2013-06-262-70/+168
|\ \ \ | |_|/ |/| |
| * | Add fullscreen mode.Angus Kong2013-06-262-70/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Single tap to center a picture. 2. Double tap to fullscreen 3. In fullscreen, the next picture is on the left but the previous one is under the current one. Change-Id: I728da2487ea649162be4f1858a8524331c625157
* | | Merge "Fix check of failing decoding boundaries calls" into ↵Angus Kong2013-06-262-15/+6
|\ \ \ | | | | | | | | | | | | gb-ub-photos-carlsbad
| * | | Fix check of failing decoding boundaries callsAngus Kong2013-06-262-15/+6
| |/ / | | | | | | | | | Change-Id: I7b7780de9988312f9ce79c2a27132b7f6acb1c4e
* | | 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
* | | Don't use post-ICS API View.setBackground().Angus Kong2013-06-251-22/+34
| | | | | | | | | | | | | | | | | | View.setBackground() is API level 16. Change-Id: I7e56939efbcaa6e152c19c37a4a54a133bed3b47
* | | Synchronize camera access in start preview thread.Angus Kong2013-06-251-8/+6
| |/ |/| | | | | Change-Id: Iba953fea3bd17ecb085d75fb3b2e350c0bf5d3b1
* | Merge "Clean up camera switcher" into gb-ub-photos-carlsbadDoris Liu2013-06-254-22/+8
|\ \
| * | Clean up camera switcherDoris Liu2013-06-244-22/+8
| | | | | | | | | | | | Change-Id: I9f0495524028528ca02c7ddf94f4698d4e87af14
* | | 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
* | | | Merge "MTP Importer: show overlay icon on video items" into ↵Bobby Georgescu2013-06-211-0/+44
|\ \ \ \ | |_|_|/ |/| | | | | | | gb-ub-photos-carlsbad
| * | | MTP Importer: show overlay icon on video itemsBobby Georgescu2013-06-211-0/+44
| | | | | | | | | | | | | | | | | | | | Bug: 4099088 Change-Id: Ia785f889aff91329e9d7c7026238b2588336963d
* | | | Merge "Remove SRI panorama" into gb-ub-photos-carlsbadDoris Liu2013-06-216-985/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Remove SRI panoramaDoris Liu2013-06-206-985/+0
| | | | | | | | | | | | | | | | Change-Id: Icbe154aede474fb678ae4e0b2088626a4a8b31d8
* | | | 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
* | / / Add flash animation to photo moduleDoris Liu2013-06-192-11/+46
| |/ / |/| | | | | | | | Change-Id: I9faa46e71e27064c4fbcb629c5c31cc4d7b22652
* | | Set window flags to show secure cameraDoris Liu2013-06-181-9/+24
| | | | | | | | | | | | Change-Id: I9acb47ae5d6c5b9248aeea5cd267e17243f93c74
* | | Merge "Switch over to use new camera activity" into gb-ub-photos-carlsbadDoris Liu2013-06-1824-9688/+1137
|\ \ \
| * | | Switch over to use new camera activityDoris Liu2013-06-1824-9688/+1137
| | | | | | | | | | | | | | | | Change-Id: Ib907b5ab5d0e818261e95edd182f2e20c3bbebe0
* | | | Merge "Add decoding to a smaller image by sampling and scaling." into ↵George Mount2013-06-181-6/+63
|\ \ \ \ | |/ / / |/| | | | | | | gb-ub-photos-carlsbad
| * | | Add decoding to a smaller image by sampling and scaling.George Mount2013-06-171-6/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows opportunistic reuse of bitmaps, but does not require it when downsampling. Change-Id: I06f12bb5416f88a242f67bff3d2ca45894101bcd
* | | | 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
* | | | Merge "Remove files actually." into gb-ub-photos-carlsbadAngus Kong2013-06-174-41/+174
|\ \ \ \
| * | | | Remove files actually.Angus Kong2013-06-144-41/+174
| | | | | | | | | | | | | | | | | | | | Change-Id: Ideba2dfff0678f1049bf2bdc93cee98bbb0e589e
* | | | | Fix IDs for analytics, unlocalize serialization IDs.Ruben Brunk2013-06-173-3/+15
|/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 9467671 Bug: 9336168 Change-Id: Icb0037ab853598b8ad6b931808074f824ea706ed
* | | | Merge "Add callbacks for switching to camera/filmstrip" into ↵Doris Liu2013-06-139-61/+57
|\ \ \ \ | | | | | | | | | | | | | | | gb-ub-photos-carlsbad
| * | | | Add callbacks for switching to camera/filmstripDoris Liu2013-06-139-61/+57
| | | | | | | | | | | | | | | | | | | | Change-Id: I936d59efe3e09232ab0b298603c823d4f7952199
* | | | | Merge "Refactor to separate out EGL part." into gb-ub-photos-carlsbadAngus Kong2013-06-133-117/+255
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Refactor to separate out EGL part.Angus Kong2013-06-123-117/+255
| | | | | | | | | | | | | | | | | | | | Change-Id: I90c37b9e221a80f0d35e6e12ab8850078dc03622
* | | | | Merge "Update camera orientation when device is flipped" into ↵Doris Liu2013-06-1311-94/+142
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad
| * | | | | Update camera orientation when device is flippedDoris Liu2013-06-1311-94/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8963053 Change-Id: I909793a7da3903a080a19cd7e271b3720df4ec0a
* | | | | | Merge "fix start up crash" into gb-ub-photos-carlsbadJohn Hoford2013-06-131-0/+8
|\ \ \ \ \ \