Fix bugs on Contact editor.
1) Remove primary photo checkbox in full editor. Primary photo should
be set in photo picker.
2) Remove save menu if there's only one read only contact in the full editor.
3) Add account type icon in account info when there's only one account
for a contact.
4) Return back to Compact editor after saving results in full editor.
BUG 24547289
Change-Id: I02f8ee01f7cc7d1b0b06ad338570dc4b17c55e31
diff --git a/res/layout/compact_account_info.xml b/res/layout/compact_account_info.xml
index 7fad566..1ec1179 100644
--- a/res/layout/compact_account_info.xml
+++ b/res/layout/compact_account_info.xml
@@ -21,10 +21,18 @@
android:id="@+id/account_container"
android:layout_height="wrap_content"
android:layout_width="match_parent"
+ android:orientation="horizontal"
android:background="?android:attr/selectableItemBackground"
- android:paddingStart="16dp"
+ android:paddingTop="8dip"
>
+ <ImageView
+ android:id="@+id/account_type_icon"
+ android:layout_width="@dimen/detail_network_icon_size"
+ android:layout_height="@dimen/detail_network_icon_size"
+ android:layout_margin="16dip"
+ android:layout_gravity="center_vertical" />
+
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="0dp"