Merge "Fix edit contact background on nexus 9" into lmp-mr1-dev
diff --git a/res/layout-sw600dp-land/contact_editor_activity.xml b/res/layout-sw600dp-land/contact_editor_activity.xml
index 83ad4dd..4eb2d0c 100644
--- a/res/layout-sw600dp-land/contact_editor_activity.xml
+++ b/res/layout-sw600dp-land/contact_editor_activity.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
+<!-- This should be kept in sync with layout-sw720dp/contact_editor_activity.xml -->
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
diff --git a/res/layout-sw720dp/contact_editor_activity.xml b/res/layout-sw720dp/contact_editor_activity.xml
new file mode 100644
index 0000000..b31171f
--- /dev/null
+++ b/res/layout-sw720dp/contact_editor_activity.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.
+-->
+
+<!-- This should be kept in sync with layout-sw600dp-land/contact_editor_activity.xml -->
+<ScrollView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:fillViewport="true">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:baselineAligned="false">
+
+ <!-- Empty view to represent the left margin -->
+ <View
+ android:layout_height="match_parent"
+ android:layout_width="0dip"
+ android:layout_weight="@integer/contact_list_space_layout_weight" />
+
+ <fragment class="com.android.contacts.editor.ContactEditorFragment"
+ android:id="@+id/contact_editor_fragment"
+ android:layout_width="0dip"
+ android:layout_weight="@integer/contact_list_card_layout_weight"
+ android:layout_height="match_parent"/>
+
+ <!-- Empty view to represent the right margin -->
+ <View
+ android:layout_height="match_parent"
+ android:layout_width="0dip"
+ android:layout_weight="@integer/contact_list_space_layout_weight" />
+
+ </LinearLayout>
+
+</ScrollView>