OSDN Git Service
John Hoford [Tue, 26 Feb 2013 01:39:01 +0000 (17:39 -0800)]
add upoint
Change-Id: I484d2c6658e4ea06e22fa037ef2262c17b9e8d79
Baligh Uddin [Mon, 25 Feb 2013 17:59:50 +0000 (17:59 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Mon, 25 Feb 2013 15:41:41 +0000 (07:41 -0800)]
Import translations. DO NOT MERGE
Change-Id: I833d58d07a1126966484a53851f6a84b45068152
Auto-generated-cl: translation import
Baligh Uddin [Mon, 25 Feb 2013 15:40:31 +0000 (07:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: I545c00f3af3c4d7ab8dee256e8f3119bea41e6f7
Auto-generated-cl: translation import
Doris Liu [Sat, 23 Feb 2013 00:04:21 +0000 (00:04 +0000)]
Merge "Release surface texture to fix gray camera preview" into gb-ub-photos-bryce
Doris Liu [Fri, 22 Feb 2013 22:31:17 +0000 (14:31 -0800)]
Release surface texture to fix gray camera preview
Bug:
8133672
Change-Id: Ie71c8fd1ea07a19eccf5bbd773054e095426fe80
John Reck [Fri, 15 Feb 2013 22:32:08 +0000 (14:32 -0800)]
Start of photos
Change-Id: Id53dd96d8873e0fe6c2685e07cd7bdc0cde7ea75
Baligh Uddin [Fri, 22 Feb 2013 22:23:17 +0000 (22:23 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Ruben Brunk [Fri, 22 Feb 2013 21:58:33 +0000 (21:58 +0000)]
Merge "Stopgap fixes for more of the photo editor's memory issues." into gb-ub-photos-bryce
Ruben Brunk [Fri, 22 Feb 2013 21:25:51 +0000 (13:25 -0800)]
Stopgap fixes for more of the photo editor's memory issues.
Bug:
8253109
Bug:
8233895
Change-Id: Idd55618807ff0a0c5ac0cbb8c71db167fa32e70b
Ruben Brunk [Fri, 22 Feb 2013 21:47:06 +0000 (21:47 +0000)]
Merge "Revert "Stopgap fixes for more of the photo editor's memory issues."" into gb-ub-photos-bryce
Ruben Brunk [Fri, 22 Feb 2013 21:45:26 +0000 (21:45 +0000)]
Revert "Stopgap fixes for more of the photo editor's memory issues."
This reverts commit
4c91156f9a2e48ebaec86e3a46ea9b7855392cfd
Change-Id: If94d87fd4d84bd518b7cc113c3cd422b59fdd3ed
Ruben Brunk [Fri, 22 Feb 2013 21:41:03 +0000 (21:41 +0000)]
Merge "Stopgap fixes for more of the photo editor's memory issues." into gb-ub-photos-bryce
Ruben Brunk [Fri, 22 Feb 2013 21:25:51 +0000 (13:25 -0800)]
Stopgap fixes for more of the photo editor's memory issues.
Bug:
8253109
Bug:
8233895
Change-Id: I676b6749f3b273a431323609add01e82b88db456
Bobby Georgescu [Fri, 22 Feb 2013 21:03:45 +0000 (21:03 +0000)]
Merge "Replace various BitmapPools with a smarter unified pool" into gb-ub-photos-bryce
Bobby Georgescu [Tue, 19 Feb 2013 23:49:14 +0000 (15:49 -0800)]
Replace various BitmapPools with a smarter unified pool
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
nicolasroard [Fri, 22 Feb 2013 19:35:41 +0000 (11:35 -0800)]
Don't apply the filters twice in partial rendering...
Change-Id: I5ddcb74e2a6cf09852eec0049bee47581b402f28
Ruben Brunk [Fri, 22 Feb 2013 17:52:59 +0000 (17:52 +0000)]
Merge "Move setting wallpaper to a background thread." into gb-ub-photos-bryce
Ruben Brunk [Fri, 22 Feb 2013 04:13:20 +0000 (20:13 -0800)]
Move setting wallpaper to a background thread.
Bug:
8088767
Change-Id: I168032418a15f766ac09e18cd12707c7270b07f3
Baligh Uddin [Fri, 22 Feb 2013 16:15:57 +0000 (08:15 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iab4b1ffed69207e4d4e3962d15845d4d550e7022
Auto-generated-cl: translation import
nicolasroard [Thu, 21 Feb 2013 23:52:49 +0000 (15:52 -0800)]
Pinch to zoom refine
Change-Id: I538defa55a4ed898dd7c936ec813f052ac1b9e0a
Ruben Brunk [Thu, 21 Feb 2013 23:43:33 +0000 (15:43 -0800)]
Fix for null check with RS allocations.
Bug:
8243554
Change-Id: I49da16f530a7283a801b3739ee7ba06bc7e4dad7
John Hoford [Thu, 21 Feb 2013 23:18:37 +0000 (15:18 -0800)]
fix draw and ellipse to handle pinch to zoom
Change-Id: I8af9b37dcd98425959742a4142756963363d1cec
Michael Kolb [Thu, 21 Feb 2013 19:37:45 +0000 (11:37 -0800)]
Adjust capture animation timing
Change-Id: I77c44baeafa58d2a28aa9f4ce85008e14a7f61eb
Ruben Brunk [Thu, 21 Feb 2013 21:12:21 +0000 (21:12 +0000)]
Merge "Temporary handling when running out of heap in filtershow." into gb-ub-photos-bryce
Ruben Brunk [Thu, 21 Feb 2013 06:45:55 +0000 (22:45 -0800)]
Temporary handling when running out of heap in filtershow.
Bug:
8233895
Change-Id: Id078d2a4b387127c0d230bc5d9de4590f0e9f72b
John Hoford [Thu, 21 Feb 2013 01:50:42 +0000 (17:50 -0800)]
add highlight filter
Change-Id: I2e59e09fbc80172b9dfe27b3ce8ff2f1e24c5872
nicolasroard [Thu, 21 Feb 2013 17:52:14 +0000 (09:52 -0800)]
Remove SliderController class
Change-Id: I59ed20a63a59e4c48c0a44ff52d82852ea159331
Jason Noguchi [Thu, 21 Feb 2013 04:33:47 +0000 (04:33 +0000)]
Merge "Scaling down the stress test defaults iteration counts to some base level. For true stress testing, need to pass arguments to scale these back up to 100. Also, temporarily removing SwitchPreview test which needs updating and currently would block other tests in stress suite." into gb-ub-photos-bryce
nicolasroard [Thu, 21 Feb 2013 04:07:27 +0000 (04:07 +0000)]
Merge "Remove slider in ImageShow, cleanup code" into gb-ub-photos-bryce
Doris Liu [Thu, 21 Feb 2013 03:36:46 +0000 (03:36 +0000)]
Merge "Fix NPE for when camera is disabled" into gb-ub-photos-bryce
nicolasroard [Thu, 21 Feb 2013 03:32:37 +0000 (19:32 -0800)]
Remove slider in ImageShow, cleanup code
Change-Id: I005d4ecd33a5b6fcd23af6a6ba46419e7c9fc683
nicolasroard [Thu, 21 Feb 2013 01:44:51 +0000 (17:44 -0800)]
Fix typo
Change-Id: I6c41782a033d5ad1bb5780b22d99658223b23a0b
nicolasroard [Fri, 15 Feb 2013 00:33:01 +0000 (16:33 -0800)]
Add pinch to zoom
Change-Id: I5d90a7ce5d890f613fa957244c6ac5291496cf1a
Doris Liu [Thu, 21 Feb 2013 00:29:44 +0000 (16:29 -0800)]
Fix NPE for when camera is disabled
Bug:
7950211
Change-Id: I3983209211bc4afdff3a8878f458a9bf275c5639
Jason Noguchi [Wed, 20 Feb 2013 22:42:27 +0000 (14:42 -0800)]
Scaling down the stress test defaults iteration counts to some base level.
For true stress testing, need to pass arguments to scale these back up to 100.
Also, temporarily removing SwitchPreview test which needs updating and currently
would block other tests in stress suite.
Change-Id: I9dd92e0090e2554aca5cb4b23fed2d33554c9c5e
Ruben Brunk [Wed, 20 Feb 2013 22:44:02 +0000 (14:44 -0800)]
Removed unsupported GL operations.
Bug:
8223749
Change-Id: I722220def36aa4a9e53666540471100df6609d74
Victor Doba [Wed, 20 Feb 2013 17:29:53 +0000 (17:29 +0000)]
Merge "Show the Utility Panel by default." into gb-ub-photos-bryce
John Hoford [Wed, 20 Feb 2013 16:31:40 +0000 (08:31 -0800)]
fix vignette startup issues
Change-Id: I3a8461edf3239044565611ed35b41cb87e5a529f
John Hoford [Sat, 16 Feb 2013 17:20:59 +0000 (09:20 -0800)]
add movable vignette
Change-Id: I54f2fccd0d748ca4c908d5b0f3c3ef7349cd686d
Baligh Uddin [Tue, 19 Feb 2013 19:22:16 +0000 (19:22 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Tue, 19 Feb 2013 19:08:44 +0000 (11:08 -0800)]
Import translations. DO NOT MERGE
Change-Id: If262abcd9e8910ccaf49d20f3a853dcf97cd9b63
Auto-generated-cl: translation import
Baligh Uddin [Tue, 19 Feb 2013 19:06:45 +0000 (11:06 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic697e873594208549955d01399accad284b239db
Auto-generated-cl: translation import
Michael Kolb [Sat, 16 Feb 2013 21:13:47 +0000 (13:13 -0800)]
Fix auto-focus areas
Use a specific focus area in continuous AF
Use a smaller AF area for tap to focus
Change-Id: Ia633dec7c1830c7c03f56434614e9bce3f5697e6
Michael Kolb [Mon, 18 Feb 2013 23:16:44 +0000 (15:16 -0800)]
Fix AF animation
Bug:
8219462
Change-Id: I9c39c70aad8f1ca6763acfc2d2a5ff5c918c71a5
Doris Liu [Sat, 16 Feb 2013 01:39:59 +0000 (01:39 +0000)]
Merge "Make photo orientation consistent with UI" into gb-ub-photos-bryce
Doris Liu [Fri, 15 Feb 2013 18:55:37 +0000 (10:55 -0800)]
Make photo orientation consistent with UI
Also fixed the wrong animation orientation.
Bug:
7302506
Change-Id: I58615a7b3cc2e08c2a8dc4e174512a502c2482f5
Angus Kong [Sat, 16 Feb 2013 00:14:01 +0000 (00:14 +0000)]
Merge "Bump up the version number to 1.1.40002" into gb-ub-photos-bryce
John Reck [Sat, 16 Feb 2013 00:08:26 +0000 (16:08 -0800)]
Remove more com.android.camera.R
Change-Id: I410baaf4a3f0d824d44ea24435a1716cad3bb966
Angus Kong [Sat, 16 Feb 2013 00:09:11 +0000 (16:09 -0800)]
Bump up the version number to 1.1.40002
Change-Id: I5911eb3345b7774a6690372999fce3673b551f84
John Reck [Sat, 16 Feb 2013 00:01:05 +0000 (00:01 +0000)]
Merge "Remove com.android.camera.R" into gb-ub-photos-bryce
John Reck [Fri, 15 Feb 2013 23:51:30 +0000 (15:51 -0800)]
Remove com.android.camera.R
Change-Id: I0bb03da1423401f872c3bf13caffb9c87d850449
Baligh Uddin [Fri, 15 Feb 2013 22:19:55 +0000 (22:19 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Fri, 15 Feb 2013 22:15:38 +0000 (22:15 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Bobby Georgescu [Fri, 15 Feb 2013 21:05:21 +0000 (21:05 +0000)]
Merge "Don't use AsyncTasks to fetch images via MTP" into gb-ub-photos-bryce
Baligh Uddin [Fri, 15 Feb 2013 20:13:18 +0000 (12:13 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7ae5988c73d412dd05a2f8b947cb8c97d5d1bba9
Auto-generated-cl: translation import
Baligh Uddin [Fri, 15 Feb 2013 20:11:51 +0000 (12:11 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ieb36191410097c0161e4e847dab30b6b029b5de0
Auto-generated-cl: translation import
Michael Kolb [Fri, 15 Feb 2013 15:43:12 +0000 (15:43 +0000)]
Merge "New capture animation" into gb-ub-photos-bryce
Victor Doba [Fri, 15 Feb 2013 12:24:41 +0000 (13:24 +0100)]
Show the Utility Panel by default.
Jason Noguchi [Fri, 15 Feb 2013 03:01:56 +0000 (03:01 +0000)]
Merge "Merging camera test with gallery test." into gb-ub-photos-bryce
Bobby Georgescu [Thu, 14 Feb 2013 03:23:54 +0000 (19:23 -0800)]
Don't use AsyncTasks to fetch images via MTP
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
Ruben Brunk [Fri, 15 Feb 2013 01:29:31 +0000 (01:29 +0000)]
Merge "Fixed crop display for setting contacts/wallpapers." into gb-ub-photos-bryce
Ruben Brunk [Fri, 15 Feb 2013 00:18:22 +0000 (16:18 -0800)]
Fixed crop display for setting contacts/wallpapers.
Bug:
8187056
Bug:
8196779
Bug:
8140241
Change-Id: Iaf3d113d9e53d365b73985fdc3350b627f8bda4c
Jason Noguchi [Wed, 13 Feb 2013 23:35:23 +0000 (15:35 -0800)]
Merging camera test with gallery test.
Change-Id: I8ef94a67dddc67a66c1d42a1b91e0a0c380b2841
John Hoford [Thu, 14 Feb 2013 23:40:25 +0000 (23:40 +0000)]
Merge "refactor to support many filter based on RedEye" into gb-ub-photos-bryce
John Hoford [Thu, 14 Feb 2013 23:08:28 +0000 (15:08 -0800)]
refactor to support many filter based on RedEye
Change-Id: I92ff19d8f750f5bf4c188129580e22990874501e
Michael Kolb [Thu, 14 Feb 2013 21:40:39 +0000 (13:40 -0800)]
New capture animation
Change-Id: I45dd4989fcebd5fc69cfff55d69827574a438ec4
Michael Kolb [Thu, 14 Feb 2013 21:43:00 +0000 (21:43 +0000)]
Merge "Fix inexplicable monkey NPE" into gb-ub-photos-bryce
Michael Kolb [Thu, 14 Feb 2013 16:30:59 +0000 (08:30 -0800)]
Fix inexplicable monkey NPE
Bug:
8049510
Change-Id: Idbd624a309bc026a1805030982cb0cb7ace698ee
Doris Liu [Thu, 14 Feb 2013 02:28:03 +0000 (18:28 -0800)]
Fix video disappearing when rotated
Bug:
7459723
Change-Id: I0f42e476cfda6c0c757ca1fda3dd8072bec25a37
Angus Kong [Thu, 14 Feb 2013 02:13:13 +0000 (18:13 -0800)]
Make ShutterButton visible after initialization.
bug:
8186870
Change-Id: I45e33532e82cc128c25e61e3bf57843aef24edc2
John Hoford [Wed, 13 Feb 2013 23:52:31 +0000 (15:52 -0800)]
get redeye working again
nicolasroard [Thu, 14 Feb 2013 01:28:53 +0000 (01:28 +0000)]
Merge "Fix sync representations" into gb-ub-photos-bryce
nicolasroard [Wed, 13 Feb 2013 23:51:25 +0000 (15:51 -0800)]
Fix sync representations
Change-Id: I8b1b159a2350f7ee8bcdc7e71faf82ab5df2755b
Ruben Brunk [Wed, 13 Feb 2013 23:24:17 +0000 (23:24 +0000)]
Merge "Fix proguard and makefile targets for tests." into gb-ub-photos-bryce
Ruben Brunk [Wed, 13 Feb 2013 21:36:21 +0000 (13:36 -0800)]
Fix proguard and makefile targets for tests.
Change-Id: I19f35567eff7c6d377a95b434dc4735faca93861
John Hoford [Wed, 13 Feb 2013 19:40:52 +0000 (11:40 -0800)]
fix draw to support rotation/crop
Change-Id: Iea1db9e42f1fa2b86a452bf1d40b1663b69d03e2
Bobby Georgescu [Wed, 13 Feb 2013 19:46:39 +0000 (19:46 +0000)]
Merge "Importer: Full-screen viewing, UI refinement, refactoring" into gb-ub-photos-bryce
nicolasroard [Wed, 13 Feb 2013 19:31:16 +0000 (19:31 +0000)]
Merge "Pass the ImagePreset to ImageFilter" into gb-ub-photos-bryce
nicolasroard [Wed, 13 Feb 2013 19:23:56 +0000 (11:23 -0800)]
Pass the ImagePreset to ImageFilter
Change-Id: I4c195a5eb6055c3bb43fed60e76751ed133ab725
Baligh Uddin [Wed, 13 Feb 2013 17:56:05 +0000 (09:56 -0800)]
Import translations. DO NOT MERGE
Change-Id: I73eaf3450a743ae918e3391efcceb4acd355b85d
Auto-generated-cl: translation import
nicolasroard [Wed, 13 Feb 2013 03:40:08 +0000 (19:40 -0800)]
Fix curves slowness
Change-Id: If25f3ce1c3da02daa90405987075b87ce676c84e
Bobby Georgescu [Fri, 1 Feb 2013 20:57:14 +0000 (12:57 -0800)]
Importer: Full-screen viewing, UI refinement, refactoring
Bug:
7990333
Bug:
8151814
Bug:
8037411
This CL adds or changes the following things:
- Full-screen image viewing and UI for switching modes
- Moved general functionality from MtpThumbnailTileView
to MtpImageView to allow for reuse in full-screen image
use-case
- MtpBitmapCache moved from ui to data package
- Orientation now respected when set in image metadata
- Miscellaneous UI consistency issues fixed
- Miscellaneous instability issues fixed
Change-Id: I5f188b763617b693e32fedc03273d711d604922a
nicolasroard [Wed, 13 Feb 2013 00:32:43 +0000 (16:32 -0800)]
Clean up red eye correction
Change-Id: I19a8006ed31767ae8e33388cc5b11b5c68d5ae2d
John Hoford [Wed, 13 Feb 2013 00:59:13 +0000 (16:59 -0800)]
fix ranges for various filters
Change-Id: I6790b06c5c4094c442ce19cb2ed7ddb6a4152f3a
Angus Kong [Wed, 13 Feb 2013 00:58:18 +0000 (00:58 +0000)]
Merge "Wait for the previous MosaicPreviewRenderer to end" into gb-ub-photos-bryce
nicolasroard [Wed, 13 Feb 2013 00:09:31 +0000 (00:09 +0000)]
Merge "Turn back on the state panel" into gb-ub-photos-bryce
John Hoford [Wed, 13 Feb 2013 00:07:43 +0000 (00:07 +0000)]
Merge "fix the draw clear bug" into gb-ub-photos-bryce
nicolasroard [Wed, 13 Feb 2013 00:06:15 +0000 (16:06 -0800)]
Turn back on the state panel
Change-Id: I22706078d4026ce4e24917c484a30a56de431983
Tenghui Zhu [Tue, 12 Feb 2013 22:59:54 +0000 (22:59 +0000)]
Merge "DO NOT MERGE: Don't call requestLayout from onLayout" into gb-ub-photos-bryce
Marco Nelissen [Wed, 6 Feb 2013 23:35:52 +0000 (15:35 -0800)]
DO NOT MERGE: Don't call requestLayout from onLayout
Doing a layout within a layout can lead to various problems, so it should
be avoided. There's some logging that warns of this, which got triggered
by CommonControllerOverlay.
I don't know what problem this code was originally trying to solve, but it
doesn't seem to be necessary anymore. The line in question was originally
introduced in change
209a9163d4e8cee0bfe162ae598ef40e6051479c, in Oct 2011.
Note: This has been checked into master, this is just cherry picking into
Bryce branch.
Change-Id: I7651304491a90e8d130f4a0a3b3de8e29c4d0116
John Hoford [Tue, 12 Feb 2013 21:42:19 +0000 (13:42 -0800)]
fix the draw clear bug
Change-Id: I1050c3e1ad1280480f35a03c9d29dc1cd44b515f
nicolasroard [Tue, 12 Feb 2013 21:41:30 +0000 (13:41 -0800)]
Add null check on the source URI
bug:
8181133
Change-Id: I1a7226db3ceb42a759f24c9b70f140a63a4294f0
nicolasroard [Tue, 12 Feb 2013 21:37:18 +0000 (21:37 +0000)]
Merge "Limit preview size" into gb-ub-photos-bryce
nicolasroard [Tue, 12 Feb 2013 21:31:15 +0000 (13:31 -0800)]
Limit preview size
Change-Id: I4b9b43abcb509407f9244a776d31cc96876a26cd
Baligh Uddin [Tue, 12 Feb 2013 21:33:55 +0000 (21:33 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Tue, 12 Feb 2013 21:33:08 +0000 (21:33 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Tue, 12 Feb 2013 20:42:24 +0000 (12:42 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4494f5cb2e1ed520a15a3a8052713559ee48e362
Auto-generated-cl: translation import
Baligh Uddin [Tue, 12 Feb 2013 20:41:38 +0000 (12:41 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie08f4a95d5662bfb313a851c12a2643997365eeb
Auto-generated-cl: translation import
nicolasroard [Tue, 12 Feb 2013 20:19:19 +0000 (12:19 -0800)]
Refactor FiltersManager
Change-Id: I4c42ddb90e65e90af873eb8dbe065f4fa3de69ef
OSDN Git Service
