Add background to camera controls

  Bug: 7334946

Change-Id: I479bd52c27214009532aab136919c20ff01f1728

16 files changed, 32 insertions, 27 deletions

diff --git a/res/drawable-land-hdpi/switcher_bg.9.png b/res/drawable-land-hdpi/switcher_bg.9.png
new file mode 100644
index 00000000..dad08d49
--- /dev/null
+++ b/res/drawable-land-hdpi/switcher_bg.9.png
diff --git a/res/drawable-land-mdpi/switcher_bg.9.png b/res/drawable-land-mdpi/switcher_bg.9.png
new file mode 100644
index 00000000..20736864
--- /dev/null
+++ b/res/drawable-land-mdpi/switcher_bg.9.png
diff --git a/res/drawable-land-xhdpi/switcher_bg.9.png b/res/drawable-land-xhdpi/switcher_bg.9.png
new file mode 100644
index 00000000..a726dc8f
--- /dev/null
+++ b/res/drawable-land-xhdpi/switcher_bg.9.png
diff --git a/res/drawable-port-hdpi/switcher_bg.9.png b/res/drawable-port-hdpi/switcher_bg.9.png
new file mode 100644
index 00000000..e6b74a4d
--- /dev/null
+++ b/res/drawable-port-hdpi/switcher_bg.9.png
diff --git a/res/drawable-port-mdpi/switcher_bg.9.png b/res/drawable-port-mdpi/switcher_bg.9.png
new file mode 100644
index 00000000..6c87aa36
--- /dev/null
+++ b/res/drawable-port-mdpi/switcher_bg.9.png
diff --git a/res/drawable-port-xhdpi/switcher_bg.9.png b/res/drawable-port-xhdpi/switcher_bg.9.png
new file mode 100644
index 00000000..bbe21ba3
--- /dev/null
+++ b/res/drawable-port-xhdpi/switcher_bg.9.png
diff --git a/res/drawable-sw600dp-land-hdpi/switcher_bg.9.png b/res/drawable-sw600dp-land-hdpi/switcher_bg.9.png
new file mode 100644
index 00000000..21375b1d
--- /dev/null
+++ b/res/drawable-sw600dp-land-hdpi/switcher_bg.9.png
diff --git a/res/drawable-sw600dp-land-mdpi/switcher_bg.9.png b/res/drawable-sw600dp-land-mdpi/switcher_bg.9.png
new file mode 100644
index 00000000..bfd996a4
--- /dev/null
+++ b/res/drawable-sw600dp-land-mdpi/switcher_bg.9.png
diff --git a/res/drawable-sw600dp-land-xhdpi/switcher_bg.9.png b/res/drawable-sw600dp-land-xhdpi/switcher_bg.9.png
new file mode 100644
index 00000000..35a71db8
--- /dev/null
+++ b/res/drawable-sw600dp-land-xhdpi/switcher_bg.9.png
diff --git a/res/drawable-sw600dp-port-hdpi/switcher_bg.9.png b/res/drawable-sw600dp-port-hdpi/switcher_bg.9.png
new file mode 100644
index 00000000..250276aa
--- /dev/null
+++ b/res/drawable-sw600dp-port-hdpi/switcher_bg.9.png
diff --git a/res/drawable-sw600dp-port-mdpi/switcher_bg.9.png b/res/drawable-sw600dp-port-mdpi/switcher_bg.9.png
new file mode 100644
index 00000000..9c4e293b
--- /dev/null
+++ b/res/drawable-sw600dp-port-mdpi/switcher_bg.9.png
diff --git a/res/drawable-sw600dp-port-xhdpi/switcher_bg.9.png b/res/drawable-sw600dp-port-xhdpi/switcher_bg.9.png
new file mode 100644
index 00000000..2d0171eb
--- /dev/null
+++ b/res/drawable-sw600dp-port-xhdpi/switcher_bg.9.png
diff --git a/res/layout-land/photo_module.xml b/res/layout-land/photo_module.xml
index 24a8a8c4..3cce6ca9 100644
--- a/res/layout-land/photo_module.xml
+++ b/res/layout-land/photo_module.xml
@@ -25,6 +25,14 @@
         style="@style/CameraControls"
         android:layout_gravity="center" >
 
