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

13 files changed, 616 insertions, 0 deletions

diff --git a/res/layout/photoeditor_color_seekbar.xml b/res/layout/photoeditor_color_seekbar.xml
new file mode 100644
index 000000000..fb9386992
--- /dev/null
+++ b/res/layout/photoeditor_color_seekbar.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.
+-->
+
+<com.android.gallery3d.photoeditor.actions.ColorSeekBar
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="@dimen/seekbar_width"
+    android:layout_height="@dimen/seekbar_height"
+    android:layout_marginBottom="@dimen/seekbar_margin_bottom"
+    android:minHeight="@dimen/seekbar_height"
+    android:maxHeight="@dimen/seekbar_height"
+    android:progressDrawable="@android:color/transparent"/>
diff --git a/res/layout/photoeditor_crop_view.xml b/res/layout/photoeditor_crop_view.xml
new file mode 100644
index 000000000..151e6a678
--- /dev/null
+++ b/res/layout/photoeditor_crop_view.xml
@@ -0,0 +1,20 @@
+<?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.
+-->
+
+<com.android.gallery3d.photoeditor.actions.CropView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/fullscreen_effect_tool"
+    style="@style/FullscreenToolView"/>
diff --git a/res/layout/photoeditor_doodle_view.xml b/res/layout/photoeditor_doodle_view.xml
new file mode 100644
index 000000000..d8e08683c
--- /dev/null
+++ b/res/layout/photoeditor_doodle_view.xml
@@ -0,0 +1,20 @@
+<?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.
+-->
+
+<com.android.gallery3d.photoeditor.actions.DoodleView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/fullscreen_effect_tool"
+    style="@style/FullscreenToolView"/>
diff --git a/res/layout/photoeditor_effect_tool_panel.xml b/res/layout/photoeditor_effect_tool_panel.xml
new file mode 100644
index 000000000..7fd92571c
--- /dev/null
+++ b/res/layout/photoeditor_effect_tool_panel.xml
@@ -0,0 +1,29 @@
+<?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"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:padding="@dimen/effect_tool_panel_padding"
+    android:background="@color/translucent_black"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/effect_label"
+        style="@style/EffectLabel"/>
+</LinearLayout>
diff --git a/res/layout/photoeditor_effects_artistic.xml b/res/layout/photoeditor_effects_artistic.xml
new file mode 100644
index 000000000..f5eb63a87
--- /dev/null
+++ b/res/layout/photoeditor_effects_artistic.xml
@@ -0,0 +1,92 @@
+<?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.CrossProcessAction style="@style/Effect">
+        <ImageButton
+            android:id="@+id/effect_button"
+            style="@style/EffectIcon"
+            android:src="@drawable/photoeditor_effect_crossprocess"/>
+        <TextView
+            android:id="@+id/effect_label"
+            android:text="@string/crossprocess"
+            style="@style/EffectLabel"/>
+    </com.android.gallery3d.photoeditor.actions.CrossProcessAction>
+    <com.android.gallery3d.photoeditor.actions.PosterizeAction style="@style/Effect">
+        <ImageButton
+            android:id="@+id/effect_button"
+            style="@style/EffectIcon"
+            android:src="@drawable/photoeditor_effect_posterize"/>
+        <TextView
+            android:id="@+id/effect_label"
+            android:text="@string/posterize"
+            style="@style/EffectLabel"/>
+    </com.android.gallery3d.photoeditor.actions.PosterizeAction>
+    <com.android.gallery3d.photoeditor.actions.LomoishAction style="@style/Effect">
+        <ImageButton
+            android:id="@+id/effect_button"
+            style="@style/EffectIcon"
+            android:src="@drawable/photoeditor_effect_lomoish"/>
+        <TextView
+            android:id="@+id/effect_label"
+            android:text="@string/lomoish"
+            style="@style/EffectLabel"/>
+    </com.android.gallery3d.photoeditor.actions.LomoishAction>
+    <com.android.gallery3d.photoeditor.actions.DocumentaryAction style="@style/Effect">
+        <ImageButton
+            android:id="@+id/effect_button"
+            style="@style/EffectIcon"
+            android:src="@drawable/photoeditor_effect_documentary"/>
+        <TextView
+            android:id="@+id/effect_label"
+            android:text="@string/documentary"
+            style="@style/EffectLabel"/>
+    </com.android.gallery3d.photoeditor.actions.DocumentaryAction>
+    <com.android.gallery3d.photoeditor.actions.VignetteAction style="@style/Effect">
+        <ImageButton
+            android:id="@+id/effect_button"
+            style="@style/EffectIcon"
+            android:src="@drawable/photoeditor_effect_vignette"/>
+        <TextView
+            android:id="@+id/effect_label"
+            android:text="@string/vignette"
+            style="@style/EffectLabel"/>
+    </com.android.gallery3d.photoeditor.actions.VignetteAction>
+    <com.android.gallery3d.photoeditor.actions.GrainAction style="@style/Effect">
+        <ImageButton
+            android:id="@+id/effect_button"
+            style="@style/EffectIcon"
+            android:src="@drawable/photoeditor_effect_grain"/>
+        <TextView
+            android:id="@+id/effect_label"
+            android:text="@string/grain"
+            style="@style/EffectLabel"/>
+    </com.android.gallery3d.photoeditor.actions.GrainAction>
+    <com.android.gallery3d.photoeditor.actions.FisheyeAction style="@style/Effect">
+        <ImageButton
+            android:id="@+id/effect_button"
+            style="@style/EffectIcon"
+            android:src="@drawable/photoeditor_effect_fisheye"/>
+        <TextView
+            android:id="@+id/effect_label"
+            android:text="@string/fisheye"
+            style="@style/EffectLabel"/>
+    </com.android.gallery3d.photoeditor.actions.FisheyeAction>
+
+</LinearLayout>
diff --git a/res/layout/photoeditor_effects_color.xml b/res/layout/photoeditor_effects_color.xml
new file mode 100644
index 000000000..c078dfaa2
--- /dev/null
+++ b/res/layout/photoeditor_effects_color.xml
@@ -0,0 +1,103 @@
+<?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.ColorTemperatureAction style="@style/Effect">
+        <ImageButton
+            android:id="@+id/effect_button"
+            style="@style/EffectIcon"
+            android:src="@drawable/photoeditor_effect_temperature"/>
+        <TextView
+            android:id="@+id/effect_label"
+            android:text="@string/temperature"
+            style="@style/EffectLabel"/>
+    </com.android.gallery3d.photoeditor.actions.ColorTemperatureAction>
+    <com.android.gallery3d.photoeditor.actions.SaturationAction style="@style/Effect">
+        <ImageButton
+            android:id="@+id/effect_button"
+            style="@style/EffectIcon"
+            android:src="@drawable/photoeditor_effect_saturation"/>
+        <TextView
+            android:id="@+id/effect_label"
+            android:text="@string/saturation"
+            style="@style/EffectLabel"/>
+    </com.android.gallery3d.photoeditor.actions.SaturationAction>
+    <com.android.gallery3d.photoeditor.actions.GrayscaleAction style="@style/Effect">
+        <ImageButton
+            android:id="@+id/effect_button"
+            style="@style/EffectIcon"
+            android:src="@drawable/photoeditor_effect_grayscale"/>
+        <TextView
+            android:id="@+id/effect_label"
+            android:text="@string/grayscale"
+            style="@style/EffectLabel"/>
+    </com.android.gallery3d.photoeditor.actions.GrayscaleAction>
+    <com.android.gallery3d.photoeditor.actions.SepiaAction style="@style/Effect">
+        <ImageButton
+            android:id="@+id/effect_button"
+            style="@style/EffectIcon"
+            android:src="@drawable/photoeditor_effect_sepia"/>
+        <TextView
+            android:id="@+id/effect_label"
+            android:text="@string/sepia"
+            style="@style/EffectLabel"/>
+    </com.android.gallery3d.photoeditor.actions.SepiaAction>
+    <com.android.gallery3d.photoeditor.actions.NegativeAction style="@style/Effect">
+        <ImageButton
+            android:id="@+id/effect_button"
+            style="@style/EffectIcon"
+            android:src="@drawable/photoeditor_effect_negative"/>
+        <TextView
+            android:id="@+id/effect_label"
+            android:text="@string/negative"
+            style="@style/EffectLabel"/>
+    </com.android.gallery3d.photoeditor.actions.NegativeAction>
+    <com.android.gallery3d.photoeditor.actions.TintAction style="@style/Effect">
+        <ImageButton
+            android:id="@+id/effect_button"
+            style="@style/EffectIcon"
+            android:src="@drawable/photoeditor_effect_tint"/>
+        <TextView
+            android:id="@+id/effect_label"
+            android:text="@string/tint"
+            style="@style/EffectLabel"/>
+    </com.android.gallery3d.photoeditor.actions.TintAction>
+    <com.android.gallery3d.photoeditor.actions.DuotoneAction style="@style/Effect">
+        <ImageButton
+            android:id="@+id/effect_button"
+            style="@style/EffectIcon"
+            android:src="@drawable/photoeditor_effect_duotone"/>
+        <TextView
+            android:id="@+id/effect_label"
+            android:text="@string/duotone"
+            style="@style/EffectLabel"/>
+    </com.android.gallery3d.photoeditor.actions.DuotoneAction>
+    <com.android.gallery3d.photoeditor.actions.DoodleAction style="@style/Effect"
+        android:tag="@string/doodle_tooltip">
+        <ImageButton
+            android:id="@+id/effect_button"
+            style="@style/EffectIcon"
+            android:src="@drawable/photoeditor_effect_doodle"/>
+        <TextView
+            android:id="@+id/effect_label"
+            android:text="@string/doodle"
+            style="@style/EffectLabel"/>
+    </com.android.gallery3d.photoeditor.actions.DoodleAction>
+
+</LinearLayout>
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>
diff --git a/res/layout/photoeditor_effects_fix.xml b/res/layout/photoeditor_effects_fix.xml
new file mode 100644
index 000000000..b77ffd132
--- /dev/null
+++ b/res/layout/photoeditor_effects_fix.xml
@@ -0,0 +1,87 @@
+<?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.CropAction style="@style/Effect"
+        android:tag="@string/crop_tooltip">
+        <ImageButton
+            android:id="@+id/effect_button"
+            style="@style/EffectIcon"
+            android:src="@drawable/photoeditor_effect_crop"/>
+        <TextView
+            android:id="@+id/effect_label"
+            android:text="@string/crop"
+            style="@style/EffectLabel"/>
+    </com.android.gallery3d.photoeditor.actions.CropAction>
+    <com.android.gallery3d.photoeditor.actions.RedEyeAction style="@style/Effect"
+        android:tag="@string/redeye_tooltip">
+        <ImageButton
+            android:id="@+id/effect_button"
+            style="@style/EffectIcon"
+            android:src="@drawable/photoeditor_effect_redeye"/>
+        <TextView
+            android:id="@+id/effect_label"
+            android:text="@string/redeye"
+            style="@style/EffectLabel"/>
+    </com.android.gallery3d.photoeditor.actions.RedEyeAction>
+    <com.android.gallery3d.photoeditor.actions.StraightenAction style="@style/Effect"
+        android:tag="@string/straighten_tooltip">
+        <ImageButton
+            android:id="@+id/effect_button"
+            style="@style/EffectIcon"
+            android:src="@drawable/photoeditor_effect_straighten"/>
+        <TextView
+            android:id="@+id/effect_label"
+            android:text="@string/straighten"
+            style="@style/EffectLabel"/>
+    </com.android.gallery3d.photoeditor.actions.StraightenAction>
+    <com.android.gallery3d.photoeditor.actions.RotateAction style="@style/Effect"
+        android:tag="@string/rotate_tooltip">
+        <ImageButton
+            android:id="@+id/effect_button"
+            style="@style/EffectIcon"
+            android:src="@drawable/photoeditor_effect_rotate"/>
+        <TextView
+            android:id="@+id/effect_label"
+            android:text="@string/rotate"
+            style="@style/EffectLabel"/>
+    </com.android.gallery3d.photoeditor.actions.RotateAction>
+    <com.android.gallery3d.photoeditor.actions.FlipAction style="@style/Effect"
+        android:tag="@string/flip_tooltip">
+        <ImageButton
+            android:id="@+id/effect_button"
+            style="@style/EffectIcon"
+            android:src="@drawable/photoeditor_effect_flip"/>
+        <TextView
+            android:id="@+id/effect_label"
+            android:text="@string/flip"
+            style="@style/EffectLabel"/>
+    </com.android.gallery3d.photoeditor.actions.FlipAction>
+    <com.android.gallery3d.photoeditor.actions.SharpenAction style="@style/Effect">
+        <ImageButton
+            android:id="@+id/effect_button"
+            style="@style/EffectIcon"
+            android:src="@drawable/photoeditor_effect_sharpen"/>
+        <TextView
+            android:id="@+id/effect_label"
+            android:text="@string/sharpen"
+            style="@style/EffectLabel"/>
+    </com.android.gallery3d.photoeditor.actions.SharpenAction>
+
+</LinearLayout>
diff --git a/res/layout/photoeditor_effects_gallery.xml b/res/layout/photoeditor_effects_gallery.xml
new file mode 100644
index 000000000..16a2366a0
--- /dev/null
+++ b/res/layout/photoeditor_effects_gallery.xml
@@ -0,0 +1,30 @@
+<?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.
+-->
+
+<!-- The linear-layout is used to center content that cannot fill scroll-view -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/translucent_black"
+    android:gravity="center_horizontal">
+
+    <HorizontalScrollView
+        android:id="@+id/scroll_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:scrollbars="none"/>
+</LinearLayout>
diff --git a/res/layout/photoeditor_main.xml b/res/layout/photoeditor_main.xml
new file mode 100644
index 000000000..dd7551ff6
--- /dev/null
+++ b/res/layout/photoeditor_main.xml
@@ -0,0 +1,85 @@
+<?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.
+-->
+
+<com.android.gallery3d.photoeditor.Toolbar
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/toolbar"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+
+    <com.android.gallery3d.photoeditor.PhotoView
+        android:id="@+id/photo_view"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"/>
+
+    <com.android.gallery3d.photoeditor.EffectsBar android:id="@+id/effects_bar" style="@style/EffectsBar">
+
+        <LinearLayout style="@style/BottomActionBar" android:gravity="center_horizontal">
+
+            <LinearLayout android:id="@+id/effects_menu" style="@style/ActionBarLinearLayout">
+
+                <ImageButton
+                    android:id="@+id/exposure_button"
+                    style="@style/EffectsMenuActionButton"
+                    android:src="@drawable/photoeditor_exposure"/>
+                <ImageButton
+                    android:id="@+id/artistic_button"
+                    style="@style/EffectsMenuActionButton"
+                    android:src="@drawable/photoeditor_artistic"/>
+                <ImageButton
+                    android:id="@+id/color_button"
+                    style="@style/EffectsMenuActionButton"
+                    android:src="@drawable/photoeditor_color"/>
+                <ImageButton
+                    android:id="@+id/fix_button"
+                    style="@style/EffectsMenuActionButton"
+                    android:src="@drawable/photoeditor_fix"/>
+            </LinearLayout>
+
+        </LinearLayout>
+    </com.android.gallery3d.photoeditor.EffectsBar>
+
+    <com.android.gallery3d.photoeditor.ActionBar android:id="@+id/action_bar" style="@style/TopActionBar">
+
+        <LinearLayout style="@style/ActionBarLinearLayout">
+
+            <LinearLayout
+                android:id="@+id/action_bar_back"
+                style="@style/ActionBarBackLinearLayout">
+                <ImageView style="@style/ActionBarArrow"/>
+                <ImageView style="@style/ActionBarIcon"/>
+            </LinearLayout>
+
+            <TextView android:id="@+id/action_bar_title" style="@style/ActionBarText"/>
+        </LinearLayout>
+
+        <LinearLayout style="@style/ActionBarLinearLayout" android:layout_alignParentRight="true">
+
+            <ImageButton
+                android:id="@+id/undo_button"
+                style="@style/ImageActionButton"
+                android:src="@drawable/photoeditor_undo"/>
+            <ImageButton
+                android:id="@+id/redo_button"
+                style="@style/ImageActionButton"
+                android:src="@drawable/photoeditor_redo"/>
+            <Button
+                android:id="@+id/save_button"
+                style="@style/TextActionButton"
+                android:text="@string/save"/>
+        </LinearLayout>
+    </com.android.gallery3d.photoeditor.ActionBar>
+</com.android.gallery3d.photoeditor.Toolbar>
diff --git a/res/layout/photoeditor_rotate_view.xml b/res/layout/photoeditor_rotate_view.xml
new file mode 100644
index 000000000..9dbe9d02d
--- /dev/null
+++ b/res/layout/photoeditor_rotate_view.xml
@@ -0,0 +1,20 @@
+<?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.
+-->
+
+<com.android.gallery3d.photoeditor.actions.RotateView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/fullscreen_effect_tool"
+    style="@style/FullscreenToolView"/>
diff --git a/res/layout/photoeditor_scale_seekbar.xml b/res/layout/photoeditor_scale_seekbar.xml
new file mode 100644
index 000000000..d8df19fb0
--- /dev/null
+++ b/res/layout/photoeditor_scale_seekbar.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.
+-->
+
+<com.android.gallery3d.photoeditor.actions.ScaleSeekBar
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="@dimen/seekbar_width"
+    android:layout_height="@dimen/seekbar_height"
+    android:layout_marginBottom="@dimen/seekbar_margin_bottom"
+    android:minHeight="@dimen/seekbar_height"
+    android:maxHeight="@dimen/seekbar_height"
+    android:progressDrawable="@android:color/transparent"/>
diff --git a/res/layout/photoeditor_touch_view.xml b/res/layout/photoeditor_touch_view.xml
new file mode 100644
index 000000000..39a087127
--- /dev/null
+++ b/res/layout/photoeditor_touch_view.xml
@@ -0,0 +1,20 @@
+<?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.
+-->
+
+<com.android.gallery3d.photoeditor.actions.TouchView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/fullscreen_effect_tool"
+    style="@style/FullscreenToolView"/>