From 06b6cd2fdb02cd77ada72059a235928b7391c729 Mon Sep 17 00:00:00 2001
From: Doris Liu <tianliu@google.com>
Date: Fri, 8 Feb 2013 17:00:46 -0800
Subject: [PATCH] Fix camera setting icons appearing in wrong place

Bug: 7956904
Change-Id: I1b2d3fef8d82a3efeb0caa5130ce3dbb6808af70
---
 res/layout-land/photo_module_content.xml | 4 ++--
 res/layout-land/video_module.xml         | 2 +-
 res/layout-port/photo_module_content.xml | 2 +-
 res/layout-port/video_module.xml         | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/res/layout-land/photo_module_content.xml b/res/layout-land/photo_module_content.xml
index 2afcf4081..d734f8329 100644
--- a/res/layout-land/photo_module_content.xml
+++ b/res/layout-land/photo_module_content.xml
@@ -37,14 +37,14 @@
             android:layout_width="80dip"
             android:layout_height="80dip"
             android:layout_marginTop="-5dip"
-             android:layout_marginRight="-2dip"
+            android:layout_marginRight="-2dip"
             android:layout_gravity="top|right"/>
 
 
         <include layout="@layout/review_module_control"
             android:layout_marginRight="2dip" />
 
-        <View
+        <com.android.camera.ui.PieMenuButton
             android:id="@+id/menu"
             style="@style/SwitcherButton"
             android:contentDescription="@string/accessibility_menu_button"
diff --git a/res/layout-land/video_module.xml b/res/layout-land/video_module.xml
index 8dcdc848c..972a7f901 100644
--- a/res/layout-land/video_module.xml
+++ b/res/layout-land/video_module.xml
@@ -45,7 +45,7 @@
         <include layout="@layout/review_module_control"
             android:layout_marginRight="2dip" />
 
-        <View
+        <com.android.camera.ui.PieMenuButton
             android:id="@+id/menu"
             style="@style/SwitcherButton"
             android:layout_alignParentRight="true"
diff --git a/res/layout-port/photo_module_content.xml b/res/layout-port/photo_module_content.xml
index 79438a5d0..a82a7a138 100644
--- a/res/layout-port/photo_module_content.xml
+++ b/res/layout-port/photo_module_content.xml
@@ -43,7 +43,7 @@
         <include layout="@layout/review_module_control"
             android:layout_marginBottom="2dip" />
 
-        <View
+        <com.android.camera.ui.PieMenuButton
             android:id="@+id/menu"
             style="@style/SwitcherButton"
             android:layout_gravity="bottom|right"
diff --git a/res/layout-port/video_module.xml b/res/layout-port/video_module.xml
index 7aedb8c4b..d8a6490d4 100644
--- a/res/layout-port/video_module.xml
+++ b/res/layout-port/video_module.xml
@@ -45,7 +45,7 @@
         <include layout="@layout/review_module_control"
             android:layout_marginBottom="2dip" />
 
-        <View
+        <com.android.camera.ui.PieMenuButton
             android:id="@+id/menu"
             style="@style/SwitcherButton"
             android:contentDescription="@string/accessibility_menu_button"
-- 
2.11.0