diff options
| author | Michael Kolb <kolby@google.com> | 2013-05-01 14:50:04 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-01 14:50:04 -0700 |
| commit | 4c273c0343e885409ecf9c692fd5da5ad308cec4 (patch) | |
| tree | 2f8f12879fa68c5bd9e1352697c66e9928f207f4 /res/layout | |
| parent | 8656a5970e793d76c5de2379ddef75eb6a270ec0 (diff) | |
| parent | fb9361419abfac7f893674bb6f4d1b1f8ab1f677 (diff) | |
| download | android_packages_apps_Gallery2-4c273c0343e885409ecf9c692fd5da5ad308cec4.tar.gz android_packages_apps_Gallery2-4c273c0343e885409ecf9c692fd5da5ad308cec4.tar.bz2 android_packages_apps_Gallery2-4c273c0343e885409ecf9c692fd5da5ad308cec4.zip | |
am fb936141: Merge "Fix layout and preview for tablets" into gb-ub-photos-bryce
* commit 'fb9361419abfac7f893674bb6f4d1b1f8ab1f677':
Fix layout and preview for tablets
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/camera_main.xml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/res/layout/camera_main.xml b/res/layout/camera_main.xml index fe5913427..99befc08a 100644 --- a/res/layout/camera_main.xml +++ b/res/layout/camera_main.xml @@ -26,8 +26,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - <include layout="@layout/camera_controls" - style="@style/CameraControls" - android:layout_centerInParent="true" /> + <include layout="@layout/camera_controls" /> </com.android.camera.ui.CameraRootView>
\ No newline at end of file |