+        <View
+            android:id="@+id/blocker"
+            android:layout_height="match_parent"
+            android:layout_width="@dimen/switcher_size"
+            android:background="@drawable/switcher_bg"
+            android:clickable="true"
+            android:layout_gravity="right" />
+
         <include layout="@layout/menu_indicators"
             android:layout_width="80dip"
             android:layout_height="80dip"
@@ -32,12 +40,6 @@
              android:layout_marginRight="-2dip"
             android:layout_gravity="top|right"/>
 
-        <View
-            android:id="@+id/blocker"
-            android:layout_height="match_parent"
-            android:layout_width="@dimen/switcher_size"
-            android:clickable="true"
-            android:layout_gravity="right" />
 
         <include layout="@layout/review_module_control"/>
 
diff --git a/res/layout-land/video_module.xml b/res/layout-land/video_module.xml
index baf9fe97..96cc0815 100644
--- a/res/layout-land/video_module.xml
+++ b/res/layout-land/video_module.xml
@@ -24,6 +24,14 @@
         style="@style/CameraControls"
         android:layout_centerVertical="true" >
 
+        <View
+            android:id="@+id/blocker"
+            android:layout_width="@dimen/switcher_size"
+            android:layout_height="match_parent"
+            android:background="@drawable/switcher_bg"
+            android:layout_alignParentRight="true"
+            android:clickable="true" />
+
         <include layout="@layout/menu_indicators"
             android:layout_width="80dip"
             android:layout_height="80dip"
@@ -32,13 +40,6 @@
             android:layout_marginRight="-2dip"
             android:layout_marginTop="-5dip" />
 
-        <View
-            android:id="@+id/blocker"
-            android:layout_width="@dimen/switcher_size"
-            android:layout_height="match_parent"
-            android:layout_alignParentRight="true"
-            android:clickable="true" />
-
         <include layout="@layout/bg_replacement_training_message" />
 
         <include layout="@layout/review_module_control" />
diff --git a/res/layout-port/photo_module.xml b/res/layout-port/photo_module.xml
index 91095dbf..893945f4 100644
--- a/res/layout-port/photo_module.xml
+++ b/res/layout-port/photo_module.xml
@@ -25,20 +25,21 @@
         style="@style/CameraControls"
         android:layout_gravity="center" >
 
-        <include layout="@layout/menu_indicators"
-            android:layout_width="80dip"
-            android:layout_height="80dip"
-            android:layout_gravity="bottom|right"
-            android:layout_marginBottom="-2dip"
-            android:layout_marginRight="-5dip" />
-
         <View
             android:id="@+id/blocker"
             android:layout_width="match_parent"
             android:layout_height="@dimen/switcher_size"
             android:layout_gravity="bottom"
+            android:background="@drawable/switcher_bg"
             android:clickable="true" />
 
+        <include layout="@layout/menu_indicators"
+            android:layout_width="80dip"
+            android:layout_height="80dip"
+            android:layout_gravity="bottom|right"
+            android:layout_marginBottom="-2dip"
+            android:layout_marginRight="-5dip" />
+
         <include layout="@layout/review_module_control" />
 
         <View
diff --git a/res/layout-port/video_module.xml b/res/layout-port/video_module.xml
index 271ce1ee..9282e321 100644
--- a/res/layout-port/video_module.xml
+++ b/res/layout-port/video_module.xml
@@ -24,6 +24,14 @@
         style="@style/CameraControls"
         android:layout_centerHorizontal="true" >
 
+        <View
+            android:id="@+id/blocker"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/switcher_size"
+            android:background="@drawable/switcher_bg"
+            android:clickable="true"
+            android:layout_alignParentBottom="true" />
+
         <include layout="@layout/menu_indicators"
             android:layout_width="80dip"
             android:layout_height="80dip"
@@ -32,13 +40,6 @@
             android:layout_alignParentBottom="true"
             android:layout_alignParentRight="true" />
 
-        <View
-            android:id="@+id/blocker"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/switcher_size"
-            android:clickable="true"
-            android:layout_alignParentBottom="true" />
-
         <include layout="@layout/bg_replacement_training_message"/>
         <include layout="@layout/review_module_control"/>