summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorWalter Jang <wjang@google.com>2015-04-02 10:26:56 -0700
committerWalter Jang <wjang@google.com>2015-04-03 13:21:40 -0700
commita69f58fcf5c143ac7dd6421a30004d56813e321a (patch)
tree891eeec9362b2bbe4145571d5c40ba627ffb1c6e /res/layout
parent511561dd8ef9e6cac3c62e138193ef48e6d79760 (diff)
downloadandroid_packages_apps_Contacts-a69f58fcf5c143ac7dd6421a30004d56813e321a.tar.gz
android_packages_apps_Contacts-a69f58fcf5c143ac7dd6421a30004d56813e321a.tar.bz2
android_packages_apps_Contacts-a69f58fcf5c143ac7dd6421a30004d56813e321a.zip
Don't add compact editor fragment if it's already there
Bug 20040887 Change-Id: Ib968203e0340cd442e5652376a9e2aa7347994b1
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/compact_contact_editor_activity.xml10
-rw-r--r--res/layout/compact_contact_editor_fragment.xml1
2 files changed, 3 insertions, 8 deletions
diff --git a/res/layout/compact_contact_editor_activity.xml b/res/layout/compact_contact_editor_activity.xml
index bb89d0135..db847b011 100644
--- a/res/layout/compact_contact_editor_activity.xml
+++ b/res/layout/compact_contact_editor_activity.xml
@@ -16,13 +16,7 @@
-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/compact_contact_editor_fragment_container"
android:layout_width="match_parent"
- android:layout_height="match_parent">
-
- <fragment android:id="@+id/compact_contact_editor_fragment"
- class="com.android.contacts.editor.CompactContactEditorFragment"
- android:layout_width="match_parent"
- android:layout_height="match_parent" />
-
-</FrameLayout>
+ android:layout_height="match_parent"/>
diff --git a/res/layout/compact_contact_editor_fragment.xml b/res/layout/compact_contact_editor_fragment.xml
index a6cda4c2a..696f8db95 100644
--- a/res/layout/compact_contact_editor_fragment.xml
+++ b/res/layout/compact_contact_editor_fragment.xml
@@ -16,6 +16,7 @@
-->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/compact_contact_editor_fragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background_primary"