[Exclusive] The Ice Cream Sandwich Gallery Is Likely Getting A Built-In Photo Editor; We've Got The Feature List

Google is working on building a photo editor into the Android Gallery. That much we're certain about - we've got the icons for it. It's not 100% confirmed that this will actually ship, or if these features or icons are final, but do you really think they'd do all this work and throw it out?
With the disclaimer out of the way, here's the icons and descriptions, ripped right from Ice Cream Sandwich's creamy center.
Update 10/18/11: Confirmed during the ICS unveiling.

Tools

Redo

Undo

Colors

Exposure

Fix

Artistic

Crop	Rotate	Flip
Straighten	Sharpen	Redeye

Note: All the tool icons were white on transparent, so I gave them a black background. The sizes are exactly how they were when we got them. Just because the icons look black and white doesn't mean they will look like that in the app itself - they can be tinted, colored, "gradiented," etc. Think of them as base icons.

The "Colors" button also has art for an adjustable slider control. There is also a slider called "Generic", which could be for anything.

Wild speculation time: The small icons are probably on-screen the whole time. I bet "Fix" brings up the large icon tools and "Artistic" (the FX icon) brings up the effects.

This is all built into the Gallery APK (which doesn't run on older versions of Android, sorry) so expect an "Edit" button while you're viewing your pictures.

Effects

Autofix Cross Process Documentary Doodle Duotone Fill Light

Fisheye Grain Grayscale Highlight Lomo-ish Negative Posterize

Saturation Sepia Shadow Temperature Tint Vignette

A whopping 19 icons for photo effects."Fill Light", "Highlight", and "Shadow" have their own slider control art, and again, there's that "Generic" one that could be for anything.
That's it for now, you'll get more when we do!