Move CameraPicker into IndicatorControl.

+Move the CameraPicker icon to IndicatorBar for Phone UI.

Change-Id: I2ab75166586adb6a029b4cf1b3f19604526dd818

9 files changed, 0 insertions, 17 deletions

diff --git a/res/drawable-hdpi/btn_close_settings.png b/res/drawable-hdpi/btn_close_settings.png
index 3774aea..96e65bc 100644
--- a/res/drawable-hdpi/btn_close_settings.png
+++ b/res/drawable-hdpi/btn_close_settings.png
diff --git a/res/drawable-hdpi/btn_zoom_control.png b/res/drawable-hdpi/btn_zoom_control.png
index b9c1c98..3229530 100644
--- a/res/drawable-hdpi/btn_zoom_control.png
+++ b/res/drawable-hdpi/btn_zoom_control.png
diff --git a/res/drawable-mdpi/btn_close_settings.png b/res/drawable-mdpi/btn_close_settings.png
new file mode 100644
index 0000000..4a04aa5
--- /dev/null
+++ b/res/drawable-mdpi/btn_close_settings.png
diff --git a/res/drawable-mdpi/btn_zoom_control.png b/res/drawable-mdpi/btn_zoom_control.png
new file mode 100644
index 0000000..001793e
--- /dev/null
+++ b/res/drawable-mdpi/btn_zoom_control.png
diff --git a/res/drawable-xhdpi/btn_close_settings.png b/res/drawable-xhdpi/btn_close_settings.png
new file mode 100644
index 0000000..d252c65
--- /dev/null
+++ b/res/drawable-xhdpi/btn_close_settings.png
diff --git a/res/drawable-xhdpi/btn_zoom_control.png b/res/drawable-xhdpi/btn_zoom_control.png
new file mode 100644
index 0000000..4287fd4
--- /dev/null
+++ b/res/drawable-xhdpi/btn_zoom_control.png
diff --git a/res/layout-w1024dp/camera_control.xml b/res/layout-w1024dp/camera_control.xml
index 8008adb..2ce91b6 100644
--- a/res/layout-w1024dp/camera_control.xml
+++ b/res/layout-w1024dp/camera_control.xml
@@ -53,11 +53,6 @@
                     android:layout_height="wrap_content"
                     android:src="@drawable/btn_zoom_out"
                     android:visibility="gone" />
-
-            <com.android.camera.ui.CameraPicker android:id="@+id/camera_picker"
-                    android:clickable="true"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
         </com.android.camera.ui.IndicatorWheel>
 
         <com.android.camera.ui.ZoomPicker
diff --git a/res/layout/camera_control.xml b/res/layout/camera_control.xml
index ea9c3fe..801b173 100644
--- a/res/layout/camera_control.xml
+++ b/res/layout/camera_control.xml
@@ -23,16 +23,6 @@
 
     <include layout="@layout/review_thumbnail"/>
 
-    <com.android.camera.ui.CameraPicker android:id="@+id/camera_picker"
-            android:clickable="true"
-            android:layout_centerVertical="true"
-            android:layout_centerHorizontal="true"
-            android:layout_below="@+id/share_button"
-            android:layout_above="@+id/shutter_button"
-            android:layout_width="36dp"
-            android:layout_height="36dp" />
-    <!-- need fixed size of the view since the source icon(HDPI) will be too large for phones -->
-
     <com.android.camera.ShutterButton android:id="@+id/shutter_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/res/layout/indicator_bar.xml b/res/layout/indicator_bar.xml
index b3d8c09..e57cf45 100644
--- a/res/layout/indicator_bar.xml
+++ b/res/layout/indicator_bar.xml
@@ -17,9 +17,7 @@
         android:id="@+id/indicator_control"
         android:layout_width="48dp"
         android:layout_height="match_parent"
-        android:layout_marginTop="6dp"
         android:layout_marginRight="6dp"
-        android:layout_marginBottom="6dp"
         android:clickable="true"
         android:layout_alignParentRight="true">
     <com.android.camera.ui.IndicatorBar