Merge "Fix layout and preview for tablets" into gb-ub-photos-bryce
diff --git a/res/layout-land/camera_controls.xml b/res/layout-land/camera_controls.xml
index 04841a0..96f593a 100644
--- a/res/layout-land/camera_controls.xml
+++ b/res/layout-land/camera_controls.xml
@@ -16,8 +16,8 @@
<com.android.camera.ui.CameraControls
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/camera_controls"
- style="@style/CameraControls"
- android:layout_gravity="center" >
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
<View
android:id="@+id/blocker"
diff --git a/res/layout-port/camera_controls.xml b/res/layout-port/camera_controls.xml
index 4ed9e63..ebbdf26 100644
--- a/res/layout-port/camera_controls.xml
+++ b/res/layout-port/camera_controls.xml
@@ -16,8 +16,8 @@
<com.android.camera.ui.CameraControls
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/camera_controls"
- style="@style/CameraControls"
- android:layout_gravity="center" >
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
<View
android:id="@+id/blocker"
diff --git a/res/layout/camera_main.xml b/res/layout/camera_main.xml
index fe59134..99befc0 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
diff --git a/res/values-sw600dp-land/styles.xml b/res/values-sw600dp-land/styles.xml
deleted file mode 100644
index 12e45a9..0000000
--- a/res/values-sw600dp-land/styles.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
- <style name="CameraControls">
- <item name="android:layout_width">match_parent</item>
- <item name="android:layout_height">520dp</item>
- </style>
-</resources>
diff --git a/res/values-sw600dp-port/styles.xml b/res/values-sw600dp-port/styles.xml
deleted file mode 100644
index d6eca66..0000000
--- a/res/values-sw600dp-port/styles.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
- <style name="CameraControls">
- <item name="android:layout_height">match_parent</item>
- <item name="android:layout_width">520dp</item>
- </style>
-</resources>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index 59d86d9..5ec2f19 100644
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -21,5 +21,6 @@
<dimen name="onscreen_indicators_height">@dimen/onscreen_indicators_height_large</dimen>
<dimen name="shutter_offset">-33dp</dimen>
<dimen name="capture_size">80dip</dimen>
- <dimen name="capture_top_margin">16dip</dimen>
+ <dimen name="capture_margin_top">16dip</dimen>
+ <dimen name="camera_controls_size">520dip</dimen>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 5719416..a1e2370 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -100,4 +100,5 @@
<dimen name="capture_size">48dip</dimen>
<dimen name="capture_margin_right">16dip</dimen>
<dimen name="capture_margin_top">16dip</dimen>
+ <dimen name="camera_controls_size">0dip</dimen>
</resources>