summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Update ingest importer codeBobby Georgescu2014-05-1422-2292/+2922
| | | | Change-Id: I0f3b0809deead2f49501a5309f0ddab9c911274f
* am 3d736418: Merge "Use basic editor for sharpen filter."Alan Newberger2014-04-221-1/+2
|\ | | | | | | | | * commit '3d73641843682089be63cd248465497f007b93a1': Use basic editor for sharpen filter.
| * Use basic editor for sharpen filter.Jun Su2014-02-231-1/+2
| | | | | | | | | | | | | | | | | | Currently gallery's sharpen filter is relate to the editor id = R.id.imageShow, which is not point to any valid editor. As a result native gallery sharpen function will cause exception and fail. Change to use basic editor. Change-Id: I2a04ab81c395e12004cd6fe4635932a19c1c39be
* | am e9c89c81: Merge "gallery: change typo \'&&\' to \'||\'"Nick Kralevich2014-02-011-1/+1
|\| | | | | | | | | * commit 'e9c89c814c97a74456ad1bf8d4c32a983663924c': gallery: change typo '&&' to '||'
| * gallery: change typo '&&' to '||'Leavitt Zhang2014-01-281-1/+1
| | | | | | | | | | | | | | | | | | Assertion to ckeck array boundary should be '&&' instead of '||'. It caused an Exception that '-1' wasn't detected. Change-Id: I991ad8efed87a0837d262fe7419c7f007c173b56 Signed-off-by: Leavitt Zhang <leavittz@nvidia.com>
* | am 91628475: am 947478b6: am aa22947b: Fix the thumbnail generation.ztenghui2013-11-181-0/+3
|\ \ | |/ |/| | | | | * commit '91628475ee8409e03f57a038c0bec3a830f462d6': Fix the thumbnail generation.
| * Fix the thumbnail generation.ztenghui2013-11-181-0/+3
| | | | | | | | | | bug:11664501 Change-Id: I53ec5a08e801d0300b8ed159158bc46f61c6d3f4
* | am 350f7e3d: am 00dfa8a1: am 1619b3c3: Fix infinite spinner dialognicolasroard2013-11-041-1/+1
|\| | | | | | | | | * commit '350f7e3de777fdb331494ea5efb08809e46f980b': Fix infinite spinner dialog
| * Fix infinite spinner dialognicolasroard2013-11-011-1/+1
| | | | | | | | | | | | bug:11328106 Change-Id: Icbfcb7bb6c88a03c81315789b2569da440267edd
* | am c23e8d86: am 07986225: am c82e65b4: Merge "Disable geometry button if ↵nicolasroard2013-11-042-0/+8
|\| | | | | | | | | | | | | tiny planet is here" into gb-ub-photos-carlsbad * commit 'c23e8d862de72682f444f68fff3b1f30efcc21cd': Disable geometry button if tiny planet is here
| * Merge "Disable geometry button if tiny planet is here" into ↵nicolasroard2013-11-022-0/+8
| |\ | | | | | | | | | gb-ub-photos-carlsbad
| | * Disable geometry button if tiny planet is herenicolasroard2013-11-012-0/+8
| | | | | | | | | | | | | | | bug:11288853 Change-Id: I818f406eb25e0f82c89ffde0bd91d2aa8ab31b94
* | | am d5dbfe7b: am d6644d60: am c0c6f058: Merge "fix Gallery crash using crop" ↵John Hoford2013-11-041-0/+1
|\| | | | | | | | | | | | | | | | | | | | into gb-ub-photos-carlsbad * commit 'd5dbfe7b0336ef2349dd2ca321ae4cc51cb8b1ff': fix Gallery crash using crop
| * | fix Gallery crash using cropJohn Hoford2013-11-011-0/+1
| |/ | | | | | | | | bug:11347083 Change-Id: Ic5417d12e0b1cee181ddad8d581eddc6aeb8a5b8
* | am 2c237f11: Merge "Fix invalid private access."Narayan Kamath2013-10-311-2/+2
|\ \ | |/ |/| | | | | * commit '2c237f1146ebc4385a9a0a0c6f9365aa09db5b24': Fix invalid private access.
| * Fix invalid private access.Narayan Kamath2013-10-311-2/+2
| | | | | | | | | | | | | | | | | | | | See http://bugs.sun.com/view_bug.do?bug_id=6904536 bug: 8992787 (cherry picked from ff19ed981400cd150f8779107cba1e02033b9ebe) Change-Id: I7cad5e9cf8761b440cf91b96e3599d19bc3188d9
| * am ee14cce0: am e8e2610f: Fix preview thumb and touch target out of syncDoris Liu2013-07-102-2/+17
| |\ | | | | | | | | | | | | * commit 'ee14cce054c74c3eb785de3ea4936c75bb753b6b': Fix preview thumb and touch target out of sync
| | * Fix preview thumb and touch target out of syncDoris Liu2013-07-092-2/+17
| | | | | | | | | | | | | | | | | | | | | Also ensure video module respects system orientation lock Bug: 9626888 Change-Id: I4d7406c37878446e65d0ad1de3bc6b300acb1b23 (cherry picked from commit dfc939b80f45d969a44caca4bd397ab0828c562d)
| * | am a4d93ac0: Fix text size in the state panelnicolasroard2013-06-111-0/+1
| |\| | | | | | | | | | | | | * commit 'a4d93ac033712096c820840b31e7017f850f8e74': Fix text size in the state panel
| | * Fix text size in the state panelnicolasroard2013-06-111-0/+1
| | | | | | | | | | | | | | | | | | bug:9377153 Change-Id: I6a3a383e4180d757f0272492dcadcbfdb580b154 (cherry picked from commit 68cb2b7efda1b35c79279c670b0d3a0bd6df72ae)
| * | am 6c604d61: Update preview size for focus manager after rotationDoris Liu2013-06-051-3/+3
| |\| | | | | | | | | | | | | * commit '6c604d616ff796f1ec41d4ad7212729cf469e8f5': Update preview size for focus manager after rotation
| | * Update preview size for focus manager after rotationDoris Liu2013-06-051-3/+3
| | | | | | | | | | | | | | | Bug: 9282724 Change-Id: I5c0f0ecb2bf47e9600198450a9fce3590b2c5d10 (cherry picked from commit c71bd4f897a2322baa6765aa8abcf2c3fe35c05a)
| * | am 536c651c: am 8bb4e1a0: Fixes reading exif tags in editor.Ruben Brunk2013-06-031-1/+1
| |\| | | | | | | | | | | | | * commit '536c651c7fa0c8e70990ba8ff302cdc98e8c3105': Fixes reading exif tags in editor.
| | * am 8bb4e1a0: Fixes reading exif tags in editor.Ruben Brunk2013-06-031-1/+1
| | |\ | | | | | | | | | | | | | | | | * commit '8bb4e1a036e67a3bf4f9cdb8f55d6f558189e5b9': Fixes reading exif tags in editor.
| * | | am 3fac8415: am af65d7ba: Merge "Add HTC One picture resolutions" into ↵Michael Kolb2013-05-301-2/+23
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-bryce * commit '3fac84150826c68fbb1607f7151328ee4ad17f3c': Add HTC One picture resolutions
| | * | am af65d7ba: Merge "Add HTC One picture resolutions" into gb-ub-photos-bryceMichael Kolb2013-05-301-2/+23
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit 'af65d7ba216eba60651d11d248d20346309375ed': Add HTC One picture resolutions
| * | | | am 66c23659: am a1db2653: Dismiss settings when showing popup in Video mode.Angus Kong2013-05-301-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '66c236598a273c308384423a1d9babce05c79588': Dismiss settings when showing popup in Video mode.
| | * | | am a1db2653: Dismiss settings when showing popup in Video mode.Angus Kong2013-05-301-0/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a1db26536913f1259ad74c5e6e952521c05bf2f0': Dismiss settings when showing popup in Video mode.
| * | | | | am 00d9601b: am 9fb962fe: Merge "Change the order of exposure compensation" ↵Doris Liu2013-05-281-4/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gb-ub-photos-bryce * commit '00d9601b666106c3a1b60beb88639c70b8548ddc': Change the order of exposure compensation
| | * | | | am 9fb962fe: Merge "Change the order of exposure compensation" into ↵Doris Liu2013-05-281-4/+4
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-bryce * commit '9fb962feb94909af05ab6cf872eee7e8928eb9b1': Change the order of exposure compensation
| * | | | | | am c1aaf4b5: am e3336dc3: Merge "Prevent lock screen appearing during active ↵Bobby Georgescu2013-05-281-2/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | slideshow" into gb-ub-photos-bryce * commit 'c1aaf4b526507245428ef56a03727a5d0fb68659': Prevent lock screen appearing during active slideshow
| | * | | | | 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
| * | | | | | | am 7b3d8d85: am a7a6a3a5: Fix issues with LocalJohn Hoford2013-05-231-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7b3d8d85e8602c0f6b43a13b3b0b1deccb8600cd': Fix issues with Local
| | * | | | | | am a7a6a3a5: Fix issues with LocalJohn Hoford2013-05-231-0/+1
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a7a6a3a5efaf62cdd5d562a9141678671952d27d': Fix issues with Local
| * | | | | | | | am 3d4fbf40: am 4d25d129: Merge "fix ellipse logic for portrait" into ↵John Hoford2013-05-221-4/+21
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-bryce * commit '3d4fbf40115389ed33487db2059048163c9afd1a': fix ellipse logic for portrait
| | * | | | | | | 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
| * | | | | | | | | am 410635e7: am cdc87e62: Merge "Fix potential synchronization issue in ↵Bobby Georgescu2013-05-221-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bitmap pool" into gb-ub-photos-bryce * commit '410635e7f8df429fcecc328bf6191b053b989004': Fix potential synchronization issue in bitmap pool
| | * | | | | | | | am cdc87e62: Merge "Fix potential synchronization issue in bitmap pool" into ↵Bobby Georgescu2013-05-221-2/+2
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-bryce * commit 'cdc87e62ee28b5022b2e4d0bc756c264cc26d8e9': Fix potential synchronization issue in bitmap pool
| * | | | | | | | | | am 02593125: am be4f113f: Fix editor on ICSMichael Kolb2013-05-221-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0259312504eddbae2f29a1d8a09892fb0e95d8c8': Fix editor on ICS
| | * | | | | | | | | am be4f113f: Fix editor on ICSMichael Kolb2013-05-221-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'be4f113fa1fea32e8d8865a52491b9f25760eaba': Fix editor on ICS
| * | | | | | | | | | | am 7da344a4: am 37be6658: Merge "Fix selection highlight for tablets" into ↵Michael Kolb2013-05-212-2/+25
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-bryce * commit '7da344a46f348a5bc9ac958ccf7186b4f7d1c899': Fix selection highlight for tablets
| | * | | | | | | | | | am 37be6658: Merge "Fix selection highlight for tablets" into gb-ub-photos-bryceMichael Kolb2013-05-212-2/+25
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '37be6658075cac2bad0e30d93705dddeaaf1e421': Fix selection highlight for tablets
| * | | | | | | | | | | | am 550eefae: am 01ae91aa: Merge "Fix height" into gb-ub-photos-bryceJohn Reck2013-05-211-1/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '550eefae642049dea0023168643b54d1c7a73b8e': Fix height
| | * | | | | | | | | | | am 01ae91aa: Merge "Fix height" into gb-ub-photos-bryceJohn Reck2013-05-211-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '01ae91aa0e347c5a8b335afc8cb0f02459ee5adc': Fix height
| * | | | | | | | | | | | | am 0cf42d07: am 80a3d636: Make capture thumbnail tappable in video mode.Sascha Haeberling2013-05-213-1/+37
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0cf42d07132b27aa1f50707fbf5aa30fde925cbf': Make capture thumbnail tappable in video mode.
| | * | | | | | | | | | | | am 80a3d636: Make capture thumbnail tappable in video mode.Sascha Haeberling2013-05-213-1/+37
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '80a3d636fa38bb78dbc9f224b4944a21a6e3271d': Make capture thumbnail tappable in video mode.
| * | | | | | | | | | | | | | am bfce0515: am aa77f39a: Merge "Fix camera controls blink on startup" into ↵Doris Liu2013-05-211-0/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-bryce * commit 'bfce0515165aa381b730b4dd772132c41dea4e28': Fix camera controls blink on startup
| | * | | | | | | | | | | | | am aa77f39a: Merge "Fix camera controls blink on startup" into ↵Doris Liu2013-05-211-0/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-bryce * commit 'aa77f39a3a18ee7945177189c358ef6208e6da2b': Fix camera controls blink on startup
| * | | | | | | | | | | | | | | am c6038e29: am a285bc13: Merge "fix TinyPlanets Filter landscape crash" ↵John Hoford2013-05-211-1/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gb-ub-photos-bryce * commit 'c6038e29aea5012a8c342d1a4c72aa26a9895519': fix TinyPlanets Filter landscape crash
| | * | | | | | | | | | | | | | am a285bc13: Merge "fix TinyPlanets Filter landscape crash" into ↵John Hoford2013-05-211-1/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-bryce * commit 'a285bc130ff1175c60085410f317e90f6443c39b': fix TinyPlanets Filter landscape crash
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-22 10:11:47 +0000