diff options
| author | Walter Jang <wjang@google.com> | 2014-11-04 23:38:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-04 23:38:40 +0000 |
| commit | 27a9082457b9b23ddcc7bb8284df7c9f0282876b (patch) | |
| tree | 6bcb18ba9488afa28d4542fe4b0a662c8fb74a18 | |
| parent | 935c59859ec70039031f4bee6d9bd678c9e56153 (diff) | |
| parent | 2597755882573d9724eb12804e44a773b6af4df4 (diff) | |
| download | packages_apps_Contacts-27a9082457b9b23ddcc7bb8284df7c9f0282876b.tar.gz packages_apps_Contacts-27a9082457b9b23ddcc7bb8284df7c9f0282876b.tar.bz2 packages_apps_Contacts-27a9082457b9b23ddcc7bb8284df7c9f0282876b.zip | |
am 25977558: am 3b101dcc: Merge "Fix edit contact background on nexus 9" into lmp-mr1-dev
* commit '2597755882573d9724eb12804e44a773b6af4df4':
Fix edit contact background on nexus 9
| -rw-r--r-- | res/layout-sw600dp-land/contact_editor_activity.xml | 1 | ||||
| -rw-r--r-- | res/layout-sw720dp/contact_editor_activity.xml | 50 |
2 files changed, 51 insertions, 0 deletions
diff --git a/res/layout-sw600dp-land/contact_editor_activity.xml b/res/layout-sw600dp-land/contact_editor_activity.xml index 83ad4ddcb..4eb2d0c7e 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 000000000..b31171fc5 --- /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> |