summaryrefslogtreecommitdiffstats
path: root/src/com/android
Commit message (Collapse)AuthorAgeFilesLines
* Start of photosJohn Reck2013-02-227-1/+421
| | | | Change-Id: Id53dd96d8873e0fe6c2685e07cd7bdc0cde7ea75
* Merge "Stopgap fixes for more of the photo editor's memory issues." into ↵Ruben Brunk2013-02-225-9/+51
|\ | | | | | | gb-ub-photos-bryce
| * Stopgap fixes for more of the photo editor's memory issues.Ruben Brunk2013-02-225-9/+51
| | | | | | | | | | | | Bug: 8253109 Bug: 8233895 Change-Id: Idd55618807ff0a0c5ac0cbb8c71db167fa32e70b
* | Merge "Revert "Stopgap fixes for more of the photo editor's memory issues."" ↵Ruben Brunk2013-02-225-51/+9
|\ \ | | | | | | | | | into gb-ub-photos-bryce
| * | Revert "Stopgap fixes for more of the photo editor's memory issues."Ruben Brunk2013-02-225-51/+9
| | | | | | | | | | | | | | | | | | This reverts commit 4c91156f9a2e48ebaec86e3a46ea9b7855392cfd Change-Id: If94d87fd4d84bd518b7cc113c3cd422b59fdd3ed
* | | Merge "Stopgap fixes for more of the photo editor's memory issues." into ↵Ruben Brunk2013-02-225-9/+51
|\| | | | | | | | | | | gb-ub-photos-bryce
| * | Stopgap fixes for more of the photo editor's memory issues.Ruben Brunk2013-02-225-9/+51
| |/ | | | | | | | | | | Bug: 8253109 Bug: 8233895 Change-Id: I676b6749f3b273a431323609add01e82b88db456
* | Merge "Replace various BitmapPools with a smarter unified pool" into ↵Bobby Georgescu2013-02-2218-243/+332
|\ \ | | | | | | | | | gb-ub-photos-bryce
| * | Replace various BitmapPools with a smarter unified poolBobby Georgescu2013-02-2218-243/+332
| | | | | | | | | | | | | | | | | | | | | | | | Make all of gallery use a single shared pool, and pave the way for making the pool more adaptive based on the current workload. Change-Id: Ia32561ad50b1b9716ebe2fd32a7bf02737685dac
* | | Don't apply the filters twice in partial rendering...nicolasroard2013-02-221-0/+4
| |/ |/| | | | | Change-Id: I5ddcb74e2a6cf09852eec0049bee47581b402f28
* | Merge "Move setting wallpaper to a background thread." into gb-ub-photos-bryceRuben Brunk2013-02-221-5/+24
|\ \
| * | Move setting wallpaper to a background thread.Ruben Brunk2013-02-221-5/+24
| | | | | | | | | | | | | | | Bug: 8088767 Change-Id: I168032418a15f766ac09e18cd12707c7270b07f3
* | | Pinch to zoom refinenicolasroard2013-02-2124-29/+251
| | | | | | | | | | | | Change-Id: I538defa55a4ed898dd7c936ec813f052ac1b9e0a
* | | Fix for null check with RS allocations.Ruben Brunk2013-02-211-0/+2
| | | | | | | | | | | | | | | Bug: 8243554 Change-Id: I49da16f530a7283a801b3739ee7ba06bc7e4dad7
* | | fix draw and ellipse to handle pinch to zoomJohn Hoford2013-02-214-35/+60
| | | | | | | | | | | | Change-Id: I8af9b37dcd98425959742a4142756963363d1cec
* | | Adjust capture animation timingMichael Kolb2013-02-211-3/+3
| | | | | | | | | | | | Change-Id: I77c44baeafa58d2a28aa9f4ce85008e14a7f61eb
* | | Merge "Temporary handling when running out of heap in filtershow." into ↵Ruben Brunk2013-02-212-44/+153
|\ \ \ | | | | | | | | | | | | gb-ub-photos-bryce
| * | | Temporary handling when running out of heap in filtershow.Ruben Brunk2013-02-212-44/+153
| |/ / | | | | | | | | | | | | Bug: 8233895 Change-Id: Id078d2a4b387127c0d230bc5d9de4590f0e9f72b
* | | add highlight filterJohn Hoford2013-02-213-0/+241
| | | | | | | | | | | | Change-Id: I2e59e09fbc80172b9dfe27b3ce8ff2f1e24c5872
* | | Remove SliderController classnicolasroard2013-02-213-216/+0
| | | | | | | | | | | | Change-Id: I59ed20a63a59e4c48c0a44ff52d82852ea159331
* | | Merge "Remove slider in ImageShow, cleanup code" into gb-ub-photos-brycenicolasroard2013-02-214-117/+3
|\ \ \
| * | | Remove slider in ImageShow, cleanup codenicolasroard2013-02-204-117/+3
| | | | | | | | | | | | | | | | Change-Id: I005d4ecd33a5b6fcd23af6a6ba46419e7c9fc683
* | | | Merge "Fix NPE for when camera is disabled" into gb-ub-photos-bryceDoris Liu2013-02-211-2/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Fix NPE for when camera is disabledDoris Liu2013-02-201-2/+4
| | |/ | |/| | | | | | | | | | Bug: 7950211 Change-Id: I3983209211bc4afdff3a8878f458a9bf275c5639
* | | Fix typonicolasroard2013-02-201-1/+1
| | | | | | | | | | | | Change-Id: I6c41782a033d5ad1bb5780b22d99658223b23a0b
* | | Add pinch to zoomnicolasroard2013-02-206-65/+200
| | | | | | | | | | | | Change-Id: I5d90a7ce5d890f613fa957244c6ac5291496cf1a
* | | Removed unsupported GL operations.Ruben Brunk2013-02-201-4/+1
| | | | | | | | | | | | | | | Bug: 8223749 Change-Id: I722220def36aa4a9e53666540471100df6609d74
* | | Merge "Show the Utility Panel by default." into gb-ub-photos-bryceVictor Doba2013-02-201-1/+1
|\ \ \
| * | | Show the Utility Panel by default.Victor Doba2013-02-151-1/+1
| | | |
* | | | fix vignette startup issuesJohn Hoford2013-02-202-5/+13
| | | | | | | | | | | | | | | | Change-Id: I3a8461edf3239044565611ed35b41cb87e5a529f
* | | | add movable vignetteJohn Hoford2013-02-1910-39/+654
| |/ / |/| | | | | | | | Change-Id: I54f2fccd0d748ca4c908d5b0f3c3ef7349cd686d
* | | Fix auto-focus areasMichael Kolb2013-02-181-33/+28
| | | | | | | | | | | | | | | | | | | | | Use a specific focus area in continuous AF Use a smaller AF area for tap to focus Change-Id: Ia633dec7c1830c7c03f56434614e9bce3f5697e6
* | | Fix AF animationMichael Kolb2013-02-182-3/+6
| | | | | | | | | | | | | | | | | | Bug: 8219462 Change-Id: I9c39c70aad8f1ca6763acfc2d2a5ff5c918c71a5
* | | Merge "Make photo orientation consistent with UI" into gb-ub-photos-bryceDoris Liu2013-02-162-1/+27
|\ \ \
| * | | Make photo orientation consistent with UIDoris Liu2013-02-152-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixed the wrong animation orientation. Bug: 7302506 Change-Id: I58615a7b3cc2e08c2a8dc4e174512a502c2482f5
* | | | Merge "Remove com.android.camera.R" into gb-ub-photos-bryceJohn Reck2013-02-1635-16/+40
|\ \ \ \
| * | | | Remove com.android.camera.RJohn Reck2013-02-1535-16/+40
| | | | | | | | | | | | | | | | | | | | Change-Id: I0bb03da1423401f872c3bf13caffb9c87d850449
* | | | | Merge "Don't use AsyncTasks to fetch images via MTP" into gb-ub-photos-bryceBobby Georgescu2013-02-152-42/+81
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Don't use AsyncTasks to fetch images via MTPBobby Georgescu2013-02-142-42/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8192491 Avoids allocations when scrolling through the importer grid by not using AsyncTasks anymore (which meant one object creation per change of the source image). Also fix an NPE if a device is unplugged during scrolling. Change-Id: I4e7022ca5d4573402e60b16fbd82ea65bc6627e0
* | | | | Merge "New capture animation" into gb-ub-photos-bryceMichael Kolb2013-02-151-25/+79
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | New capture animationMichael Kolb2013-02-141-25/+79
| | | | | | | | | | | | | | | | | | | | Change-Id: I45dd4989fcebd5fc69cfff55d69827574a438ec4
* | | | | Merge "Fixed crop display for setting contacts/wallpapers." into ↵Ruben Brunk2013-02-152-12/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | gb-ub-photos-bryce
| * | | | | Fixed crop display for setting contacts/wallpapers.Ruben Brunk2013-02-142-12/+20
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8187056 Bug: 8196779 Bug: 8140241 Change-Id: Iaf3d113d9e53d365b73985fdc3350b627f8bda4c
* | | | | Merge "refactor to support many filter based on RedEye" into gb-ub-photos-bryceJohn Hoford2013-02-149-196/+287
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | refactor to support many filter based on RedEyeJohn Hoford2013-02-149-196/+287
| |/ / / | | | | | | | | | | | | Change-Id: I92ff19d8f750f5bf4c188129580e22990874501e
* | | | Merge "Fix inexplicable monkey NPE" into gb-ub-photos-bryceMichael Kolb2013-02-141-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix inexplicable monkey NPEMichael Kolb2013-02-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 8049510 Change-Id: Idbd624a309bc026a1805030982cb0cb7ace698ee
* | | | Fix video disappearing when rotatedDoris Liu2013-02-131-6/+8
| | | | | | | | | | | | | | | | | | | | Bug: 7459723 Change-Id: I0f42e476cfda6c0c757ca1fda3dd8072bec25a37
* | | | Make ShutterButton visible after initialization.Angus Kong2013-02-131-0/+1
| | | | | | | | | | | | | | | | | | | | bug:8186870 Change-Id: I45e33532e82cc128c25e61e3bf57843aef24edc2
* | | | get redeye working againJohn Hoford2013-02-1310-9/+48
| | | |