OSDN Git Service
Angus Kong [Wed, 15 May 2013 00:18:23 +0000 (00:18 +0000)]
Merge "Improve bitmap load efficiency." into gb-ub-photos-carlsbad
Doris Liu [Tue, 14 May 2013 21:26:53 +0000 (14:26 -0700)]
am
26dbb20c: Merge "Pause face detection when review captured images" into gb-ub-photos-bryce
* commit '
26dbb20c15e27d22a14efd0a25ec4e50cf5084cc':
Pause face detection when review captured images
Doris Liu [Tue, 14 May 2013 21:25:22 +0000 (21:25 +0000)]
Merge "Pause face detection when review captured images" into gb-ub-photos-bryce
Angus Kong [Mon, 6 May 2013 17:42:28 +0000 (10:42 -0700)]
Improve bitmap load efficiency.
Call prepare before/recycle after using image data.
Change-Id: I3387c8ca68f57c3949fed2aaa3e26490e66c791a
Tim Murray [Tue, 14 May 2013 19:45:17 +0000 (12:45 -0700)]
am
33f2a880: Only link librsjni in unbundled branches.
* commit '
33f2a8800ff5228bf81a0fdc75c1289bae9a4d1c':
Only link librsjni in unbundled branches.
Doris Liu [Tue, 14 May 2013 18:31:19 +0000 (11:31 -0700)]
Pause face detection when review captured images
Bug:
8799508
Change-Id: I994299a3ad406bcee5e6699265cb0ab29612e62c
Ruben Brunk [Tue, 14 May 2013 07:58:37 +0000 (00:58 -0700)]
Fix FP rounding error for crop bounds.
Bug:
8874599
Change-Id: I94198e4dcdbb0afa1dd788130645855b33e8f30b
Tim Murray [Mon, 13 May 2013 22:47:58 +0000 (15:47 -0700)]
Only link librsjni in unbundled branches.
bug
8939828
Change-Id: I87d28185c6fb2b23852eb66487bf99d6111c3a7a
Angus Kong [Mon, 13 May 2013 20:42:21 +0000 (13:42 -0700)]
Dropping back FilmStripView codes.
Ongoing work that doesn't affect builds.
Change-Id: I83d81fa91e87d10787c3ce1d767bc41131341067
Doris Liu [Mon, 13 May 2013 18:34:03 +0000 (11:34 -0700)]
am
25d69c11: Merge "New count down beeps." into gb-ub-photos-bryce
* commit '
25d69c11831fabf8f4e474aaf17b05dd001979ce':
New count down beeps.
Doris Liu [Mon, 13 May 2013 18:32:20 +0000 (18:32 +0000)]
Merge "New count down beeps." into gb-ub-photos-bryce
Doris Liu [Mon, 13 May 2013 17:48:54 +0000 (10:48 -0700)]
New count down beeps.
Bug:
8872947
Change-Id: Ifc84daabba0a4e85e32fd3547303716ca5ed649a
Ruben Brunk [Fri, 10 May 2013 21:53:21 +0000 (14:53 -0700)]
Revert "Reinitialize all the filters after Crop is applied."
This reverts commit
1cfbaca7bef29b7d510c5e1de424e68cd8804022.
Victor Doba [Fri, 10 May 2013 12:23:04 +0000 (14:23 +0200)]
Reinitialize all the filters after Crop is applied.
Change-Id: I192918a3f28eac400e2e35f3b410dc8adc1a8ad4
George Mount [Fri, 10 May 2013 01:04:54 +0000 (18:04 -0700)]
am
ac94740c: Remove GL dependency on unused stencil buffers.
* commit '
ac94740cd673a016542d803c8600633c99b7427e':
Remove GL dependency on unused stencil buffers.
George Mount [Thu, 9 May 2013 20:30:39 +0000 (13:30 -0700)]
Remove GL dependency on unused stencil buffers.
Bug
8884435
Change-Id: I8e7f0563a4a901953e3e2b14e35457b4fefe2e34
ztenghui [Thu, 9 May 2013 16:27:04 +0000 (09:27 -0700)]
resolved conflicts for merge of
9a4fb2dc to gb-ub-photos-carlsbad
Change-Id: I90ffd8732cf34bb3dea7a849fc37fb1f3d82df39
ztenghui [Thu, 9 May 2013 16:18:09 +0000 (16:18 +0000)]
Merge "Fix the verbose log" into gb-ub-photos-bryce
George Mount [Thu, 9 May 2013 14:31:43 +0000 (14:31 +0000)]
Merge "Fix bitmap buffer size." into gb-ub-photos-carlsbad
Bart Sears [Thu, 9 May 2013 06:14:10 +0000 (23:14 -0700)]
am
b298ab63: Merge "Close menu in onPause" into gb-ub-photos-bryce
* commit '
b298ab636fec3894b9e702eaa0a6028ba03f49b1':
Close menu in onPause
Bart Sears [Thu, 9 May 2013 06:12:06 +0000 (06:12 +0000)]
Merge "Close menu in onPause" into gb-ub-photos-bryce
Michael Kolb [Thu, 9 May 2013 00:00:18 +0000 (17:00 -0700)]
am
e324a388: Merge "Add drop shadow to preview thumb" into gb-ub-photos-bryce
* commit '
e324a388ead1f291fe27eb6b4ce5f25b55a29a49':
Add drop shadow to preview thumb
Michael Kolb [Wed, 8 May 2013 23:58:45 +0000 (23:58 +0000)]
Merge "Add drop shadow to preview thumb" into gb-ub-photos-bryce
ztenghui [Wed, 8 May 2013 21:43:15 +0000 (14:43 -0700)]
Fix the verbose log
Now use adb shell log.tag.BasicRepresentation VERBOSE to turn on the logging.
bug:
8771541
Change-Id: Ib9e1e44dbbd4e46798226d8ab5dc7365e8a90e27
Michael Kolb [Wed, 8 May 2013 00:24:23 +0000 (17:24 -0700)]
Add drop shadow to preview thumb
Bug:
8826241
Also, remove animateSlide blocker, it caused frozen review
Change-Id: Ic8eb129ec236726550a26bc387967fe0c00473e9
Michael Kolb [Wed, 8 May 2013 23:05:04 +0000 (16:05 -0700)]
Close menu in onPause
Bug:
8722672
Change-Id: Ia3fac3ccc5db6cc1bb2a1dd32960ec6295735cfc
George Mount [Wed, 8 May 2013 22:51:48 +0000 (15:51 -0700)]
Fix bitmap buffer size.
The buffer size wasn't sufficient for some images.
Change-Id: Iba008c5bd4801183450f6076d73d19db531d5f3b
Doris Liu [Wed, 8 May 2013 22:21:44 +0000 (22:21 +0000)]
Merge "Remove new camera activity to avoid build breakage" into gb-ub-photos-carlsbad
Doris Liu [Wed, 8 May 2013 22:14:15 +0000 (15:14 -0700)]
Remove new camera activity to avoid build breakage
Change-Id: I56f0586ae196f57a0f55b8d835e6bc8fd27bdcfe
Sascha Haeberling [Wed, 8 May 2013 22:15:53 +0000 (15:15 -0700)]
am
58f32428: Merge "Reduce max size of bitmap returned by crop dialog." into gb-ub-photos-bryce
* commit '
58f32428768ff67520e0363de7a8c1929a4eac1f':
Reduce max size of bitmap returned by crop dialog.
Sascha Haeberling [Wed, 8 May 2013 22:13:44 +0000 (22:13 +0000)]
Merge "Reduce max size of bitmap returned by crop dialog." into gb-ub-photos-bryce
Michael Kolb [Wed, 8 May 2013 21:31:41 +0000 (14:31 -0700)]
am
c3fde4b4: Merge "Fix second level menu" into gb-ub-photos-bryce
* commit '
c3fde4b4032591fc34ce118860e53fe92c0b3706':
Fix second level menu
Michael Kolb [Wed, 8 May 2013 21:30:01 +0000 (21:30 +0000)]
Merge "Fix second level menu" into gb-ub-photos-bryce
Michael Kolb [Wed, 8 May 2013 18:14:35 +0000 (11:14 -0700)]
Fix second level menu
Bug:
8857098
Added Countdown timer and picture size items
Change-Id: I73f3a5b22ab708e216729ed77fbd60041d40147d
Sascha Haeberling [Wed, 8 May 2013 21:00:42 +0000 (14:00 -0700)]
Reduce max size of bitmap returned by crop dialog.
Bug:
8851336
Change-Id: Id69c46c44b22ce753900c52e34944428a38d02c6
Angus Kong [Wed, 8 May 2013 18:17:46 +0000 (11:17 -0700)]
am
188ad6ed: (-s ours) Merge "DO NOT MERGE Further assets clean up." into gb-ub-photos-bryce
* commit '
188ad6eda97b4e05853d582198722e70f9e03705':
DO NOT MERGE Further assets clean up.
Angus Kong [Wed, 8 May 2013 18:09:44 +0000 (18:09 +0000)]
Merge "DO NOT MERGE Further assets clean up." into gb-ub-photos-bryce
Bobby Georgescu [Wed, 8 May 2013 17:50:38 +0000 (10:50 -0700)]
am
9fcabfb5: Merge "Fix memory leak in SparseArrayBitmapPool" into gb-ub-photos-bryce
* commit '
9fcabfb535f9e094f77cbdba5305d04209adc0b3':
Fix memory leak in SparseArrayBitmapPool
Angus Kong [Mon, 6 May 2013 20:40:52 +0000 (13:40 -0700)]
DO NOT MERGE Further assets clean up.
Remove unused assets and layouts.
bug:
8656481
Change-Id: I320bc5fb8e5c4203520dafce517225244f52e8f5
Bobby Georgescu [Wed, 8 May 2013 17:49:16 +0000 (17:49 +0000)]
Merge "Fix memory leak in SparseArrayBitmapPool" into gb-ub-photos-bryce
Michael Kolb [Wed, 8 May 2013 00:44:59 +0000 (17:44 -0700)]
Fix build
Add required method to NewVideoModule
Change-Id: Ia04b07b8064f6fc1af73b1550bee88b14fe79b6b
Bobby Georgescu [Tue, 7 May 2013 23:41:04 +0000 (16:41 -0700)]
Fix memory leak in SparseArrayBitmapPool
Bug:
8857493
Change-Id: Ie5fae457aea91973caa07f8955b1364df573821b
Michael Kolb [Wed, 8 May 2013 00:36:04 +0000 (00:36 +0000)]
Merge "Fix build" into gb-ub-photos-carlsbad
Michael Kolb [Wed, 8 May 2013 00:32:01 +0000 (17:32 -0700)]
Fix build
Temporarily remove the old indicator code until
we update to the new UI
Change-Id: I4c706c5f147dffe085bd2ab1da30cc9a469ef2ce
Doris Liu [Wed, 8 May 2013 00:29:30 +0000 (17:29 -0700)]
am
b281a646: Merge "Fix video capture intent overlapping buttons" into gb-ub-photos-bryce
* commit '
b281a6463f22c75c5b4a7a7079bdb55e484c2d07':
Fix video capture intent overlapping buttons
Doris Liu [Wed, 8 May 2013 00:27:28 +0000 (00:27 +0000)]
Merge "Fix video capture intent overlapping buttons" into gb-ub-photos-bryce
Michael Kolb [Wed, 8 May 2013 00:25:23 +0000 (17:25 -0700)]
am
0a830ce4: Merge "Add animation to slice selection" into gb-ub-photos-bryce
* commit '
0a830ce4b5424ff9919b9156eb0635e671a67a81':
Add animation to slice selection
Michael Kolb [Wed, 8 May 2013 00:23:40 +0000 (00:23 +0000)]
Merge "Add animation to slice selection" into gb-ub-photos-bryce
Michael Kolb [Wed, 8 May 2013 00:22:14 +0000 (17:22 -0700)]
am
9a26f823: Merge "Remove unused assets" into gb-ub-photos-bryce
* commit '
9a26f823b2894d3decf47b28ee10d08932b09adf':
Remove unused assets
Michael Kolb [Wed, 8 May 2013 00:20:44 +0000 (00:20 +0000)]
Merge "Remove unused assets" into gb-ub-photos-bryce
Michael Kolb [Tue, 7 May 2013 22:58:47 +0000 (15:58 -0700)]
Remove unused assets
Bug:
8656481
Change-Id: I8c598a209fe910c1bf658ffffdc1d197dedb0018
Doris Liu [Tue, 7 May 2013 20:48:10 +0000 (13:48 -0700)]
Fix video capture intent overlapping buttons
Bug:
8839010
Change-Id: I8ee9bd8117a4a5e4dafe71775bb5563cef2ccdf0
Sascha Haeberling [Tue, 7 May 2013 22:09:54 +0000 (15:09 -0700)]
am
6febbfc6: Merge "Avoid rounding errors from cropping uncropped images." into gb-ub-photos-bryce
* commit '
6febbfc6c9c2d645f22fb200574fe14fa1201046':
Avoid rounding errors from cropping uncropped images.
Sascha Haeberling [Tue, 7 May 2013 22:08:31 +0000 (22:08 +0000)]
Merge "Avoid rounding errors from cropping uncropped images." into gb-ub-photos-bryce
Michael Kolb [Tue, 7 May 2013 20:53:19 +0000 (13:53 -0700)]
Add animation to slice selection
Bug:
8826233
Change-Id: Ibe41c38e048546b66ea9aa56a664ba80de2fbd4c
Michael Kolb [Tue, 7 May 2013 20:26:39 +0000 (13:26 -0700)]
am
48ce39b8: Fix review button placement
* commit '
48ce39b881f60fde8c9a1536199980c31d38188c':
Fix review button placement
Michael Kolb [Mon, 6 May 2013 23:14:09 +0000 (16:14 -0700)]
Fix review button placement
Bug:
8833788
Change-Id: I7fc8912ea4ffcd36a08e4cbb2705eec79c014da1
Sascha Haeberling [Tue, 7 May 2013 18:04:08 +0000 (11:04 -0700)]
Avoid rounding errors from cropping uncropped images.
Bug:
8736111
Also don't treat "none" as a non-modifying filter.
Change-Id: I6478c557dbb68d7eecabb29f062285b83de05cda
Doris Liu [Tue, 7 May 2013 17:08:13 +0000 (10:08 -0700)]
am
ed1224f1: Resize children to avoid laying out outside parent
* commit '
ed1224f1b98a1a534f5a3b18739465ed6114529a':
Resize children to avoid laying out outside parent
Doris Liu [Tue, 7 May 2013 01:30:30 +0000 (18:30 -0700)]
Resize children to avoid laying out outside parent
Bug:
8838983
Change-Id: Idc8ec7b96dd13e9c99dbc8b4710aa9d768ef198e
Michael Kolb [Mon, 6 May 2013 22:16:09 +0000 (15:16 -0700)]
Quick and Dirty build fix
Change-Id: I4266fa63145a95d878a9fc0effab937ec0859bab
George Mount [Mon, 6 May 2013 20:41:32 +0000 (13:41 -0700)]
am
08d2c513: Merge "Fix black background on save progress indicator." into gb-ub-photos-bryce
* commit '
08d2c51392978383699aedcf63d24e5122b3b7a5':
Fix black background on save progress indicator.
George Mount [Mon, 6 May 2013 20:40:25 +0000 (20:40 +0000)]
Merge "Fix black background on save progress indicator." into gb-ub-photos-bryce
Michael Kolb [Mon, 6 May 2013 20:22:25 +0000 (13:22 -0700)]
am
ea75136a: Merge "Fix lockscreen camera widget layout" into gb-ub-photos-bryce
* commit '
ea75136ae4abf55070644e5a048cf44323517c43':
Fix lockscreen camera widget layout
Michael Kolb [Mon, 6 May 2013 20:21:19 +0000 (20:21 +0000)]
Merge "Fix lockscreen camera widget layout" into gb-ub-photos-bryce
Michael Kolb [Mon, 6 May 2013 19:41:34 +0000 (12:41 -0700)]
Fix lockscreen camera widget layout
Bug:
8832891
Change-Id: I4658de74e7cc9d4ba80a561b3e71ae6339d4f236
Doris Liu [Mon, 6 May 2013 17:24:54 +0000 (10:24 -0700)]
am
3a50eb36: Merge "Restrict checking for device flip" into gb-ub-photos-bryce
* commit '
3a50eb36cf760ddb2a11c72b247f96611f3bf112':
Restrict checking for device flip
Doris Liu [Mon, 6 May 2013 17:23:09 +0000 (17:23 +0000)]
Merge "Restrict checking for device flip" into gb-ub-photos-bryce
George Mount [Mon, 6 May 2013 17:06:53 +0000 (10:06 -0700)]
Fix black background on save progress indicator.
Bug
8802092
Change-Id: I40075ba6af69895a88973d906436c6e235c733fa
Michael Kolb [Mon, 6 May 2013 16:59:46 +0000 (09:59 -0700)]
am
1e3bc7d4: Set correct label text in tap mode
* commit '
1e3bc7d4873dbc0778d5e12333c73c00bcd6512f':
Set correct label text in tap mode
Michael Kolb [Mon, 6 May 2013 15:49:10 +0000 (08:49 -0700)]
Set correct label text in tap mode
Bug:
8826229
Change-Id: I10b06ac04314beaf52fc8b29c9b10693eb11311b
Baligh Uddin [Sat, 4 May 2013 23:18:08 +0000 (16:18 -0700)]
am
49a24225: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
49a242256761f990001c3f81c54e4897f58ebc36':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 4 May 2013 23:16:10 +0000 (23:16 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Doris Liu [Fri, 3 May 2013 21:33:57 +0000 (14:33 -0700)]
Restrict checking for device flip
Bug:
8714114
Change-Id: Ic12627fe5b7512c8d5739ed801130d52f33407cc
Baligh Uddin [Fri, 3 May 2013 20:36:23 +0000 (13:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id960caeb9b28300e0f6ee817f0bf1ea783e0f3fb
Auto-generated-cl: translation import
Doris Liu [Fri, 3 May 2013 20:02:56 +0000 (13:02 -0700)]
am
cd0fb7af: Fix NPE caused by insets never being set
* commit '
cd0fb7af20f855e1190122467c5650e46bfe820c':
Fix NPE caused by insets never being set
Doris Liu [Fri, 3 May 2013 18:44:45 +0000 (11:44 -0700)]
Fix NPE caused by insets never being set
Bug:
8804054
Change-Id: Ie0f2dec9681977621ba95650aa714b0733a30858
Doris Liu [Fri, 3 May 2013 18:11:38 +0000 (11:11 -0700)]
am
4b9dea3a: Merge "Anchor camera controls when flipping device" into gb-ub-photos-bryce
* commit '
4b9dea3a1496271b73a7b5a4f62ad3bb3b5cdadc':
Anchor camera controls when flipping device
Doris Liu [Fri, 3 May 2013 18:09:49 +0000 (18:09 +0000)]
Merge "Anchor camera controls when flipping device" into gb-ub-photos-bryce
Angus Kong [Fri, 3 May 2013 17:42:30 +0000 (10:42 -0700)]
am
b0a1e9fe: Don\'t show settings when popup is shown.
* commit '
b0a1e9fe925be1745bfb224867ee53562e027145':
Don't show settings when popup is shown.
Doris Liu [Fri, 3 May 2013 17:26:01 +0000 (10:26 -0700)]
Anchor camera controls when flipping device
Also adjusted margins for camera root view to avoid covering undo bar
Bug:
8758513
Bug:
8714114
Change-Id: If27f55a40f95402923d59d162db0c7cc29eabba4
Angus Kong [Fri, 3 May 2013 00:45:01 +0000 (17:45 -0700)]
Don't show settings when popup is shown.
bug:
8771618
Change-Id: Idec1cbacec1ae958c7295facadc6653b840dbe50
George Mount [Thu, 2 May 2013 17:20:58 +0000 (10:20 -0700)]
am
6d7a2d3e: Merge changes Ia9b2ced0,I7cccfffc into gb-ub-photos-bryce
* commit '
6d7a2d3e32a27de28336176f856a7439b36252bd':
Class to simplify use of GalleryBitmapPool for decoding Bitmaps.
Allow prefetch for cache, reducing priority for prefetched images.
George Mount [Thu, 2 May 2013 17:19:24 +0000 (17:19 +0000)]
Merge changes Ia9b2ced0,I7cccfffc into gb-ub-photos-bryce
* changes:
Class to simplify use of GalleryBitmapPool for decoding Bitmaps.
Allow prefetch for cache, reducing priority for prefetched images.
George Mount [Tue, 30 Apr 2013 18:53:46 +0000 (11:53 -0700)]
Class to simplify use of GalleryBitmapPool for decoding Bitmaps.
Bug
8446191
Required for I86cfa59f448daa4e7b9fd7ea9ada2d69357e1f63
Change-Id: Ia9b2ced0bfd9c9c1b969c77bc89eaa0fa87687bb
George Mount [Wed, 1 May 2013 23:56:32 +0000 (16:56 -0700)]
Allow prefetch for cache, reducing priority for prefetched images.
Bug
8446191
Required for I86cfa59f448daa4e7b9fd7ea9ada2d69357e1f63
Change-Id: I7cccfffc539988d26fc751e16726b05fb2ba21bd
nicolasroard [Thu, 2 May 2013 06:36:34 +0000 (23:36 -0700)]
am
f469a168: Fix flashing (remove clipping)
* commit '
f469a1689a9563f3c5bb68f46a5d9cd152d67053':
Fix flashing (remove clipping)
nicolasroard [Thu, 2 May 2013 03:48:56 +0000 (20:48 -0700)]
Fix flashing (remove clipping)
bug:
8747333
Change-Id: Ie1e7f1a58bf195b1f427b75ee9a1390e29b3ba2a
nicolasroard [Thu, 2 May 2013 03:30:04 +0000 (20:30 -0700)]
nicolasroard [Wed, 1 May 2013 03:50:03 +0000 (20:50 -0700)]
Fix UI
bug:
8664728
Change-Id: I90b903e8935b2b6c0dbd6590cff36865644c49b4
Bobby Georgescu [Thu, 2 May 2013 00:49:38 +0000 (17:49 -0700)]
am
5a352be0: Increase selection limit
* commit '
5a352be0df79b03c942eb67a799ddb3aaa1a26a2':
Increase selection limit
Bobby Georgescu [Thu, 2 May 2013 00:27:19 +0000 (17:27 -0700)]
Increase selection limit
Bug:
8606565
Bug:
8721237
Bug:
8752803
Change-Id: I578536389146fb4d8735c8171ec346ebe49de729
Ruben Brunk [Wed, 1 May 2013 23:08:26 +0000 (23:08 +0000)]
Merge "G+ activity xform stack and pipeline cleanup." into gb-ub-photos-carlsbad
John Hoford [Wed, 1 May 2013 22:50:30 +0000 (15:50 -0700)]
fix crash due to no ImageFilterDraw
Change-Id: I0c8bfaa7d162f5c1a49f05d853f4700322fe5901
Michael Kolb [Wed, 1 May 2013 21:50:04 +0000 (14:50 -0700)]
am
fb936141: Merge "Fix layout and preview for tablets" into gb-ub-photos-bryce
* commit '
fb9361419abfac7f893674bb6f4d1b1f8ab1f677':
Fix layout and preview for tablets
Michael Kolb [Wed, 1 May 2013 21:48:29 +0000 (21:48 +0000)]
Merge "Fix layout and preview for tablets" into gb-ub-photos-bryce
Michael Kolb [Wed, 1 May 2013 20:28:24 +0000 (13:28 -0700)]
Fix layout and preview for tablets
Bug:
8253060
Make controls full screen, and layout according to required size
Change-Id: I725547041264457d85d73d470d25caa5cb2cf783
Michael Kolb [Wed, 1 May 2013 20:59:37 +0000 (13:59 -0700)]
Fix new activity menus
Change-Id: If8ace52a46284b41169532b69bdf77305b9610d9
Baligh Uddin [Wed, 1 May 2013 20:50:48 +0000 (13:50 -0700)]
am
32aa7da8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
32aa7da8dc533a5add4ca7c94a69201ff5ed9a90':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 1 May 2013 20:48:43 +0000 (20:48 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
OSDN Git Service
