Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb936141 authored by Michael Kolb's avatar Michael Kolb Committed by Android (Google) Code Review
Browse files

Merge "Fix layout and preview for tablets" into gb-ub-photos-bryce

parents 32aa7da8 f2c86c12

res/layout-land/camera_controls.xml

+2 −2
Original line number Diff line number Diff line
@@ -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"

res/layout-port/camera_controls.xml

+2 −2
Original line number Diff line number Diff line
@@ -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"

res/layout/camera_main.xml

+1 −3
Original line number Diff line number Diff line
@@ -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

res/values-sw600dp-land/styles.xml

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
<?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>

res/values-sw600dp-port/styles.xml

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
<?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>