Reduce and equalize account and linked selector heights
Also move the linked selector above the account
header/selector at Yuechen's request
Screeshots: go/b25197021
Bug 25197021
Change-Id: I273aaa87a1cfeb17a9b61e2abff6771fa2b01c50
diff --git a/res/layout-land/compact_contact_editor_fragment.xml b/res/layout-land/compact_contact_editor_fragment.xml
index 24f71cd..09bb5bb 100644
--- a/res/layout-land/compact_contact_editor_fragment.xml
+++ b/res/layout-land/compact_contact_editor_fragment.xml
@@ -43,9 +43,9 @@
android:layout_height="match_parent"
android:orientation="vertical">
+ <include layout="@layout/editor_all_rawcontacts_accounts_selector" />
<include layout="@layout/compact_account_info" />
<include layout="@layout/editor_account_selector" />
- <include layout="@layout/editor_all_rawcontacts_accounts_selector" />
<include layout="@layout/compact_contact_editor_fields"/>
diff --git a/res/layout/compact_account_info.xml b/res/layout/compact_account_info.xml
index 79c581f..43686f3 100644
--- a/res/layout/compact_account_info.xml
+++ b/res/layout/compact_account_info.xml
@@ -21,26 +21,23 @@
android:id="@+id/account_container"
android:layout_height="wrap_content"
android:layout_width="match_parent"
+ android:minHeight="@dimen/editor_min_line_item_height"
android:orientation="horizontal"
android:background="?android:attr/selectableItemBackground"
- android:paddingTop="8dip"
android:visibility="gone"
>
+
<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" />
+ style="@style/EditSelectorIconStyle"/>
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="0dp"
android:layout_weight="1"
- android:paddingBottom="24dp"
- android:paddingTop="24dp"
android:layout_marginStart="@dimen/compact_editor_account_left_margin"
+ android:layout_gravity="center_vertical"
android:orientation="vertical"
>
diff --git a/res/layout/compact_contact_editor_fragment.xml b/res/layout/compact_contact_editor_fragment.xml
index 4d8857b..67e0ca9 100644
--- a/res/layout/compact_contact_editor_fragment.xml
+++ b/res/layout/compact_contact_editor_fragment.xml
@@ -32,9 +32,9 @@
<include layout="@layout/compact_photo_editor_view" />
+ <include layout="@layout/editor_all_rawcontacts_accounts_selector" />
<include layout="@layout/compact_account_info" />
<include layout="@layout/editor_account_selector" />
- <include layout="@layout/editor_all_rawcontacts_accounts_selector" />
<!-- Dummy view so the first input field is not initially focused. b/21644158 -->
<View
diff --git a/res/layout/editor_account_selector.xml b/res/layout/editor_account_selector.xml
index 2f883f2..b3d7eb0 100644
--- a/res/layout/editor_account_selector.xml
+++ b/res/layout/editor_account_selector.xml
@@ -21,23 +21,23 @@
android:id="@+id/account_selector_container"
android:layout_height="wrap_content"
android:layout_width="match_parent"
- android:minHeight="48dip"
- android:layout_marginBottom="@dimen/editor_padding_between_editor_views"
+ android:minHeight="@dimen/editor_min_line_item_height"
android:orientation="horizontal"
- android:paddingTop="16dp"
android:visibility="gone" >
<ImageView
android:id="@+id/kind_icon"
android:src="@drawable/ic_account_circle_black_24dp"
+ android:tint="@color/editor_icon_color"
android:contentDescription="@string/header_account_entry"
- style="@style/EditKindIconStyle" />
+ style="@style/EditSelectorIconStyle"/>
<LinearLayout
android:id="@+id/account"
android:layout_height="wrap_content"
android:layout_width="0dip"
android:layout_weight="1"
+ android:layout_gravity="center_vertical"
android:orientation="vertical"
android:layout_marginEnd="48dp"
style="@android:style/Widget.Material.Spinner.Underlined">
diff --git a/res/layout/editor_all_rawcontacts_accounts_selector.xml b/res/layout/editor_all_rawcontacts_accounts_selector.xml
index 3b17610..f1cbc48 100644
--- a/res/layout/editor_all_rawcontacts_accounts_selector.xml
+++ b/res/layout/editor_all_rawcontacts_accounts_selector.xml
@@ -21,18 +21,14 @@
android:id="@+id/all_rawcontacts_accounts_container"
android:layout_height="wrap_content"
android:layout_width="match_parent"
+ android:minHeight="@dimen/editor_min_line_item_height"
android:orientation="horizontal"
- android:paddingTop="8dip"
- android:paddingBottom="8dip"
- android:gravity="center_vertical"
android:visibility="gone" >
<ImageView
android:src="@drawable/ic_link_grey600_drawable_24dp"
- 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"/>
+ android:tint="@color/editor_icon_color"
+ style="@style/EditSelectorIconStyle"/>
<TextView
android:id="@+id/rawcontacts_accounts_summary"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index ab34001..16bc213 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -17,7 +17,7 @@
<dimen name="account_selector_popup_width">400dip</dimen>
<!-- Account info left margin in Compact editor. -->
- <dimen name="compact_editor_account_left_margin">8dp</dimen>
+ <dimen name="compact_editor_account_left_margin">4dp</dimen>
<!-- Initial height of transparent space above QuickContacts -->
<dimen name="quickcontact_starting_empty_height">150dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 14dfee2..a8dbe0c 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -326,6 +326,16 @@
<item name="android:layout_marginTop">@dimen/editor_kind_icon_top_margin</item>
</style>
+ <style name="EditSelectorIconStyle">
+ <item name="android:layout_width">24dp</item>
+ <item name="android:layout_height">24dp</item>
+ <item name="android:layout_marginStart">16dp</item>
+ <!-- We want 32dp of padding between these icon's and EditText's. Since EditText's have
+ 4dp of starting padding built in, we set this as 28dp. -->
+ <item name="android:layout_marginEnd">28dp</item>
+ <item name="android:layout_marginTop">@dimen/editor_kind_icon_top_margin</item>
+ </style>
+
<style name="AccountTypeIconStyle">
<item name="android:layout_width">12dp</item>
<item name="android:layout_height">12dp</item>