am 2d3f31c2: Show account info for inserts and read-only contact edits

* commit '2d3f31c210ffc617e82e3b41fc32b54ec2a5011a':
  Show account info for inserts and read-only contact edits

3 files changed, 63 insertions, 0 deletions

diff --git a/res/layout-land/compact_contact_editor_fragment.xml b/res/layout-land/compact_contact_editor_fragment.xml
index 12445cd23..3ecd40a8a 100644
--- a/res/layout-land/compact_contact_editor_fragment.xml
+++ b/res/layout-land/compact_contact_editor_fragment.xml
@@ -43,6 +43,8 @@
                 android:layout_height="match_parent"
                 android:orientation="vertical">
 
+            <include layout="@layout/compact_account_info" />
+
             <include layout="@layout/compact_contact_editor_fields"/>
 
         </LinearLayout>
diff --git a/res/layout/compact_account_info.xml b/res/layout/compact_account_info.xml
new file mode 100644
index 000000000..7fad5660f
--- /dev/null
+++ b/res/layout/compact_account_info.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 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.
+-->
+
+<!-- Copy of editor_account_header_expandable, but w/o the expand account button. -->
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/account_container"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:background="?android:attr/selectableItemBackground"
+        android:paddingStart="16dp"
+        >
+
+    <LinearLayout
+            android:layout_height="wrap_content"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:paddingBottom="24dp"
+            android:paddingTop="24dp"
+            android:orientation="vertical"
+            >
+
+        <TextView
+                android:id="@+id/account_type"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textSize="16sp"
+                android:singleLine="true"
+                android:textColor="@color/primary_text_color"
+                android:ellipsize="end"
+                />
+
+        <TextView
+                android:id="@+id/account_name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textSize="14sp"
+                android:singleLine="true"
+                android:textColor="@color/secondary_text_color"
+                android:ellipsize="end"
+                />
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/compact_contact_editor_fragment.xml b/res/layout/compact_contact_editor_fragment.xml
index 76b7be3a8..2dd65aee2 100644
--- a/res/layout/compact_contact_editor_fragment.xml
+++ b/res/layout/compact_contact_editor_fragment.xml
@@ -32,6 +32,8 @@
 
         <include layout="@layout/compact_photo_editor_view" />
 
+        <include layout="@layout/compact_account_info" />
+
         <!-- Dummy view so the first input field is not initially focused. b/21644158 -->
         <View
                 android:layout_width="0dp"