OSDN Git Service
George Mount [Tue, 11 Dec 2012 15:43:51 +0000 (07:43 -0800)]
Move LightCycle to render directly to GLRootView.
Change-Id: I298ef7127d86ca37067ffa953640aad1747961f9
Ruben Brunk [Thu, 13 Dec 2012 01:07:00 +0000 (17:07 -0800)]
Removed unused photoeditor resources.
Change-Id: I415918ba5ae8a6c1a4521ec4dcfc1fab337bd3dd
Ruben Brunk [Tue, 11 Dec 2012 02:50:10 +0000 (18:50 -0800)]
Added sobel filter for edge function.
Change-Id: I4d59a96585f4902cd01d26ff68c777b542041132
Ruben Brunk [Tue, 11 Dec 2012 03:40:27 +0000 (19:40 -0800)]
Added photonegative filter.
Change-Id: I73594573b26873cb3fda49aca6d40761dec3707f
John Reck [Wed, 12 Dec 2012 21:56:05 +0000 (13:56 -0800)]
Merge "remove actionbar sherlock" into gb-ub-photos-bryce
John Reck [Wed, 12 Dec 2012 21:43:43 +0000 (13:43 -0800)]
remove actionbar sherlock
Change-Id: Idb9b63f625fd4f0b78d947421ec5b098d8e5dfd5
Baligh Uddin [Wed, 12 Dec 2012 18:12:14 +0000 (10:12 -0800)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Wed, 12 Dec 2012 17:08:35 +0000 (09:08 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia0383aea5a4bc841b70b5fe6d769d7192731aab1
Auto-generated-cl: translation import
Baligh Uddin [Wed, 12 Dec 2012 17:07:28 +0000 (09:07 -0800)]
Import translations. DO NOT MERGE
Change-Id: I85840e6082a576dae720ab53920f2031d6d9a703
Auto-generated-cl: translation import
Your Name [Wed, 12 Dec 2012 01:11:52 +0000 (17:11 -0800)]
Merge "Remove LongSpareArray + some cleanups" into gb-ub-photos-bryce
John Reck [Wed, 12 Dec 2012 00:31:41 +0000 (16:31 -0800)]
Merge "GL packaging refactor" into gb-ub-photos-bryce
John Reck [Tue, 11 Dec 2012 22:42:27 +0000 (14:42 -0800)]
GL packaging refactor
Change-Id: I1d7a95c4f0b91a5ba59030d57cf6865c11b497aa
nicolasroard [Tue, 11 Dec 2012 21:58:04 +0000 (13:58 -0800)]
Cleanup filters creation in presets
bug:
7688780
Change-Id: If330d02e3c0f43cffbce5327b26f0af44d2416c8
Your Name [Tue, 4 Dec 2012 18:01:41 +0000 (10:01 -0800)]
Remove LongSpareArray + some cleanups
Change-Id: If5bb44ebca70bd735e426aeb3d9aac2d4bac646e
Baligh Uddin [Tue, 11 Dec 2012 01:26:11 +0000 (17:26 -0800)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Tue, 11 Dec 2012 01:22:27 +0000 (17:22 -0800)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
John Reck [Mon, 10 Dec 2012 22:16:09 +0000 (14:16 -0800)]
am
695e1aa0: Force a layout pass if the display rotation changes
* commit '
695e1aa059cbc2cb2988f6beb0fee8ff7952b229':
Force a layout pass if the display rotation changes
John Reck [Mon, 10 Dec 2012 21:25:49 +0000 (13:25 -0800)]
Force a layout pass if the display rotation changes
Bug:
7687209
DisplayRotation is used to map camera orientation to the display and is
updated in layoutContentPane(). However, in the case of a 180 rotate
framework doesn't send an onConfigurationChanged nor does the layout
dimensions change, thus layoutContentPane doesn't fire and we don't
update mDisplayRotation, resulting in an upside-down preview. To handle
this, check each draw whether or not the display rotation has changed
and if it has force a layout pass.
Change-Id: I610ea235d1bf7de2743f4cdb8e42ba1ddcb41404
Baligh Uddin [Mon, 10 Dec 2012 16:12:51 +0000 (08:12 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8cb5c317cfa65c82435c9495c6fa0ce81a2f37ef
Auto-generated-cl: translation import
Baligh Uddin [Mon, 10 Dec 2012 16:11:54 +0000 (08:11 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia06955ba6bbb9eb0a19293a7fdf15128c4e24640
Auto-generated-cl: translation import
nicolasroard [Sat, 8 Dec 2012 00:15:10 +0000 (16:15 -0800)]
More refactoring...
Simplify management of filters in PanelController
bug:
7688780
Change-Id: I0d07711cb2be127f064d476c6e98f4363b69b06c
nicolasroard [Fri, 7 Dec 2012 21:51:20 +0000 (13:51 -0800)]
Merge "More refactoring. Makes it easy to specify how the button should look like (overlay img or not)." into gb-ub-photos-bryce
Doris Liu [Fri, 7 Dec 2012 20:41:39 +0000 (12:41 -0800)]
Decode screenshots when they show 0x0 dimensions
Bug:
7470758
Change-Id: If4012899e120ad68cdc8ca12bf6f8de8c5c96019
nicolasroard [Fri, 7 Dec 2012 20:54:02 +0000 (12:54 -0800)]
More refactoring. Makes it easy to specify
how the button should look like (overlay img or not).
bug:
7688780
Change-Id: If883c6886ade409dac7d72c87a514bd3fcd3ad7f
nicolasroard [Fri, 7 Dec 2012 01:55:34 +0000 (17:55 -0800)]
Refactor filters to simplify their creation/addition
Bug:
7688780
Change-Id: I9e1bb860dc9150bed4a255118654f2ca7f1ec3f0
Ruben Brunk [Thu, 6 Dec 2012 23:26:39 +0000 (15:26 -0800)]
Merge "Removed extra layout resources from old photoeditor." into gb-ub-photos-bryce
Ruben Brunk [Thu, 6 Dec 2012 23:13:20 +0000 (15:13 -0800)]
Removed extra layout resources from old photoeditor.
Bug:
7659953
Change-Id: I86fa9204498a36bb8c2ba190372efae95af0145a
Ruben Brunk [Thu, 6 Dec 2012 22:54:38 +0000 (14:54 -0800)]
Merge "Improves XML language descriptions." into gb-ub-photos-bryce
Ruben Brunk [Thu, 6 Dec 2012 22:48:25 +0000 (14:48 -0800)]
Improves XML language descriptions.
Bug:
7458383
Bug:
7459118
Change-Id: I91fd7297e4530401c0315ae4acbf7b6e425dca2b
Ruben Brunk [Thu, 6 Dec 2012 21:44:49 +0000 (13:44 -0800)]
Fixed Autocolor not getting saved.
Bug:
7541348
Change-Id: Ie62aa8abec78441ae0e42cb4069ddbd7d2f3e199
Ruben Brunk [Thu, 6 Dec 2012 06:07:12 +0000 (22:07 -0800)]
Removed old crop.
Bug:
7441237
Change-Id: I29801f798a1d1ad3af81a82950edbb8a72ccae82
Ruben Brunk [Wed, 28 Nov 2012 22:00:30 +0000 (14:00 -0800)]
Added support for Crop extras. Wallpaper & Widget use editor crop.
Bug:
7561976
Bug:
7441237
Change-Id: I0d6644171177650568ed911fc63c0c7e104f8d8c
nicolasroard [Wed, 24 Oct 2012 00:22:54 +0000 (17:22 -0700)]
Implements Redeye fix
bug:
7223838
Change-Id: I21d8d2c8f858fca2e86d18b927cbf6878eb64263
George Mount [Wed, 5 Dec 2012 19:26:57 +0000 (11:26 -0800)]
Merge "Add GLES20 canvas implementation." into gb-ub-photos-bryce
George Mount [Fri, 16 Nov 2012 23:44:26 +0000 (15:44 -0800)]
Add GLES20 canvas implementation.
Change-Id: I5680909f31dc097599d0e063aa1f6daba834d3e2
Bobby Georgescu [Wed, 5 Dec 2012 17:44:45 +0000 (09:44 -0800)]
am
db99a10b: Fix NPE in PhotoPage
* commit '
db99a10b6ac9296d612db8ba51e37f141fee4170':
Fix NPE in PhotoPage
Bobby Georgescu [Wed, 5 Dec 2012 07:50:02 +0000 (23:50 -0800)]
Fix NPE in PhotoPage
Bug:
7673141
Change-Id: I264f28d127f47e5f4f8c6a7c2df1c021401d03f2
nicolasroard [Wed, 5 Dec 2012 03:35:44 +0000 (19:35 -0800)]
am
870e62ac: Handle the case where the orientation column is not here...
* commit '
870e62ac801064f83bffc9095cbaee5fe46bdd80':
Handle the case where the orientation column is not here...
nicolasroard [Wed, 5 Dec 2012 00:22:40 +0000 (16:22 -0800)]
Handle the case where the orientation column is not here...
bug:
7537610
Change-Id: I4f64891a789358c20206aea3033fd17514199d62
Michael Kolb [Tue, 4 Dec 2012 23:14:52 +0000 (15:14 -0800)]
am
7a537732: Merge "Prevent Camera UI in Gallery" into gb-ub-photos-arches
* commit '
7a5377322dcebdaad98df9a31cadc7ff0f464d8a':
Prevent Camera UI in Gallery
Michael Kolb [Tue, 4 Dec 2012 23:12:46 +0000 (15:12 -0800)]
Merge "Prevent Camera UI in Gallery" into gb-ub-photos-arches
Michael Kolb [Tue, 4 Dec 2012 22:46:23 +0000 (14:46 -0800)]
Prevent Camera UI in Gallery
Bug:
7668856
At startup, the PhotoView wouldn't execute the onFullScreenChanged
callback, so the Camera UI believed it was in Camera.
Change-Id: I6794c2a5a4eb06d39161a681b7a0afc27d5e4b3f
nicolasroard [Tue, 4 Dec 2012 22:41:39 +0000 (14:41 -0800)]
am
c6fe9f7d: Remove unneeded border asset
* commit '
c6fe9f7de5da7e5ae5bbf4d95933f9f96d018644':
Remove unneeded border asset
nicolasroard [Tue, 4 Dec 2012 22:11:09 +0000 (14:11 -0800)]
Remove unneeded border asset
bug:
7668120
Change-Id: Ib258fe12655bd33c08257975cac995bc54c7abb2
Baligh Uddin [Tue, 4 Dec 2012 16:30:12 +0000 (08:30 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic8d70a5bbac2e2c2b1e6fea8e1479ca10f7753ad
Auto-generated-cl: translation import
Ruben Brunk [Tue, 4 Dec 2012 01:01:31 +0000 (17:01 -0800)]
Merge "Fix call to Toast outside UI thread." into gb-ub-photos-bryce
Bobby Georgescu [Tue, 4 Dec 2012 00:36:12 +0000 (16:36 -0800)]
Merge "Move MenuExecutor operations into Service" into gb-ub-photos-bryce
Bobby Georgescu [Mon, 3 Dec 2012 21:56:00 +0000 (13:56 -0800)]
Move MenuExecutor operations into Service
Bug:
6680729
Change-Id: I538bb0a8783f7c1ff467ba8d8eb0deefdc0b6ea2
Your Name [Tue, 4 Dec 2012 00:15:37 +0000 (16:15 -0800)]
am
04df59eb: Merge "Change themes" into gb-ub-photos-arches
* commit '
04df59eb082189500d360fffb95ef541073d6fe6':
Change themes
Your Name [Tue, 4 Dec 2012 00:14:03 +0000 (16:14 -0800)]
Merge "Change themes" into gb-ub-photos-arches
Your Name [Mon, 3 Dec 2012 22:14:19 +0000 (14:14 -0800)]
Change themes
Bug:
7587841
Change-Id: Ie283c23015ae94ba6eeb69ba55a0523899718d4e
Ruben Brunk [Mon, 3 Dec 2012 20:18:56 +0000 (12:18 -0800)]
Fix call to Toast outside UI thread.
Bug:
7412281
Change-Id: I976ccd28f696a65a1159b6a092b8aa2f2a2d0e08
Baligh Uddin [Mon, 3 Dec 2012 16:50:49 +0000 (08:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: I176680225a4dafb752fb5b6e901245f9e523ffb4
Auto-generated-cl: translation import
George Mount [Fri, 30 Nov 2012 23:08:05 +0000 (15:08 -0800)]
Merge "Separate GL calls into GLCanvas in preparation for adding GLES2." into gb-ub-photos-bryce
Bobby Georgescu [Fri, 30 Nov 2012 20:25:01 +0000 (12:25 -0800)]
Improve fling to delete gesture handling
Bug:
7419862
Bug:
7301456
Allows flings to start anywhere within the width bounds
of the image, even if outside the height bounds, making
deletion of panoramas more feasible, and gestures are
filtered by length to be able to make flinging easier
while still avoiding accidental input.
Change-Id: Iac933bfee85865a718ed47eadfed76683eb771d2
Ruben Brunk [Fri, 30 Nov 2012 17:11:16 +0000 (09:11 -0800)]
Merge "Refactoring crop, made unconstrained." into gb-ub-photos-bryce
Ruben Brunk [Wed, 31 Oct 2012 18:44:15 +0000 (11:44 -0700)]
Refactoring crop, made unconstrained.
Bug
7401363
Change-Id: I3ef10c43fd2a01216d6d6c8cc77b31ddef3fdd9b
Baligh Uddin [Thu, 29 Nov 2012 15:03:02 +0000 (07:03 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4d0394e913b49becdaf6351a82e65968fe244ee1
Auto-generated-cl: translation import
nicolasroard [Thu, 29 Nov 2012 08:33:49 +0000 (00:33 -0800)]
am
599393ec: (re-)add vertical/horizontal lines when moving Curves Align histogram with Curves grid.
* commit '
599393ecad6803161d5e901ef625e34cfe088009':
(re-)add vertical/horizontal lines when moving Curves Align histogram with Curves grid.
nicolasroard [Thu, 29 Nov 2012 08:01:59 +0000 (00:01 -0800)]
(re-)add vertical/horizontal lines when moving Curves
Align histogram with Curves grid.
bug:
7361722
Change-Id: I327f3fb0ba844cc09f8b899e59f74d368478d30a
Nicolas Roard [Thu, 29 Nov 2012 08:06:34 +0000 (00:06 -0800)]
am
65025459: Merge "Added dashed diagonal for crop." into gb-ub-photos-arches
* commit '
6502545991948769bc9ca725dafb9899c2635a01':
Added dashed diagonal for crop.
Nicolas Roard [Thu, 29 Nov 2012 08:04:49 +0000 (00:04 -0800)]
Merge "Added dashed diagonal for crop." into gb-ub-photos-arches
Ruben Brunk [Thu, 29 Nov 2012 05:52:46 +0000 (21:52 -0800)]
Added dashed diagonal for crop.
Bug:
7634466
Change-Id: I14c778766d4b00495b2f5f6fa5f87f4877f76381
nicolasroard [Thu, 29 Nov 2012 06:29:13 +0000 (22:29 -0800)]
am
39d46790: Fix transparency issue under the spinner.
* commit '
39d4679070caf308f04542e414fc2e3c34f9cefa':
Fix transparency issue under the spinner.
nicolasroard [Thu, 29 Nov 2012 06:24:24 +0000 (22:24 -0800)]
Fix transparency issue under the spinner.
bug:
7634701
Change-Id: I907ebbb373958350b1b17dc86723e430441a01dd
nicolasroard [Thu, 29 Nov 2012 06:19:01 +0000 (22:19 -0800)]
am
0a624bb8: Fix potential crash (regression introduced with fix for
7406402)
* commit '
0a624bb8db70f1e71ca511756b886c68f32fedbe':
Fix potential crash (regression introduced with fix for
7406402)
nicolasroard [Thu, 29 Nov 2012 06:14:20 +0000 (22:14 -0800)]
Fix potential crash
(regression introduced with fix for
7406402)
bug:
7406402
Change-Id: I7ba92b4cb4fe2976583eba54a5bd25a29eae9d5c
nicolasroard [Thu, 29 Nov 2012 06:00:50 +0000 (22:00 -0800)]
am
6d867ce0: Set crop ratio to unconstrained by default.
* commit '
6d867ce03ea96495d531d7e3f35a21b5aab257ef':
Set crop ratio to unconstrained by default.
nicolasroard [Thu, 29 Nov 2012 05:50:46 +0000 (21:50 -0800)]
Set crop ratio to unconstrained by default.
bug:
7634466
Change-Id: I4b0e82ca77ab19527293334cc96e7b80f2d75535
nicolasroard [Thu, 29 Nov 2012 05:27:27 +0000 (21:27 -0800)]
am
205d0cdf: Fix overdraw the correct way...
* commit '
205d0cdf0590bc1156a1d7fff1d0811d142de4a6':
Fix overdraw the correct way...
nicolasroard [Thu, 29 Nov 2012 05:20:37 +0000 (21:20 -0800)]
Fix overdraw the correct way...
bug:
7634701
Change-Id: Ifa7061dac35e948120c1a481c40bcf107f7ee6e1
nicolasroard [Thu, 29 Nov 2012 05:02:15 +0000 (21:02 -0800)]
am
6e9123a6: Merge "Fix flashing in geometry panel" into gb-ub-photos-arches
* commit '
6e9123a658d4ed0dcb80dd376c676f043e2f4baa':
Fix flashing in geometry panel
nicolasroard [Thu, 29 Nov 2012 05:00:30 +0000 (21:00 -0800)]
Merge "Fix flashing in geometry panel" into gb-ub-photos-arches
nicolasroard [Thu, 29 Nov 2012 05:00:00 +0000 (21:00 -0800)]
am
68e4ae64: Merge "Fix overdraw in FilterShow activity" into gb-ub-photos-arches
* commit '
68e4ae64380e2c9843faaec63b98ba51479c0f11':
Fix overdraw in FilterShow activity
nicolasroard [Thu, 29 Nov 2012 04:58:35 +0000 (20:58 -0800)]
Merge "Fix overdraw in FilterShow activity" into gb-ub-photos-arches
nicolasroard [Thu, 29 Nov 2012 04:57:50 +0000 (20:57 -0800)]
am
3507b925: Merge "Add new borders assets" into gb-ub-photos-arches
* commit '
3507b925ce1edb2563c076d2d9f01bfadf9f61e5':
Add new borders assets
nicolasroard [Thu, 29 Nov 2012 04:56:31 +0000 (20:56 -0800)]
Merge "Add new borders assets" into gb-ub-photos-arches
nicolasroard [Thu, 29 Nov 2012 03:31:59 +0000 (19:31 -0800)]
Add new borders assets
bug:
7386268
Change-Id: I026c36bdad32ae6a34ce1d5ec83abff319296d30
nicolasroard [Thu, 29 Nov 2012 04:54:39 +0000 (20:54 -0800)]
am
cd84d676: Fix history panel overlap
* commit '
cd84d67629075795d4c5c28d980f77ff8d75c593':
Fix history panel overlap
nicolasroard [Thu, 29 Nov 2012 03:59:51 +0000 (19:59 -0800)]
Fix history panel overlap
bug:
7545507
Change-Id: I06236f3025191896c851af1d84dc48a4dde18b1d
nicolasroard [Thu, 29 Nov 2012 03:11:42 +0000 (19:11 -0800)]
Fix overdraw in FilterShow activity
bug:
7634701
Change-Id: I2da3e3fdb1ef853fa1a0340a1697e5a013ee87f2
nicolasroard [Thu, 29 Nov 2012 01:46:32 +0000 (17:46 -0800)]
Fix flashing in geometry panel
bug:
7406402
Change-Id: If2c6156349b90dfc57c56284ad6d821731e48e1a
nicolasroard [Thu, 29 Nov 2012 01:23:04 +0000 (17:23 -0800)]
am
987bc8aa: Fix wrong colors in Curves
* commit '
987bc8aaafa55c45451937b27d94c1d602de4d68':
Fix wrong colors in Curves
nicolasroard [Thu, 29 Nov 2012 01:19:55 +0000 (17:19 -0800)]
am
d24fdf6a: Merge "Fix moving points in the Curves editor" into gb-ub-photos-arches
* commit '
d24fdf6ad148ffeb34a721d90e46d038f5a7b0da':
Fix moving points in the Curves editor
nicolasroard [Thu, 29 Nov 2012 01:09:59 +0000 (17:09 -0800)]
Fix wrong colors in Curves
bug:
7633765
Change-Id: Ie6d0c175af6a1ade8f225107408ad03e73a289d3
nicolasroard [Thu, 29 Nov 2012 01:17:35 +0000 (17:17 -0800)]
Merge "Fix moving points in the Curves editor" into gb-ub-photos-arches
Ruben Brunk [Thu, 29 Nov 2012 01:05:44 +0000 (17:05 -0800)]
am
7a36d427: Merge "Added locking to ImageLoader." into gb-ub-photos-arches
* commit '
7a36d4275ea0375d4e6a940cc3307dbe716cf85c':
Added locking to ImageLoader.
Ruben Brunk [Thu, 29 Nov 2012 01:04:48 +0000 (17:04 -0800)]
Merge "Added locking to ImageLoader." into gb-ub-photos-arches
John Hoford [Thu, 29 Nov 2012 00:57:34 +0000 (16:57 -0800)]
am
e5b979ed: Merge "reduce size of tiny planet if malloc fails" into gb-ub-photos-arches
* commit '
e5b979edb369877463e07680dddd9983bd2501cb':
reduce size of tiny planet if malloc fails
John Hoford [Thu, 29 Nov 2012 00:56:20 +0000 (16:56 -0800)]
Merge "reduce size of tiny planet if malloc fails" into gb-ub-photos-arches
nicolasroard [Thu, 29 Nov 2012 00:35:47 +0000 (16:35 -0800)]
Fix moving points in the Curves editor
bug:
7632994
Change-Id: Ibd0b22594ad9be52e32ea860976861e4619fb513
nicolasroard [Wed, 28 Nov 2012 23:57:17 +0000 (15:57 -0800)]
am
5d2227a7: Merge "Add a triangle to the popup button view" into gb-ub-photos-arches
* commit '
5d2227a793b51f44f664a739cc7e931c40ba4970':
Add a triangle to the popup button view
nicolasroard [Wed, 28 Nov 2012 23:56:07 +0000 (15:56 -0800)]
Merge "Add a triangle to the popup button view" into gb-ub-photos-arches
Ruben Brunk [Fri, 16 Nov 2012 21:51:08 +0000 (13:51 -0800)]
Added locking to ImageLoader.
Bug:
7471850
Change-Id: Ifbaf6e3547fad546a6faa94694bc7d3c7bb4711c
Ruben Brunk [Wed, 28 Nov 2012 23:46:05 +0000 (15:46 -0800)]
am
6a94446d: Minor fix for some FP rounding errors in crop.
* commit '
6a94446de01e8b6b034cc537ee3e65d507d47a47':
Minor fix for some FP rounding errors in crop.
Bobby Georgescu [Wed, 28 Nov 2012 18:44:20 +0000 (10:44 -0800)]
Merge "AlbumDataLoader.get returns correct value if not in cache" into gb-ub-photos-bryce
Ruben Brunk [Wed, 28 Nov 2012 00:13:32 +0000 (16:13 -0800)]
Minor fix for some FP rounding errors in crop.
Bug
7566505
Change-Id: Ic3b849b26e0435e0e51a3ddd80c25d8e6e9949aa
Your Name [Wed, 28 Nov 2012 00:07:55 +0000 (16:07 -0800)]
resolved conflicts for merge of
3c6a0610 to gb-ub-photos-bryce
Change-Id: Iac3fcc4a4b8c0295ec53edf5658169fb5fab021e
Your Name [Tue, 27 Nov 2012 00:33:49 +0000 (16:33 -0800)]
Remove orientation compensation
Bug:
7446056
Change-Id: I6f00617c890961e4d56545406bac9682356c0b15
Bobby Georgescu [Tue, 27 Nov 2012 19:21:51 +0000 (11:21 -0800)]
AlbumDataLoader.get returns correct value if not in cache
Bug:
7621656
Change-Id: I8b73837f41bf4ac8c753a5d84f251219fde8ae75