Fix b/4643148: Make PhotoEditor integrated into Gallery.

1. Move PhotoEditor code/resources into Gallery for single apk.
2. Change PhotoEditor package to com.android.gallery3d.photoeditor.
3. Rename PhotoEditor resources to avoid mess up Gallery resources.
4. Move Doodle effect from fix-effects to color-effects.
5. Update PhotoEditor bottom action-bar background.

Change-Id: I1a2f7d27d89a14fe6a0435575b993ed8b75e6bf4

42 files changed, 24 insertions, 0 deletions

diff --git a/res/drawable/photoeditor_actionbar_translucent.9.png b/res/drawable/photoeditor_actionbar_translucent.9.png
new file mode 100644
index 000000000..76775a37c
--- /dev/null
+++ b/res/drawable/photoeditor_actionbar_translucent.9.png
diff --git a/res/drawable/photoeditor_actionbar_translucent_bottom.9.png b/res/drawable/photoeditor_actionbar_translucent_bottom.9.png
new file mode 100644
index 000000000..97018f832
--- /dev/null
+++ b/res/drawable/photoeditor_actionbar_translucent_bottom.9.png
diff --git a/res/drawable/photoeditor_arrow_back.png b/res/drawable/photoeditor_arrow_back.png
new file mode 100644
index 000000000..897a1c11a
--- /dev/null
+++ b/res/drawable/photoeditor_arrow_back.png
diff --git a/res/drawable/photoeditor_artistic.png b/res/drawable/photoeditor_artistic.png
new file mode 100644
index 000000000..c887fe4d1
--- /dev/null
+++ b/res/drawable/photoeditor_artistic.png
diff --git a/res/drawable/photoeditor_color.png b/res/drawable/photoeditor_color.png
new file mode 100644
index 000000000..566773dbe
--- /dev/null
+++ b/res/drawable/photoeditor_color.png
diff --git a/res/drawable/photoeditor_effect_autofix.png b/res/drawable/photoeditor_effect_autofix.png
new file mode 100644
index 000000000..f0e2d46c8
--- /dev/null
+++ b/res/drawable/photoeditor_effect_autofix.png
diff --git a/res/drawable/photoeditor_effect_crop.png b/res/drawable/photoeditor_effect_crop.png
new file mode 100644
index 000000000..eb7da1b21
--- /dev/null
+++ b/res/drawable/photoeditor_effect_crop.png
diff --git a/res/drawable/photoeditor_effect_crossprocess.png b/res/drawable/photoeditor_effect_crossprocess.png
new file mode 100644
index 000000000..f9e596ad2
--- /dev/null
+++ b/res/drawable/photoeditor_effect_crossprocess.png
diff --git a/res/drawable/photoeditor_effect_documentary.png b/res/drawable/photoeditor_effect_documentary.png
new file mode 100644
index 000000000..92c40f997
--- /dev/null
+++ b/res/drawable/photoeditor_effect_documentary.png
diff --git a/res/drawable/photoeditor_effect_doodle.png b/res/drawable/photoeditor_effect_doodle.png
new file mode 100644
index 000000000..5b63178d6
--- /dev/null
+++ b/res/drawable/photoeditor_effect_doodle.png
diff --git a/res/drawable/photoeditor_effect_duotone.png b/res/drawable/photoeditor_effect_duotone.png
new file mode 100644
index 000000000..994e10410
--- /dev/null
+++ b/res/drawable/photoeditor_effect_duotone.png
diff --git a/res/drawable/photoeditor_effect_filllight.png b/res/drawable/photoeditor_effect_filllight.png
new file mode 100644
index 000000000..999b7f71e
--- /dev/null
+++ b/res/drawable/photoeditor_effect_filllight.png
diff --git a/res/drawable/photoeditor_effect_fisheye.png b/res/drawable/photoeditor_effect_fisheye.png
new file mode 100644
index 000000000..5fd1b93d3
--- /dev/null
+++ b/res/drawable/photoeditor_effect_fisheye.png
diff --git a/res/drawable/photoeditor_effect_flip.png b/res/drawable/photoeditor_effect_flip.png
new file mode 100644
index 000000000..dd74813a7
--- /dev/null
+++ b/res/drawable/photoeditor_effect_flip.png
diff --git a/res/drawable/photoeditor_effect_grain.png b/res/drawable/photoeditor_effect_grain.png
new file mode 100644
index 000000000..f6ff7fa3f
--- /dev/null
+++ b/res/drawable/photoeditor_effect_grain.png
diff --git a/res/drawable/photoeditor_effect_grayscale.png b/res/drawable/photoeditor_effect_grayscale.png
new file mode 100644
index 000000000..3c09cd35b
--- /dev/null
+++ b/res/drawable/photoeditor_effect_grayscale.png
diff --git a/res/drawable/photoeditor_effect_highlight.png b/res/drawable/photoeditor_effect_highlight.png
new file mode 100644
index 000000000..1d59fb48e
--- /dev/null
+++ b/res/drawable/photoeditor_effect_highlight.png
diff --git a/res/drawable/photoeditor_effect_lomoish.png b/res/drawable/photoeditor_effect_lomoish.png
new file mode 100644
index 000000000..ee347e6b9
--- /dev/null
+++ b/res/drawable/photoeditor_effect_lomoish.png
diff --git a/res/drawable/photoeditor_effect_negative.png b/res/drawable/photoeditor_effect_negative.png
new file mode 100644
index 000000000..96da62c5f
--- /dev/null
+++ b/res/drawable/photoeditor_effect_negative.png
diff --git a/res/drawable/photoeditor_effect_posterize.png b/res/drawable/photoeditor_effect_posterize.png
new file mode 100644
index 000000000..ac5384b4d
--- /dev/null
+++ b/res/drawable/photoeditor_effect_posterize.png
diff --git a/res/drawable/photoeditor_effect_redeye.png b/res/drawable/photoeditor_effect_redeye.png
new file mode 100644
index 000000000..ba845b5ee
--- /dev/null
+++ b/res/drawable/photoeditor_effect_redeye.png
diff --git a/res/drawable/photoeditor_effect_rotate.png b/res/drawable/photoeditor_effect_rotate.png
new file mode 100644
index 000000000..fa50ce26f
--- /dev/null
+++ b/res/drawable/photoeditor_effect_rotate.png
diff --git a/res/drawable/photoeditor_effect_saturation.png b/res/drawable/photoeditor_effect_saturation.png
new file mode 100644
index 000000000..d151d5c17
--- /dev/null
+++ b/res/drawable/photoeditor_effect_saturation.png
diff --git a/res/drawable/photoeditor_effect_sepia.png b/res/drawable/photoeditor_effect_sepia.png
new file mode 100644
index 000000000..236b9908f
--- /dev/null
+++ b/res/drawable/photoeditor_effect_sepia.png
diff --git a/res/drawable/photoeditor_effect_shadow.png b/res/drawable/photoeditor_effect_shadow.png
new file mode 100644
index 000000000..e3caa4409
--- /dev/null
+++ b/res/drawable/photoeditor_effect_shadow.png
diff --git a/res/drawable/photoeditor_effect_sharpen.png b/res/drawable/photoeditor_effect_sharpen.png
new file mode 100644
index 000000000..2bd0fff6d
--- /dev/null
+++ b/res/drawable/photoeditor_effect_sharpen.png
diff --git a/res/drawable/photoeditor_effect_straighten.png b/res/drawable/photoeditor_effect_straighten.png
new file mode 100644
index 000000000..309eb5ae2
--- /dev/null
+++ b/res/drawable/photoeditor_effect_straighten.png
diff --git a/res/drawable/photoeditor_effect_temperature.png b/res/drawable/photoeditor_effect_temperature.png
new file mode 100644
index 000000000..d4f135511
--- /dev/null
+++ b/res/drawable/photoeditor_effect_temperature.png
diff --git a/res/drawable/photoeditor_effect_tint.png b/res/drawable/photoeditor_effect_tint.png
new file mode 100644
index 000000000..6a6bb333b
--- /dev/null
+++ b/res/drawable/photoeditor_effect_tint.png
diff --git a/res/drawable/photoeditor_effect_vignette.png b/res/drawable/photoeditor_effect_vignette.png
new file mode 100644
index 000000000..e5295639d
--- /dev/null
+++ b/res/drawable/photoeditor_effect_vignette.png
diff --git a/res/drawable/photoeditor_exposure.png b/res/drawable/photoeditor_exposure.png
new file mode 100644
index 000000000..b6e3566c0
--- /dev/null
+++ b/res/drawable/photoeditor_exposure.png
diff --git a/res/drawable/photoeditor_fix.png b/res/drawable/photoeditor_fix.png
new file mode 100644
index 000000000..4b8f3b881
--- /dev/null
+++ b/res/drawable/photoeditor_fix.png
diff --git a/res/drawable/photoeditor_redo.png b/res/drawable/photoeditor_redo.png
new file mode 100644
index 000000000..9daa01c34
--- /dev/null
+++ b/res/drawable/photoeditor_redo.png
diff --git a/res/drawable/photoeditor_scale_seekbar_color.9.png b/res/drawable/photoeditor_scale_seekbar_color.9.png
new file mode 100644
index 000000000..d78ff9b3b
--- /dev/null
+++ b/res/drawable/photoeditor_scale_seekbar_color.9.png
diff --git a/res/drawable/photoeditor_scale_seekbar_filllight.9.png b/res/drawable/photoeditor_scale_seekbar_filllight.9.png
new file mode 100644
index 000000000..43acaf343
--- /dev/null
+++ b/res/drawable/photoeditor_scale_seekbar_filllight.9.png
diff --git a/res/drawable/photoeditor_scale_seekbar_generic.9.png b/res/drawable/photoeditor_scale_seekbar_generic.9.png
new file mode 100644
index 000000000..3ee3cc7f0
--- /dev/null
+++ b/res/drawable/photoeditor_scale_seekbar_generic.9.png
diff --git a/res/drawable/photoeditor_scale_seekbar_highlight.9.png b/res/drawable/photoeditor_scale_seekbar_highlight.9.png
new file mode 100644
index 000000000..70f54b800
--- /dev/null
+++ b/res/drawable/photoeditor_scale_seekbar_highlight.9.png
diff --git a/res/drawable/photoeditor_scale_seekbar_shadow.9.png b/res/drawable/photoeditor_scale_seekbar_shadow.9.png
new file mode 100644
index 000000000..b17a78522
--- /dev/null
+++ b/res/drawable/photoeditor_scale_seekbar_shadow.9.png
diff --git a/res/drawable/photoeditor_seekbar_thumb.png b/res/drawable/photoeditor_seekbar_thumb.png
new file mode 100644
index 000000000..0d452c16d
--- /dev/null
+++ b/res/drawable/photoeditor_seekbar_thumb.png
diff --git a/res/drawable/photoeditor_toggle_button_background.xml b/res/drawable/photoeditor_toggle_button_background.xml
new file mode 100644
index 000000000..81c39ca83
--- /dev/null
+++ b/res/drawable/photoeditor_toggle_button_background.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:exitFadeDuration="@android:integer/config_mediumAnimTime">
+
+    <item android:state_selected="true" android:drawable="@drawable/photoeditor_toggle_button_highlight" />
+    <item android:state_pressed="true" android:drawable="@drawable/photoeditor_toggle_button_highlight" />
+    <item android:drawable="@android:color/transparent" />
+
+</selector>
diff --git a/res/drawable/photoeditor_toggle_button_highlight.9.png b/res/drawable/photoeditor_toggle_button_highlight.9.png
new file mode 100644
index 000000000..add582a25
--- /dev/null
+++ b/res/drawable/photoeditor_toggle_button_highlight.9.png
diff --git a/res/drawable/photoeditor_undo.png b/res/drawable/photoeditor_undo.png
new file mode 100644
index 000000000..0a7e0d1b8
--- /dev/null
+++ b/res/drawable/photoeditor_undo.png