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

redo

Undo

undo

Colors

color

Exposure

exposure

Fix

fix

Artistic

Filters

Crop

crop

Rotate

rotate

Flip

flip

Straighten

straighten

Sharpen

sharpen

Redeye

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

wm_photoeditor_effect_autofix

Cross Process

wm_photoeditor_effect_crossprocess

Documentary

wm_photoeditor_effect_documentary

Doodle

wm_photoeditor_effect_doodle

Duotone

wm_photoeditor_effect_duotone

Fill Light

wm_photoeditor_effect_filllight

Fisheye

wm_photoeditor_effect_fisheye

Grain

wm_photoeditor_effect_grain

Grayscale

wm_photoeditor_effect_grayscale

Highlight

wm_photoeditor_effect_highlight

Lomo-ish

wm_photoeditor_effect_lomoish

Negative

wm_photoeditor_effect_negative

Posterize

wm_photoeditor_effect_posterize

Saturation

wm_photoeditor_effect_saturation

Sepia

wm_photoeditor_effect_sepia

Shadow

wm_photoeditor_effect_shadow

Temperature

wm_photoeditor_effect_temperature

Tint

wm_photoeditor_effect_tint

Vignette

wm_photoeditor_effect_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!

Thanks, Geek Vundotra!