Merge "Enhancing keyboard navigation performance" into nyc-dev
diff --git a/res/layout/compact_contact_editor_fields.xml b/res/layout/compact_contact_editor_fields.xml
index 6dbd2c3..1d91448 100644
--- a/res/layout/compact_contact_editor_fields.xml
+++ b/res/layout/compact_contact_editor_fields.xml
@@ -26,6 +26,7 @@
<LinearLayout
style="@style/SelectableItem"
android:id="@+id/more_fields"
+ android:focusable="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
diff --git a/res/layout/compact_contact_editor_fragment.xml b/res/layout/compact_contact_editor_fragment.xml
index 67e0ca9..1e134e0 100644
--- a/res/layout/compact_contact_editor_fragment.xml
+++ b/res/layout/compact_contact_editor_fragment.xml
@@ -32,17 +32,17 @@
<include layout="@layout/compact_photo_editor_view" />
+ <!-- Dummy view so the first input field is not initially focused. b/21644158 -->
+ <View
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:focusable="true"
+ android:focusableInTouchMode="true"/>
+
<include layout="@layout/editor_all_rawcontacts_accounts_selector" />
<include layout="@layout/compact_account_info" />
<include layout="@layout/editor_account_selector" />
- <!-- Dummy view so the first input field is not initially focused. b/21644158 -->
- <View
- android:layout_width="0dp"
- android:layout_height="0dp"
- android:focusable="true"
- android:focusableInTouchMode="true"/>
-
<include layout="@layout/compact_contact_editor_fields" />
</com.android.contacts.editor.CompactRawContactsEditorView>
diff --git a/res/layout/editor_account_selector.xml b/res/layout/editor_account_selector.xml
index a752ec5..dcd0e28 100644
--- a/res/layout/editor_account_selector.xml
+++ b/res/layout/editor_account_selector.xml
@@ -17,14 +17,15 @@
<!-- Header at the top of a raw contact editor. This allows users to change the account that
the raw contact is saved in. -->
<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/account_selector_container"
- android:layout_height="wrap_content"
- android:layout_width="match_parent"
- android:minHeight="@dimen/editor_min_line_item_height"
- android:orientation="horizontal"
- android:layout_marginBottom="@dimen/compact_editor_name_top_margin"
- android:visibility="gone" >
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/account_selector_container"
+ android:focusable="true"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:minHeight="@dimen/editor_min_line_item_height"
+ android:orientation="horizontal"
+ android:layout_marginBottom="@dimen/compact_editor_name_top_margin"
+ android:visibility="gone">
<ImageView
android:id="@+id/kind_icon"
@@ -41,8 +42,7 @@
android:layout_gravity="center_vertical"
android:orientation="vertical"
android:layout_marginStart="4dp"
- android:layout_marginEnd="48dp"
- >
+ android:layout_marginEnd="48dp">
<TextView
android:id="@+id/account_type_selector"