diff options
| author | Doris Liu <tianliu@google.com> | 2013-03-06 03:47:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-06 03:47:14 +0000 |
| commit | eb32d4464abc9c788fa380272f0e3e43275e35b6 (patch) | |
| tree | dda71af94d4be17f1b77d9a6c7321f9dbadcab10 /res | |
| parent | 9a9dba70e7aa9f5cae7838d9ec11e142b346d78b (diff) | |
| parent | 7f24b3a94a723327ce9c2fcd5bb437cb9a0c5b77 (diff) | |
| download | android_packages_apps_Snap-eb32d4464abc9c788fa380272f0e3e43275e35b6.tar.gz android_packages_apps_Snap-eb32d4464abc9c788fa380272f0e3e43275e35b6.tar.bz2 android_packages_apps_Snap-eb32d4464abc9c788fa380272f0e3e43275e35b6.zip | |
Merge "Add a black bar symmetric to nav bar" into gb-ub-photos-bryce
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-port/camera_controls.xml | 2 | ||||
| -rw-r--r-- | res/layout/camera_main.xml | 4 | ||||
| -rw-r--r-- | res/values/dimens.xml | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/res/layout-port/camera_controls.xml b/res/layout-port/camera_controls.xml index 7108b3c16..aa15da1ca 100644 --- 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 657c06c1a..710e69dbf 100644 --- 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 c51b8375a..d2720d966 100644 --- 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> |