Divide contact list in alphabetical order

Bug: 136092746
Test: Manually
Change-Id: I697279440214a11b4128318d42c9bbda82df0c6a

3 files changed, 119 insertions, 72 deletions

diff --git a/res/layout/contact_list_item.xml b/res/layout/contact_list_item.xml
index e106ab2f..2dafe57b 100644
--- a/res/layout/contact_list_item.xml
+++ b/res/layout/contact_list_item.xml
@@ -18,85 +18,26 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/contact_list_item_height">
-
-    <androidx.constraintlayout.widget.Guideline
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/contact_list_guideline_begin"
-        android:orientation="vertical"
-        app:layout_constraintGuide_begin="@dimen/contact_list_guideline_begin"/>
-
-    <androidx.constraintlayout.widget.Guideline
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/contact_list_guideline_end"
-        android:orientation="vertical"
-        app:layout_constraintGuide_end="@dimen/contact_list_guideline_end"/>
-
-    <View
-        android:id="@+id/call_action_id"
-        android:background="?android:attr/selectableItemBackground"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/contact_list_guideline_end"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"/>
-
-    <ImageView
-        android:id="@+id/icon"
-        android:layout_width="@dimen/avatar_icon_size"
-        android:layout_height="@dimen/avatar_icon_size"
-        android:layout_marginStart="@dimen/contact_list_item_padding"
-        android:scaleType="centerCrop"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"/>
+    android:layout_height="wrap_content">
 
     <TextView
-        android:id="@+id/title"
-        android:layout_width="0dp"
+        android:id="@+id/header"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/contact_list_text_margin_end"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:singleLine="true"
-        app:layout_constraintVertical_chainStyle="packed"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/text"
-        app:layout_constraintStart_toStartOf="@id/contact_list_guideline_begin"
-        app:layout_constraintEnd_toEndOf="@id/contact_list_guideline_end"/>
-
-    <TextView
-        android:id="@id/text"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/contact_list_text_margin_end"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:singleLine="true"
-        app:layout_constraintTop_toBottomOf="@id/title"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="@id/contact_list_guideline_begin"
-        app:layout_constraintEnd_toEndOf="@id/contact_list_guideline_end"/>
+        app:layout_constraintBottom_toTopOf="@+id/user_profile_container"
+        app:layout_constraintStart_toStartOf="parent"/>
 
-    <ImageView
-        android:id="@+id/show_contact_detail_id"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:src="@drawable/ic_arrow_right"
-        android:scaleType="center"
-        android:tint="@color/secondary_icon_color"
-        android:background="?android:attr/selectableItemBackground"
-        app:layout_constraintTop_toTopOf="parent"
+    <include
+        layout="@layout/contact_user_profile"
+        android:id="@+id/user_profile_container"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/contact_list_item_height"
+        app:layout_constraintTop_toBottomOf="@id/header"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@id/contact_list_guideline_end"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"/>
 
-    <View
-        android:layout_width="@dimen/vertical_divider_width"
-        android:layout_height="match_parent"
-        android:background="@color/divider_color"
-        android:layout_marginTop="@dimen/vertical_divider_inset"
-        android:layout_marginBottom="@dimen/vertical_divider_inset"
-        app:layout_constraintStart_toStartOf="@id/contact_list_guideline_end"/>
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/res/layout/contact_user_profile.xml b/res/layout/contact_user_profile.xml
new file mode 100644
index 00000000..aa6e1d8f
--- /dev/null
+++ b/res/layout/contact_user_profile.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 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.
+-->
+
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.constraintlayout.widget.Guideline
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/contact_list_guideline_begin"
+        android:orientation="vertical"
+        app:layout_constraintGuide_begin="@dimen/contact_list_guideline_begin"/>
+
+    <androidx.constraintlayout.widget.Guideline
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/contact_list_guideline_end"
+        android:orientation="vertical"
+        app:layout_constraintGuide_end="@dimen/contact_list_guideline_end"/>
+
+    <View
+        android:id="@+id/call_action_id"
+        android:background="?android:attr/selectableItemBackground"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/contact_list_guideline_end"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"/>
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="@dimen/avatar_icon_size"
+        android:layout_height="@dimen/avatar_icon_size"
+        android:layout_marginStart="@dimen/contact_list_item_padding"
+        android:scaleType="centerCrop"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"/>
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/contact_list_text_margin_end"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:singleLine="true"
+        app:layout_constraintVertical_chainStyle="packed"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/text"
+        app:layout_constraintStart_toStartOf="@id/contact_list_guideline_begin"
+        app:layout_constraintEnd_toEndOf="@id/contact_list_guideline_end"/>
+
+    <TextView
+        android:id="@id/text"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/contact_list_text_margin_end"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:singleLine="true"
+        app:layout_constraintTop_toBottomOf="@id/title"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="@id/contact_list_guideline_begin"
+        app:layout_constraintEnd_toEndOf="@id/contact_list_guideline_end"/>
+
+    <ImageView
+        android:id="@+id/show_contact_detail_id"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:src="@drawable/ic_arrow_right"
+        android:scaleType="center"
+        android:tint="@color/secondary_icon_color"
+        android:background="?android:attr/selectableItemBackground"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toEndOf="@id/contact_list_guideline_end"
+        app:layout_constraintEnd_toEndOf="parent"/>
+
+    <View
+        android:layout_width="@dimen/vertical_divider_width"
+        android:layout_height="match_parent"
+        android:background="@color/divider_color"
+        android:layout_marginTop="@dimen/vertical_divider_inset"
+        android:layout_marginBottom="@dimen/vertical_divider_inset"
+        app:layout_constraintStart_toStartOf="@id/contact_list_guideline_end"/>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 15b06981..905c5ebd 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -145,6 +145,10 @@
     <!-- Text to show the call is onhold [CHAR LIMIT=40]-->
     <string name="onhold_call_label">On Hold</string>
 
+    <!-- Contact list headers -->
+    <!-- Contact list label for contact names starting with special characters -->
+    <string name="header_for_type_other" translatable="false">&#8230;</string>
+
     <!-- Dialer Setting -->
     <!-- Title of the settings page [CHAR LIMIT=30]-->
     <string name="setting_title">Settings</string>