Add a black bar symmetric to nav bar

Also fix bug: 8323926
Change-Id: I4886b285dee8ad71ad72a55e96bf699b7c18c9f4

diff --git a/res/layout-port/camera_controls.xml b/res/layout-port/camera_controls.xml
index 7108b3c..aa15da1 100644 (file)
--- a/res/layout-port/camera_controls.xml
+++ b/res/layout-port/camera_controls.xml
@@ -40,7 +40,7 @@
             android:layout_marginBottom="2dip"
             android:contentDescription="@string/accessibility_menu_button" />
 
-       <com.android.camera.ui.CameraSwitcher
+        <com.android.camera.ui.CameraSwitcher
            android:id="@+id/camera_switcher"
            style="@style/SwitcherButton"
            android:layout_gravity="bottom|left"

diff --git a/res/layout/camera_main.xml b/res/layout/camera_main.xml
index 657c06c..710e69d 100644 (file)
--- a/res/layout/camera_main.xml
+++ b/res/layout/camera_main.xml
@@ -25,6 +25,8 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-    <include layout="@layout/camera_controls" />
+    <include layout="@layout/camera_controls"
+        style="@style/CameraControls"
+        android:layout_centerInParent="true" />
 
 </RelativeLayout>
\ No newline at end of file

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index c51b837..d2720d9 100644 (file)
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -88,8 +88,8 @@
     <dimen name="face_circle_stroke">2dip</dimen>
     <dimen name="zoom_font_size">14pt</dimen>
     <dimen name="shutter_offset">-22dp</dimen>
-    <dimen name="margin_systemui_offset">6dip</dimen>
     <dimen name="size_thumbnail">200dip</dimen>
     <dimen name="size_preview">600dip</dimen>
     <dimen name="navigation_bar_height">48dip</dimen>
+    <dimen name="navigation_bar_width">42dip</dimen>
 </resources>