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

1 files changed, 62 insertions, 0 deletions

diff --git a/res/layout/photoeditor_effects_exposure.xml b/res/layout/photoeditor_effects_exposure.xml
new file mode 100644
index 000000000..5a4fb2949
--- /dev/null
+++ b/res/layout/photoeditor_effects_exposure.xml
@@ -0,0 +1,62 @@
+<?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.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/EffectsContainer">
+
+    <com.android.gallery3d.photoeditor.actions.FillLightAction style="@style/Effect">
+        <ImageButton
+            android:id="@+id/effect_button"
+            style="@style/EffectIcon"
+            android:src="@drawable/photoeditor_effect_filllight"/>
+        <TextView
+            android:id="@+id/effect_label"
+            android:text="@string/filllight"
+            style="@style/EffectLabel"/>
+    </com.android.gallery3d.photoeditor.actions.FillLightAction>
+    <com.android.gallery3d.photoeditor.actions.HighlightAction style="@style/Effect">
+        <ImageButton
+            android:id="@+id/effect_button"
+            style="@style/EffectIcon"
+            android:src="@drawable/photoeditor_effect_highlight"/>
+        <TextView
+            android:id="@+id/effect_label"
+            android:text="@string/highlight"
+            style="@style/EffectLabel"/>
+    </com.android.gallery3d.photoeditor.actions.HighlightAction>
+    <com.android.gallery3d.photoeditor.actions.ShadowAction style="@style/Effect">
+        <ImageButton
+            android:id="@+id/effect_button"
+            style="@style/EffectIcon"
+            android:src="@drawable/photoeditor_effect_shadow"/>
+        <TextView
+            android:id="@+id/effect_label"
+            android:text="@string/shadow"
+            style="@style/EffectLabel"/>
+    </com.android.gallery3d.photoeditor.actions.ShadowAction>
+    <com.android.gallery3d.photoeditor.actions.AutoFixAction style="@style/Effect">
+        <ImageButton
+            android:id="@+id/effect_button"
+            style="@style/EffectIcon"
+            android:src="@drawable/photoeditor_effect_autofix"/>
+        <TextView
+            android:id="@+id/effect_label"
+            android:text="@string/autofix"
+            style="@style/EffectLabel"/>
+    </com.android.gallery3d.photoeditor.actions.AutoFixAction>
+
+</LinearLayout>