OSDN Git Service
Ruben Brunk [Mon, 14 Jan 2013 18:22:05 +0000 (10:22 -0800)]
Fixed ClassCastException on open crop aspect menu.
Bug:
7999315
Change-Id: I78bd4c12f5241215629f6eb06fdc7b101ed6ddb6
George Mount [Sun, 13 Jan 2013 22:39:29 +0000 (14:39 -0800)]
Merge "Fix LightCycle capture NullPointerException." into gb-ub-photos-bryce
George Mount [Sun, 13 Jan 2013 19:05:05 +0000 (11:05 -0800)]
Fix LightCycle capture NullPointerException.
Bug
7987002
During capture animation, allow LightCycle to write the
current frame to a texture, then use that texture for drawing
the background image.
Change-Id: I7891e5cac18ee21ff17910790397459f9d57e408
Ruben Brunk [Wed, 19 Dec 2012 18:47:49 +0000 (10:47 -0800)]
Refactoring button class. Minor bug fixes.
Bug:
7875246
Bug:
7459118
Change-Id: Ic1099a7ae0feeeb16c8be3035f9726805149666e
George Mount [Wed, 9 Jan 2013 23:56:33 +0000 (15:56 -0800)]
Merge "Fix slide show animation so that cross fades work." into gb-ub-photos-bryce
Baligh Uddin [Wed, 9 Jan 2013 22:11:01 +0000 (14:11 -0800)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Wed, 9 Jan 2013 22:10:43 +0000 (14:10 -0800)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
George Mount [Tue, 8 Jan 2013 00:17:14 +0000 (16:17 -0800)]
Fix slide show animation so that cross fades work.
Bug
7961297
Removed the "Additive" blending, which didn't do anything, even in
OpenGL ES 1.1 implementation. Modified the texturing to
change the color of the pixels based on the supplied alpha
rather than modifying the alpha. This appears to match the
implementation in the OpenGL ES 1.1 pipeline.
Change-Id: I52491af1a8a2d727968e4e805bc4bc61647f5cf2
Baligh Uddin [Wed, 9 Jan 2013 20:07:21 +0000 (12:07 -0800)]
Import translations. DO NOT MERGE
Change-Id: If0150dc371afd98cb5512a5f29c51d5554b99008
Auto-generated-cl: translation import
Baligh Uddin [Wed, 9 Jan 2013 20:06:35 +0000 (12:06 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1a2f3a5e9c081b2e19de1188b805da3f7c1ba216
Auto-generated-cl: translation import
nicolasroard [Wed, 9 Jan 2013 19:42:29 +0000 (11:42 -0800)]
Refactor filters management
Change-Id: I0e75ad534cf8cc74a132f97836eedd35baeebeae
John Hoford [Fri, 28 Dec 2012 23:45:57 +0000 (15:45 -0800)]
Add the Drama filter
Change-Id: I6f026f899b9d991bd6f9e74445f68114041fe781
John Hoford [Tue, 8 Jan 2013 22:20:58 +0000 (14:20 -0800)]
Merge "Add a Draw filter" into gb-ub-photos-bryce
John Hoford [Tue, 8 Jan 2013 22:15:19 +0000 (14:15 -0800)]
Add a Draw filter
Change-Id: I67aecc9241b4534491fb838b84d0da1a6edbbb54
nicolasroard [Tue, 8 Jan 2013 21:10:51 +0000 (13:10 -0800)]
Merge "Refactoring UI editors" into gb-ub-photos-bryce
nicolasroard [Tue, 8 Jan 2013 03:43:14 +0000 (19:43 -0800)]
Refactoring UI editors
bug:
7688780
Change-Id: I30f8691788332a01d591435474a84cc352b71138
George Mount [Tue, 8 Jan 2013 18:22:16 +0000 (10:22 -0800)]
Merge "Instantiate GLCanvas rather than reinitialize current GLCanvas." into gb-ub-photos-bryce
George Mount [Mon, 7 Jan 2013 22:15:10 +0000 (14:15 -0800)]
Instantiate GLCanvas rather than reinitialize current GLCanvas.
GLCanvas was being used as a singleton when it really should
allow separate instances for correctness.
Change-Id: I650884e843a4a78997b70826f6012ae19b8df549
Bobby Georgescu [Wed, 26 Dec 2012 08:52:28 +0000 (00:52 -0800)]
Replace camera importer
Change-Id: Icfeb23301bc6c9f8c8b12824bcbb0d8b41852d07
Bobby Georgescu [Mon, 7 Jan 2013 20:59:00 +0000 (12:59 -0800)]
Merge "Fix camera->gallery relaunch loop on empty camera album" into gb-ub-photos-bryce
Bobby Georgescu [Mon, 7 Jan 2013 19:25:46 +0000 (11:25 -0800)]
Fix camera->gallery relaunch loop on empty camera album
Bug:
7952132
Change-Id: I27325abe32177195d07fe310b8c49aca81af9056
Baligh Uddin [Wed, 2 Jan 2013 21:16:54 +0000 (13:16 -0800)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Wed, 2 Jan 2013 18:15:36 +0000 (10:15 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia064f134f9ec6404207ccb9d2852681c4f5f1bbe
Auto-generated-cl: translation import
Baligh Uddin [Wed, 2 Jan 2013 18:14:45 +0000 (10:14 -0800)]
Import translations. DO NOT MERGE
Change-Id: I21443ea53d6766eb093262f61c01c145d20e9b6a
Auto-generated-cl: translation import
nicolasroard [Fri, 28 Dec 2012 00:16:31 +0000 (16:16 -0800)]
Fix crash when using red eyes correction
bug:
7680079
Change-Id: Icc6728321f18d09de5676564a3640c4b414c6741
Ruben Brunk [Tue, 18 Dec 2012 23:47:40 +0000 (15:47 -0800)]
Made downsampling filter preview accurate.
Bug:
7892268
Change-Id: I9ab3a7f5077b718ed54206666ef9ef289db8facc
Ruben Brunk [Wed, 19 Dec 2012 18:46:40 +0000 (10:46 -0800)]
Merge "Change XML character limit for string." into gb-ub-photos-bryce
Earl Ou [Fri, 7 Dec 2012 07:49:05 +0000 (15:49 +0800)]
add javadoc for ExifOutputStream
Change-Id: Ib7aa3e32e0ae3af143209c0128374fc35ee8faa2
Earl Ou [Fri, 7 Dec 2012 08:56:10 +0000 (16:56 +0800)]
add help function to decode user comment in ExifData
Change-Id: Ida19ce45bfc8b00972e751b652d99f6b19798116
Earl Ou [Fri, 7 Dec 2012 08:01:09 +0000 (16:01 +0800)]
add javadoc for Rational and IfdId in Exif package
Change-Id: Ie67dde198337e6edae2e94d5c7e97b9b6063833e
Earl Ou [Fri, 7 Dec 2012 07:58:19 +0000 (15:58 +0800)]
Replace original tags when add tags in ExifTag
Change-Id: I80d1507467dcde8c8b157a120cfe9a5f5c664d0f
Earl Ou [Thu, 6 Dec 2012 10:12:08 +0000 (18:12 +0800)]
Use ExifOutputStream in SaveCopyTask
Change-Id: Ifa68d819249d3871c4a22f6e3dadc69542b9dc28
Angus Kong [Wed, 19 Dec 2012 12:16:29 +0000 (04:16 -0800)]
Merge "Apply ExifModifier for rotation" into gb-ub-photos-bryce
Angus Kong [Wed, 19 Dec 2012 06:52:34 +0000 (22:52 -0800)]
Merge "ExifModifier" into gb-ub-photos-bryce
Earl Ou [Thu, 6 Dec 2012 08:51:32 +0000 (16:51 +0800)]
Apply ExifModifier for rotation
Change-Id: Ifa3cee7816ffeacab2415f479234856916acfecf
Wu-cheng Li [Fri, 2 Nov 2012 05:36:07 +0000 (13:36 +0800)]
Lock icon in secure album should redirect to gallery after unlock.
Use FLAG_DISMISS_KEYGUARD so lock screen will be brought up
when launching gallery.
bug:
7462572
Change-Id: I345398cc6cfc09901e1ce8309ebdb65cf15088e0
The auto-merge of this CL from Arches to Bryce had a merge conflict,
so I canceled the auto-merge and then did this manual cherry-pick.
Bart Sears [Tue, 18 Dec 2012 20:58:15 +0000 (12:58 -0800)]
resolved conflicts for merge of
5b188c94 to gb-ub-photos-bryce
Change-Id: I0b39e54323c8f2ce67816ec223acf72cfacbd191
Ruben Brunk [Tue, 18 Dec 2012 03:46:41 +0000 (19:46 -0800)]
Change XML character limit for string.
Bug:
7875246
Change-Id: I883fd175db85efcacfae32c6c690480c8f3c7484
Ruben Brunk [Tue, 18 Dec 2012 01:54:16 +0000 (17:54 -0800)]
Disabled further filters after Tiny Planet.
Bug:
7407176
Temporary fix. We need to handle filters changing the image
geometry properly.
Change-Id: I405b83acddec4e3b88a8a1d70dc534df15c37f1c
George Mount [Mon, 17 Dec 2012 22:16:58 +0000 (14:16 -0800)]
Merge "Move LightCycle to render directly to GLRootView." into gb-ub-photos-bryce
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 [Mon, 17 Dec 2012 19:56:30 +0000 (11:56 -0800)]
Improved performance for Kmeans filter.
Bug:
7739334
Change-Id: I5ab1eb429d65f84449a61deca962a47f2b6dbc8b
Doris Liu [Thu, 13 Dec 2012 01:47:12 +0000 (17:47 -0800)]
Add relativePath field into photo widget db
Bug:
7481248
The bug is caused by the change of external storage going from JB to JBMR1.
In light of this change, a new field has been added to the photo widget app
database to store the relative path for the local album. With the relative paths
stored, the widget app should be more resilient to future storage path changes.
Change-Id: Ia2497b882ae67178fa0632f23e07673b82d3a942
Baligh Uddin [Fri, 14 Dec 2012 18:30:30 +0000 (10:30 -0800)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Fri, 14 Dec 2012 18:26:12 +0000 (10:26 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ief7fd6315479227b744f9dc8a4c93d5d1f8094bf
Auto-generated-cl: translation import
Baligh Uddin [Fri, 14 Dec 2012 18:25:24 +0000 (10:25 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie43a18a662cb75c76dcfb807ab9686388fd4e36c
Auto-generated-cl: translation import
Bobby Georgescu [Fri, 14 Dec 2012 08:50:54 +0000 (00:50 -0800)]
Merge "Gallery in separate task for up button in Camera filmstrip" into gb-ub-photos-bryce
Bobby Georgescu [Fri, 14 Dec 2012 08:18:51 +0000 (00:18 -0800)]
Gallery in separate task for up button in Camera filmstrip
Bug:
7738398
Change-Id: I297c15f0a3e537d96d79b05e1dd8d376ff59bfca
Ruben Brunk [Fri, 14 Dec 2012 07:53:49 +0000 (23:53 -0800)]
Removed filtershow geometry editor preview interpolating. It looks bad.
Change-Id: I790ce00e85c835f73c076f79cde5e65236131f49
Ruben Brunk [Fri, 14 Dec 2012 07:31:51 +0000 (23:31 -0800)]
Remove preview dithering from Geometry editor in filtershow.
Bug:
7739904
Change-Id: I25c3cbe8907dd921aeb68f217fa9703e703d34a8
Ruben Brunk [Fri, 14 Dec 2012 07:18:19 +0000 (23:18 -0800)]
Merge "Refactoring: removed unused presets." into gb-ub-photos-bryce
Ruben Brunk [Fri, 14 Dec 2012 05:23:38 +0000 (21:23 -0800)]
Added downsampling filter.
Bug:
7690079
Change-Id: I235524127da848b1cbcca159cec43d1e0dcb5bf2
Ruben Brunk [Fri, 14 Dec 2012 07:08:00 +0000 (23:08 -0800)]
Refactoring: removed unused presets.
Change-Id: I1390bf65048a6cbd4dee5ee9cd472dc440352860
Ruben Brunk [Fri, 14 Dec 2012 07:05:55 +0000 (23:05 -0800)]
Merge "Refactoring: removed unused filters." into gb-ub-photos-bryce
Ruben Brunk [Fri, 14 Dec 2012 07:05:30 +0000 (23:05 -0800)]
Merge "Refactoring: removed old filtershow slider." into gb-ub-photos-bryce
Ruben Brunk [Fri, 14 Dec 2012 06:42:33 +0000 (22:42 -0800)]
Refactoring: removed unused filters.
Change-Id: If6344fde16607ab9dddb25922d295b1df205df6b
Ruben Brunk [Fri, 14 Dec 2012 06:35:25 +0000 (22:35 -0800)]
Refactoring: removed old filtershow slider.
Change-Id: Iebd2f18c0f4819e7ff32be638e96b519f3ce905c
Ruben Brunk [Fri, 14 Dec 2012 05:55:53 +0000 (21:55 -0800)]
Fix Seekbar infinite recursion.
Bug:
7739384
Change-Id: Ie76d6741be4d08f3f9919662f1ad558c809aa5bd
Ruben Brunk [Thu, 13 Dec 2012 20:39:14 +0000 (12:39 -0800)]
Merge "Added K-Means clustering filter." into gb-ub-photos-bryce
Baligh Uddin [Thu, 13 Dec 2012 17:23:49 +0000 (09:23 -0800)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Thu, 13 Dec 2012 17:09:52 +0000 (09:09 -0800)]
Import translations. DO NOT MERGE
Change-Id: I173975f38a7e63e4d87c56e83c24f4e81dc82c7b
Auto-generated-cl: translation import
Baligh Uddin [Thu, 13 Dec 2012 17:08:44 +0000 (09:08 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic21db8c05d777a50207372556d1f9a7cb6450831
Auto-generated-cl: translation import
Ruben Brunk [Thu, 13 Dec 2012 05:35:12 +0000 (21:35 -0800)]
Added K-Means clustering filter.
Change-Id: If8961d4a21de953b754cf74aefc222b6bec902a3
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...
OSDN Git Service
