Merge "Fix b/5403449." into ics-mr0

3 files changed, 60 insertions, 30 deletions

diff --git a/res/layout/photoeditor_actionbar.xml b/res/layout/photoeditor_actionbar.xml
index 2437611a2..8bd51ed43 100644
--- a/res/layout/photoeditor_actionbar.xml
+++ b/res/layout/photoeditor_actionbar.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 
-<com.android.gallery3d.photoeditor.ActionBar
+<RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/action_bar"
-    style="@style/TopActionBar">
+    style="@style/ActionBarInner"
+    android:background="@drawable/photoeditor_actionbar_translucent">
 
     <LinearLayout style="@style/ActionBarLinearLayout">
 
@@ -62,4 +62,4 @@
         </ViewSwitcher>
 
     </LinearLayout>
-</com.android.gallery3d.photoeditor.ActionBar>
+</RelativeLayout>
diff --git a/res/layout/photoeditor_effects_menu.xml b/res/layout/photoeditor_effects_menu.xml
new file mode 100644
index 000000000..1688a9056
--- /dev/null
+++ b/res/layout/photoeditor_effects_menu.xml
@@ -0,0 +1,44 @@
+<?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.
+-->
+
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/ActionBarInner"
+    android:background="@drawable/photoeditor_actionbar_translucent_bottom">
+
+    <LinearLayout
+        android:id="@+id/toggles"
+        style="@style/EffectsMenuContainer">
+
+        <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>
+
+</FrameLayout>
diff --git a/res/layout/photoeditor_main.xml b/res/layout/photoeditor_main.xml
index 49597ed02..a040ca749 100644
--- a/res/layout/photoeditor_main.xml
+++ b/res/layout/photoeditor_main.xml
@@ -25,33 +25,19 @@
         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
+        android:id="@+id/effects_bar"
+        style="@style/EffectsBar">
+
+        <com.android.gallery3d.photoeditor.EffectsMenu
+            android:id="@+id/effects_menu"
+            style="@style/ActionBarOuter"/>
+
     </com.android.gallery3d.photoeditor.EffectsBar>
 
-    <include layout="@layout/photoeditor_actionbar"/>
+    <com.android.gallery3d.photoeditor.ActionBar
+        android:id="@+id/action_bar"
+        style="@style/ActionBarOuter"
+        android:layout_alignParentTop="true"/>
 
 </com.android.gallery3d.photoeditor.Toolbar>