summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorDoris Liu <tianliu@google.com>2013-06-04 15:12:55 -0700
committerDoris Liu <tianliu@google.com>2013-06-04 15:12:55 -0700
commita47edf8fdde5e6b7ffc11ae71e61da8e82fd2f47 (patch)
tree62602796dc7142c57722f2dfc0c3e82bae913cd0 /res
parent366c1307e4cb8e0bcc7d7791d483e2b1e4a570b9 (diff)
downloadandroid_packages_apps_Snap-a47edf8fdde5e6b7ffc11ae71e61da8e82fd2f47.tar.gz
android_packages_apps_Snap-a47edf8fdde5e6b7ffc11ae71e61da8e82fd2f47.tar.bz2
android_packages_apps_Snap-a47edf8fdde5e6b7ffc11ae71e61da8e82fd2f47.zip
Remove the frameLayout wrapping CameraRootView
Change-Id: I5a238766b54d3f36c929c53225367cddf90473f9
Diffstat (limited to 'res')
-rw-r--r--res/layout/camera.xml14
1 files changed, 4 insertions, 10 deletions
diff --git a/res/layout/camera.xml b/res/layout/camera.xml
index b4ec436c6..d91799038 100644
--- a/res/layout/camera.xml
+++ b/res/layout/camera.xml
@@ -13,15 +13,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.camera.ui.NewCameraRootView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/camera_app_root"
android:layout_width="match_parent"
android:layout_height="match_parent" >
- <!-- NewCameraRootView needs to be in a FrameLayout to set margins
- in the layout parameters. -->
- <com.android.camera.ui.NewCameraRootView
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/camera_app_root"
- android:layout_width="match_parent"
- android:layout_height="match_parent" >
- </com.android.camera.ui.NewCameraRootView>
-</FrameLayout>
+</com.android.camera.ui.NewCameraRootView>