Merge stage-aosp-master to aosp-master - DO NOT MERGE

Change-Id: If6fbfad52a3378400cb2006671a961c7413d317c
diff --git a/Android.bp b/Android.bp
index 261f0e3..6c264cf 100644
--- a/Android.bp
+++ b/Android.bp
@@ -40,6 +40,7 @@
         "car-arch-common",
         "car-telephony-common",
         "car-theme-lib",
+        "car-ui-lib",
         "androidx-constraintlayout_constraintlayout-solver",
         "guava",
         "glide-prebuilt",
@@ -98,6 +99,7 @@
         "car-arch-common",
         "car-telephony-common",
         "car-theme-lib",
+        "car-ui-lib",
         "androidx-constraintlayout_constraintlayout-solver",
         "guava",
         "glide-prebuilt",
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 57b68e0..481589c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -42,7 +42,7 @@
 
         <activity android:name=".ui.TelecomActivity"
                   android:launchMode="singleTask"
-                  android:theme="@style/Theme.Dialer"
+                  android:theme="@style/Theme.Dialer.Telecom"
                   android:label="@string/phone_app_name"
                   android:exported="true"
                   android:resizeableActivity="true">
@@ -83,7 +83,7 @@
 
         <activity android:name=".ui.activecall.InCallActivity"
                   android:launchMode="singleInstance"
-                  android:theme="@style/Theme.Dialer"
+                  android:theme="@style/Theme.Dialer.InCall"
                   android:label="@string/phone_app_name">
             <meta-data android:name="distractionOptimized" android:value="true"/>
         </activity>
diff --git a/res/drawable/action_button_background.xml b/res/drawable/action_button_background.xml
deleted file mode 100644
index 75a71fb..0000000
--- a/res/drawable/action_button_background.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2019 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.
-  -->
-
-<ripple
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@*android:color/car_card_ripple_background">
-    <item android:id="@android:id/mask">
-        <shape android:shape="rectangle">
-            <solid android:color="?android:colorAccent" />
-            <corners android:radius="@*android:dimen/car_radius_1"/>
-        </shape>
-    </item>
-</ripple>
diff --git a/res/drawable/ic_arrow_back.xml b/res/drawable/ic_arrow_back.xml
deleted file mode 100644
index 865c6c7..0000000
--- a/res/drawable/ic_arrow_back.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="@dimen/primary_icon_size"
-        android:height="@dimen/primary_icon_size"
-        android:tint="@color/primary_icon_color"
-        android:viewportWidth="48.0"
-        android:viewportHeight="48.0">
-    <path
-        android:pathData="M40,22H15.66l11.17,-11.17L24,8 8,24l16,16 2.83,-2.83L15.66,26H40v-4z"
-        android:fillColor="#000000"/>
-</vector>
diff --git a/res/drawable/ic_arrow_right.xml b/res/drawable/ic_arrow_right.xml
index fa71f05..051b6a0 100644
--- a/res/drawable/ic_arrow_right.xml
+++ b/res/drawable/ic_arrow_right.xml
@@ -17,7 +17,8 @@
         android:viewportWidth="48"
         android:viewportHeight="48"
         android:width="@dimen/primary_icon_size"
-        android:height="@dimen/primary_icon_size">
+        android:height="@dimen/primary_icon_size"
+        android:tint="@color/icon_tint_state_list">
 
     <path android:pathData="M0-.25h48v48H0z"/>
     <path
diff --git a/res/drawable/ic_close.xml b/res/drawable/ic_close.xml
deleted file mode 100644
index 14da481..0000000
--- a/res/drawable/ic_close.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2019 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.
-  -->
-
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="@dimen/primary_icon_size"
-    android:height="@dimen/primary_icon_size"
-    android:tint="@color/primary_icon_color"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path android:fillColor="#000000"
-          android:pathData="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"/>
-    <path android:pathData="M0 0h24v24H0z"/>
-</vector>
diff --git a/res/drawable/ic_direction.xml b/res/drawable/ic_direction.xml
new file mode 100644
index 0000000..0ea6438
--- /dev/null
+++ b/res/drawable/ic_direction.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="@dimen/primary_icon_size"
+        android:height="@dimen/primary_icon_size"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M21.41 10.59l-8-8c-.39-.4-.9-.59-1.41-.59s-1.02.2-1.41.59l-8 8c-.78.78-.78 2.05 0 2.83l8 8c.39.39.9.58 1.41.58s1.02-.2 1.41-.59l8-8c.78-.78.78-2.04 0-2.82zM12 20l-8-8 8-8 8 8-8 8zM10.59 8.41L13.17 11H7v2h6.17l-2.58 2.59L12 17l5-5-5-5z"/>
+</vector>
diff --git a/res/drawable/ic_overflow.xml b/res/drawable/ic_overflow.xml
deleted file mode 100644
index 4742133..0000000
--- a/res/drawable/ic_overflow.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2019 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.
-  -->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:width="@dimen/touch_target_size"
-          android:height="@dimen/touch_target_size"
-          android:drawable="?android:attr/actionBarItemBackground"/>
-    <item android:gravity="center" android:drawable="@drawable/ic_overflow_vd"/>
-</layer-list>
diff --git a/res/drawable/ic_overflow_vd.xml b/res/drawable/ic_overflow_vd.xml
deleted file mode 100644
index ef0435f..0000000
--- a/res/drawable/ic_overflow_vd.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2019 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.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="@dimen/primary_icon_size"
-        android:height="@dimen/primary_icon_size"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
-</vector>
diff --git a/res/drawable/ic_search.xml b/res/drawable/ic_search.xml
deleted file mode 100644
index 87e7d46..0000000
--- a/res/drawable/ic_search.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="@dimen/primary_icon_size"
-    android:height="@dimen/primary_icon_size"
-    android:viewportWidth="48"
-    android:viewportHeight="48">
-
-    <path
-        android:fillColor="@*android:color/car_grey_50"
-        android:pathData="M31 28h-1.59l-.55-.55C30.82 25.18 32 22.23 32 19c0-7.18-5.82-13-13-13S6 11.82 6
-19s5.82 13 13 13c3.23 0 6.18-1.18 8.45-3.13l.55 .55 V31l10 9.98L40.98 38 31
-28zm-12 0c-4.97 0-9-4.03-9-9s4.03-9 9-9 9 4.03 9 9-4.03 9-9 9z" />
-    <path
-        android:pathData="M0 0h48v48H0z" />
-</vector>
diff --git a/res/drawable/ic_setting.xml b/res/drawable/ic_setting.xml
deleted file mode 100644
index 5c9e6a7..0000000
--- a/res/drawable/ic_setting.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="@dimen/primary_icon_size"
-        android:height="@dimen/primary_icon_size"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-
-    <path
-        android:pathData="M0 0h20v20H0V0z" />
-    <path
-        android:fillColor="#fffafafa"
-        android:pathData="M21.4 14.2l-1.94-1.45c.03-.25 .04 -.5 .04 -.76s-.01-.51-.04-.76L21.4 9.8c.42-.31
-.52 -.94 .24 -1.41l-1.6-2.76c-.28-.48-.88-.7-1.36-.5l-2.14 .91
-c-.48-.37-1.01-.68-1.57-.92l-.27-2.2c-.06-.52-.56-.92-1.11-.92h-3.18c-.55 0-1.05
-.4 -1.11 .92 l-.26 2.19c-.57 .24 -1.1 .55 -1.58 .92 l-2.14-.91c-.48-.2-1.08 .02
--1.36 .5 l-1.6 2.76c-.28 .48 -.18 1.1 .24 1.42l1.94 1.45c-.03 .24 -.04 .49 -.04
-.75 s.01 .51 .04 .76 L2.6 14.2c-.42 .31 -.52 .94 -.24 1.41l1.6 2.76c.28 .48 .88
-.7 1.36 .5 l2.14-.91c.48 .37 1.01 .68 1.57 .92 l.27 2.19c.06 .53 .56 .93 1.11
-.93 h3.18c.55 0 1.04-.4 1.11-.92l.27-2.19c.56-.24 1.09-.55 1.57-.92l2.14 .91
-c.48 .2 1.08-.02 1.36-.5l1.6-2.76c.28-.48 .18 -1.1-.24-1.42zM12 15.5c-1.93
-0-3.5-1.57-3.5-3.5s1.57-3.5 3.5-3.5 3.5 1.57 3.5 3.5-1.57 3.5-3.5 3.5z"/>
-</vector>
diff --git a/res/drawable/sized_logo.xml b/res/drawable/sized_logo.xml
deleted file mode 100644
index 2cade0a..0000000
--- a/res/drawable/sized_logo.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2019 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.
-  -->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:width="@*android:dimen/car_margin"
-        android:drawable="@android:color/transparent"/>
-
-    <item
-        android:gravity="center"
-        android:width="@dimen/primary_icon_size"
-        android:height="@dimen/primary_icon_size"
-        android:drawable="@drawable/ic_app_icon">
-    </item>
-</layer-list>
diff --git a/res/layout-h610dp/contact_details_action_bar.xml b/res/layout-h610dp/contact_details_action_bar.xml
deleted file mode 100644
index d077bbe..0000000
--- a/res/layout-h610dp/contact_details_action_bar.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-
-<Space
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-</Space>
\ No newline at end of file
diff --git a/res/layout-h610dp/contact_details_name_image.xml b/res/layout-h610dp/contact_details_name_image.xml
deleted file mode 100644
index 970faad..0000000
--- a/res/layout-h610dp/contact_details_name_image.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2019 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="wrap_content">
-
-    <com.android.car.apps.common.BackgroundImageView
-        android:id="@+id/background_image"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:visibility="gone"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"/>
-
-    <ImageView
-        android:id="@+id/avatar"
-        android:layout_width="@dimen/contact_details_avatar_size"
-        android:layout_height="@dimen/contact_details_avatar_size"
-        android:layout_marginTop="@dimen/contact_details_avatar_margin_top"
-        app:layout_constraintVertical_chainStyle="packed"
-        app:layout_constraintBottom_toTopOf="@+id/title"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"/>
-
-    <TextView
-        android:id="@id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:singleLine="true"
-        android:layout_marginTop="@dimen/contact_details_title_margin_top"
-        android:layout_marginBottom="@dimen/contact_details_title_margin_bottom"
-        android:textAppearance="@style/TextAppearance.ContactDetailsTitle"
-        app:layout_constraintTop_toBottomOf="@id/avatar"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"/>
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/res/layout-port/top_bar_with_tabs.xml b/res/layout-port/top_bar_with_tabs.xml
deleted file mode 100644
index 34ef463..0000000
--- a/res/layout-port/top_bar_with_tabs.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2019 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.
-  -->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:id="@+id/car_toolbar_container"
-    android:background="@color/app_bar_background_color"
-    android:orientation="vertical">
-    <com.android.car.apps.common.ClickThroughToolbar
-        android:id="@+id/car_toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"/>
-
-    <com.android.car.apps.common.widget.CarTabLayout
-        android:id="@+id/tab_layout"
-        android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"/>
-</LinearLayout>
diff --git a/res/layout/add_to_favorite_dialog.xml b/res/layout/add_to_favorite_dialog.xml
deleted file mode 100644
index d8ec551..0000000
--- a/res/layout/add_to_favorite_dialog.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2019 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.recyclerview.widget.RecyclerView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/list"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
diff --git a/res/layout/call_history_list_item.xml b/res/layout/call_history_list_item.xml
index e2fd81e..813a5e1 100644
--- a/res/layout/call_history_list_item.xml
+++ b/res/layout/call_history_list_item.xml
@@ -77,7 +77,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/call_history_icons_margin"
-        android:textAppearance="?android:attr/textAppearanceSmall"
         android:singleLine="true"
         app:layout_constraintTop_toBottomOf="@id/title"
         app:layout_constraintStart_toEndOf="@id/call_type_icons"
@@ -89,7 +88,6 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/call_history_icons_margin"
         android:layout_marginEnd="@dimen/call_history_text_margin_end"
-        android:textAppearance="?android:attr/textAppearanceSmall"
         android:singleLine="true"
         app:layout_constraintTop_toBottomOf="@id/title"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -111,7 +109,6 @@
         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"
diff --git a/res/layout/contact_details_action_bar.xml b/res/layout/contact_details_action_bar.xml
deleted file mode 100644
index 59ad063..0000000
--- a/res/layout/contact_details_action_bar.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="horizontal"
-    android:gravity="center_vertical">
-
-    <ImageView
-        android:id="@+id/contact_details_action_bar_avatar"
-        android:layout_height="@dimen/contact_details_avatar_size"
-        android:layout_width="@dimen/contact_details_avatar_size"/>
-
-    <TextView
-        android:id="@+id/contact_details_action_bar_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/contact_details_action_bar_name_margin"
-        android:textAppearance="@style/TextAppearance.Body1"
-        android:singleLine="true"/>
-
-</LinearLayout>
diff --git a/res/layout/contact_details_address.xml b/res/layout/contact_details_address.xml
new file mode 100644
index 0000000..cd15f66
--- /dev/null
+++ b/res/layout/contact_details_address.xml
@@ -0,0 +1,75 @@
+<?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.
+-->
+<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="@dimen/contact_details_item_height">
+
+    <LinearLayout
+        android:id="@+id/address_button"
+        android:background="?android:attr/selectableItemBackground"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:paddingStart="@dimen/contact_details_number_padding_start"
+        android:paddingEnd="@dimen/contact_details_number_padding_end"
+        android:gravity="center_vertical"
+        android:orientation="vertical"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/divider"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent">
+
+        <TextView
+            android:id="@+id/title"
+            android:textAppearance="@style/TextAppearance.ContactDetailsListTitle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:singleLine="true"/>
+
+        <TextView
+            android:id="@id/text"
+            android:textAppearance="@style/TextAppearance.ContactDetailsListSubtitle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:singleLine="true"/>
+
+    </LinearLayout>
+
+    <!-- Divider line separating the text and the text icon -->
+    <View
+        android:id="@+id/divider"
+        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"
+        android:layout_marginEnd="@dimen/contact_details_text_button_guideline"
+        app:layout_constraintEnd_toEndOf="parent"/>
+
+    <ImageView
+        android:id="@+id/navigation_button"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:scaleType="center"
+        android:src="@drawable/ic_direction"
+        android:tint="@color/contact_details_icon_tint"
+        android:background="?android:attr/selectableItemBackground"
+        app:layout_constraintStart_toStartOf="@id/divider"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"/>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/res/layout/contact_details_name_image.xml b/res/layout/contact_details_name_image.xml
index f03f093..970faad 100644
--- a/res/layout/contact_details_name_image.xml
+++ b/res/layout/contact_details_name_image.xml
@@ -14,8 +14,41 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-
-<Space
+<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="wrap_content"/>
+    android:layout_height="wrap_content">
+
+    <com.android.car.apps.common.BackgroundImageView
+        android:id="@+id/background_image"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:visibility="gone"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"/>
+
+    <ImageView
+        android:id="@+id/avatar"
+        android:layout_width="@dimen/contact_details_avatar_size"
+        android:layout_height="@dimen/contact_details_avatar_size"
+        android:layout_marginTop="@dimen/contact_details_avatar_margin_top"
+        app:layout_constraintVertical_chainStyle="packed"
+        app:layout_constraintBottom_toTopOf="@+id/title"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"/>
+
+    <TextView
+        android:id="@id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:singleLine="true"
+        android:layout_marginTop="@dimen/contact_details_title_margin_top"
+        android:layout_marginBottom="@dimen/contact_details_title_margin_bottom"
+        android:textAppearance="@style/TextAppearance.ContactDetailsTitle"
+        app:layout_constraintTop_toBottomOf="@id/avatar"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"/>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/res/layout/contact_user_profile.xml b/res/layout/contact_user_profile.xml
index aa6e1d8..0bad55b 100644
--- a/res/layout/contact_user_profile.xml
+++ b/res/layout/contact_user_profile.xml
@@ -79,24 +79,35 @@
         app:layout_constraintStart_toStartOf="@id/contact_list_guideline_begin"
         app:layout_constraintEnd_toEndOf="@id/contact_list_guideline_end"/>
 
-    <ImageView
+    <androidx.constraintlayout.widget.ConstraintLayout
         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_constraintStart_toStartOf="@id/contact_list_guideline_end"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@id/contact_list_guideline_end"
-        app:layout_constraintEnd_toEndOf="parent"/>
+        app:layout_constraintBottom_toBottomOf="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"/>
+        <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="parent"/>
+
+        <ImageView
+            android:id="@+id/contact_list_button"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:src="@drawable/ic_arrow_right"
+            android:background="?android:attr/selectableItemBackground"
+            android:duplicateParentState="true"
+            android:scaleType="center"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@id/contact_list_guideline_end"
+            app:layout_constraintEnd_toEndOf="parent"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/res/layout/dialer_settings_activity.xml b/res/layout/dialer_settings_activity.xml
deleted file mode 100644
index c67eefb..0000000
--- a/res/layout/dialer_settings_activity.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright 2019 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">
-
-    <com.android.car.apps.common.ClickThroughToolbar
-        android:id="@+id/settings_toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
-        app:layout_constraintTop_toTopOf="parent"/>
-
-    <FrameLayout
-        android:id="@+id/settings_fragment_container"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_marginStart="@dimen/preference_list_margin"
-        android:layout_marginEnd="@dimen/preference_list_margin"
-        app:layout_constraintTop_toBottomOf="@id/settings_toolbar"
-        app:layout_constraintBottom_toBottomOf="parent">
-    </FrameLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/res/layout/favorite_fragment.xml b/res/layout/favorite_fragment.xml
deleted file mode 100644
index d274700..0000000
--- a/res/layout/favorite_fragment.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2019 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.
-  -->
-<FrameLayout
-    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">
-
-    <fragment
-        android:id="@+id/favorite_list_fragment"
-        android:name="com.android.car.dialer.ui.favorite.FavoriteListFragment"
-        android:layout_height="match_parent"
-        android:layout_width="match_parent"/>
-
-    <LinearLayout
-        android:id="@+id/empty_page_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:visibility="gone">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:text="@string/favorites_empty"
-            android:layout_marginBottom="@dimen/favorite_add_button_and_text_separation"/>
-
-        <com.android.car.apps.common.UxrButton
-            android:id="@+id/add_favorite_button"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/touch_target_size"
-            android:text="@string/add_favorite_button"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="@color/hero_button_text_color"
-            android:background="@drawable/hero_button_background"
-            android:paddingHorizontal="@dimen/favorite_add_button_padding"
-            android:gravity="center"
-            app:carUxRestrictions="UX_RESTRICTIONS_NO_SETUP"/>
-
-    </LinearLayout>
-
-</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/in_call_activity.xml b/res/layout/in_call_activity.xml
index 882b083..c7a0684 100644
--- a/res/layout/in_call_activity.xml
+++ b/res/layout/in_call_activity.xml
@@ -18,14 +18,14 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
     <fragment
-        android:name="com.android.car.dialer.ui.activecall.OngoingCallFragment"
-        android:id="@+id/ongoing_call_fragment"
+        android:name="com.android.car.dialer.ui.activecall.IncomingCallFragment"
+        android:id="@+id/incoming_call_fragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
 
     <fragment
-        android:name="com.android.car.dialer.ui.activecall.IncomingCallFragment"
-        android:id="@+id/incoming_call_fragment"
+        android:name="com.android.car.dialer.ui.activecall.OngoingCallFragment"
+        android:id="@+id/ongoing_call_fragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
 </FrameLayout>
diff --git a/res/layout/keypad_button.xml b/res/layout/keypad_button.xml
index ac1c793..b8a32ae 100644
--- a/res/layout/keypad_button.xml
+++ b/res/layout/keypad_button.xml
@@ -23,25 +23,19 @@
     <TextView
         android:id="@+id/keypad_number"
         android:layout_gravity="center_horizontal"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
         android:visibility="gone"
-        style="@style/KeypadNumber" />
+        style="@style/KeypadNumber"/>
 
     <TextView
         android:id="@+id/keypad_letters"
         android:layout_gravity="center_horizontal"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
         android:textAllCaps="true"
         android:visibility="gone"
-        style="@style/KeypadLetter" />
+        style="@style/KeypadLetter"/>
 
     <ImageView
         android:id="@+id/keypad_image"
         android:layout_gravity="center_horizontal"
-        android:layout_width="32dp"
-        android:layout_height="32dp"
-        android:tint="@color/car_key2"
-        android:visibility="gone" />
+        android:visibility="gone"
+        style="@style/KeypadImage"/>
 </LinearLayout>
diff --git a/res/layout/list_fragment.xml b/res/layout/list_fragment.xml
index 10b5403..d4ba689 100644
--- a/res/layout/list_fragment.xml
+++ b/res/layout/list_fragment.xml
@@ -14,7 +14,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-<com.android.car.apps.common.widget.PagedRecyclerView
+
+<com.android.car.ui.recyclerview.CarUiRecyclerView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/list_view"
     android:layout_width="match_parent"
diff --git a/res/layout/loading_info_view.xml b/res/layout/loading_info_view.xml
new file mode 100644
index 0000000..97ec1a9
--- /dev/null
+++ b/res/layout/loading_info_view.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2019 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">
+    <ImageView
+        android:id="@+id/loading_info_icon"
+        android:layout_width="@dimen/loading_info_icon_size"
+        android:layout_height="@dimen/loading_info_icon_size"
+        android:tint="@color/primary_icon_color"
+        android:layout_marginBottom="@dimen/loading_info_icon_margin_bottom"
+        app:layout_constraintVertical_chainStyle="packed"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/loading_info_message"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"/>
+
+    <TextView
+        android:id="@id/loading_info_message"
+        style="@style/LoadingInfoMessageStyle"
+        app:layout_constraintTop_toBottomOf="@id/loading_info_icon"
+        app:layout_constraintBottom_toTopOf="@+id/loading_info_secondary_message"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"/>
+
+    <TextView
+        android:id="@id/loading_info_secondary_message"
+        style="@style/LoadingInfoSecondaryMessageStyle"
+        app:layout_constraintTop_toBottomOf="@id/loading_info_message"
+        app:layout_constraintBottom_toTopOf="@+id/loading_info_action_button"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"/>
+
+    <com.android.car.apps.common.UxrButton
+        android:id="@id/loading_info_action_button"
+        style="@style/LoadingInfoActionButtonStyle"
+        android:layout_marginTop="@dimen/loading_info_button_margin_top"
+        app:layout_constraintTop_toBottomOf="@id/loading_info_secondary_message"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"/>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/res/layout/search_view.xml b/res/layout/loading_list_fragment.xml
similarity index 76%
rename from res/layout/search_view.xml
rename to res/layout/loading_list_fragment.xml
index 0832fa2..4bd9c8d 100644
--- a/res/layout/search_view.xml
+++ b/res/layout/loading_list_fragment.xml
@@ -14,9 +14,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-
-<SearchView
+<com.android.car.dialer.widget.LoadingFrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/search_view"
+    android:id="@+id/loading_frame_layout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"/>
+    android:layout_height="match_parent">
+    <include layout="@layout/list_fragment"/>
+</com.android.car.dialer.widget.LoadingFrameLayout>
diff --git a/res/layout/top_bar_with_tabs.xml b/res/layout/loading_progress_view.xml
similarity index 60%
rename from res/layout/top_bar_with_tabs.xml
rename to res/layout/loading_progress_view.xml
index 681b0b7..dd7927a 100644
--- a/res/layout/top_bar_with_tabs.xml
+++ b/res/layout/loading_progress_view.xml
@@ -14,15 +14,17 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-
-<com.android.car.apps.common.ClickThroughToolbar
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/car_toolbar"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="?android:attr/actionBarSize"
-    android:background="@color/app_bar_background_color">
-    <com.android.car.apps.common.widget.CarTabLayout
-        android:id="@+id/tab_layout"
+    android:layout_height="match_parent">
+    <ProgressBar
         android:layout_width="wrap_content"
-        android:layout_height="match_parent"/>
-</com.android.car.apps.common.ClickThroughToolbar>
+        android:layout_height="wrap_content"
+        style="?android:attr/progressBarStyleLarge"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"/>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/res/layout/menu_action_view.xml b/res/layout/menu_action_view.xml
deleted file mode 100644
index c195521..0000000
--- a/res/layout/menu_action_view.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2019 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.
-  -->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:gravity="center">
-    <ImageView
-        android:id="@+id/menu_icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/menu_item_margin_x"
-        android:background="?android:attr/actionBarItemBackground"
-        style="?android:attr/actionButtonStyle"/>
-</LinearLayout>
diff --git a/res/layout/on_going_call_controller_bar_fragment.xml b/res/layout/on_going_call_controller_bar_fragment.xml
index 7724db3..c9902c2 100644
--- a/res/layout/on_going_call_controller_bar_fragment.xml
+++ b/res/layout/on_going_call_controller_bar_fragment.xml
@@ -68,7 +68,7 @@
             android:layout_height="@dimen/in_call_button_size"
             android:background="@drawable/dialer_ripple_background"
             android:scaleType="center"
-            android:src="@drawable/ic_bluetooth_activatable"/>
+            android:src="@drawable/ic_audio_route_vehicle_activatable"/>
 
         <TextView
             android:id="@+id/voice_channel_text"
diff --git a/res/layout/search_view_layout_override.xml b/res/layout/search_view_layout_override.xml
deleted file mode 100644
index 11201b4..0000000
--- a/res/layout/search_view_layout_override.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2019 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.
-  -->
-
-<!-- This file is branched out from the search_view.xml in the framework and fixes the style for dialer.-->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@*android:id/search_bar"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="horizontal">
-
-    <!-- This is actually used for the badge icon *or* the badge label (or neither) -->
-    <TextView
-        android:id="@*android:id/search_badge"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:gravity="center_vertical"
-        android:drawablePadding="0dip"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textColor="?android:attr/textColorPrimary"
-        android:visibility="gone"/>
-
-    <ImageView
-        android:id="@*android:id/search_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        style="?android:attr/actionButtonStyle"
-        android:layout_gravity="center_vertical"
-        android:focusable="true"/>
-
-    <LinearLayout
-        android:id="@*android:id/search_edit_frame"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:orientation="horizontal"
-        android:layoutDirection="locale">
-
-        <ImageView
-            android:id="@*android:id/search_mag_icon"
-            android:layout_width="@*android:dimen/dropdownitem_icon_width"
-            android:layout_height="wrap_content"
-            android:scaleType="centerInside"
-            android:layout_marginStart="@*android:dimen/dropdownitem_text_padding_left"
-            android:layout_gravity="center_vertical"
-            android:visibility="gone"/>
-
-        <!-- Inner layout contains the app icon, button(s) and EditText -->
-        <LinearLayout
-            android:id="@*android:id/search_plate"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
-
-            <view class="android.widget.SearchView$SearchAutoComplete"
-                  android:id="@*android:id/search_src_text"
-                  android:layout_height="match_parent"
-                  android:layout_width="0dp"
-                  android:layout_weight="1"
-                  android:singleLine="true"
-                  android:background="@null"
-                  android:inputType="text|textAutoComplete|textNoSuggestions"
-                  android:imeOptions="actionSearch"
-                  android:drawableStart="@drawable/ic_app_icon"
-                  android:drawablePadding="@*android:dimen/car_padding_2"
-                  android:dropDownHeight="wrap_content"
-                  android:dropDownAnchor="@*android:id/search_edit_frame"
-                  android:dropDownVerticalOffset="0dip"
-                  android:dropDownHorizontalOffset="0dip"/>
-
-            <ImageView
-                android:id="@*android:id/search_close_btn"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                style="?android:attr/actionButtonStyle"
-                android:focusable="true"
-                android:contentDescription="@*android:string/searchview_description_clear"/>
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@*android:id/submit_area"
-            android:orientation="horizontal"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent">
-
-            <ImageView
-                android:id="@*android:id/search_go_btn"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                style="?android:attr/actionButtonStyle"
-                android:layout_gravity="center_vertical"
-                android:visibility="gone"
-                android:focusable="true"
-                android:contentDescription="@*android:string/searchview_description_submit"/>
-
-            <ImageView
-                android:id="@*android:id/search_voice_btn"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                style="?android:attr/actionButtonStyle"
-                android:layout_gravity="center_vertical"
-                android:visibility="gone"
-                android:focusable="true"
-                android:contentDescription="@*android:string/searchview_description_voice"/>
-        </LinearLayout>
-    </LinearLayout>
-</LinearLayout>
diff --git a/res/layout/telecom_activity.xml b/res/layout/telecom_activity.xml
index 89828e6..655f48c 100644
--- a/res/layout/telecom_activity.xml
+++ b/res/layout/telecom_activity.xml
@@ -16,6 +16,7 @@
 
 <FrameLayout
     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.ConstraintLayout
@@ -28,7 +29,10 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"/>
 
-        <include layout="@layout/top_bar_with_tabs"/>
+        <com.android.car.ui.toolbar.Toolbar
+            android:id="@+id/car_ui_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <FrameLayout
diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml
deleted file mode 100644
index c32e70c..0000000
--- a/res/menu/main_menu.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2019 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.
-  -->
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- Main search menu doesn't have an action view, onClick navigates to the search result page-->
-    <item android:id="@+id/menu_contacts_search"
-          android:icon="@drawable/ic_search"
-          android:title="@string/search_title"
-          android:showAsAction="always"
-          android:actionProviderClass="com.android.car.dialer.ui.menu.MenuActionProvider"/>
-
-    <!-- Dialer setting button -->
-    <item android:id="@+id/menu_dialer_setting"
-          android:icon="@drawable/ic_setting"
-          android:title="@string/setting_title"
-          android:showAsAction="always"
-          android:actionProviderClass="com.android.car.dialer.ui.menu.MenuActionProvider"/>
-</menu>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
deleted file mode 100644
index a729662..0000000
--- a/res/values-af/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Foon"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Om jou oproep te voltooi, moet jy eers jou foon via Bluetooth aan jou motor koppel."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth is nie beskikbaar nie."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Skakel Bluetooth aan om oproepe te maak of te ontvang."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Bind jou foon saam met die motor om oproepe te maak of te ontvang."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Koppel aan Bluetooth"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Noodgeval"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Noodoproep"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Hierdie kontak is dalk uitgevee."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Kan nie hierdie nommer skakel nie. Gaan dit na en probeer weer."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Foonoproep is nie beskikbaar nie. Probeer later weer."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Wys af"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Antwoord"</string>
-    <string name="call_back" msgid="5745638356098600872">"Bel terug"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Voertuig se Bluetooth"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Luidsprekerfoon"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Selfoon"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Skakel \'n nommer"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Gunstelinge"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Oproepgeskiedenis"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Kontakte"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Belblad"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Vandag"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Gister"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Ouer"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Voeg \'n gunsteling by"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Jy het nog geen gunstelinge bygevoeg nie"</string>
-    <string name="search_title" msgid="5412680850141871664">"Deursoek kontakte"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Deursoek kontakte"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Veelvuldige"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Kies \'n foonnommer"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Net een keer"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Altyd"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  – Verstek"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  – gunsteling"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Kennisgewing van inkomende oproep"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Inkomende oproep"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Gemiste Oproep-kennisgewing"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Gemiste oproep"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"Hou aan"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Instellings"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Beginskerm"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Kontakvolgorde"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Voornaam"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Van"</string>
-</resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
deleted file mode 100644
index dc10a99..0000000
--- a/res/values-am/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"ስልክ"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"የእርስዎን ጥሪ ለማጠናቀቅ መጀመሪያ ስልክዎን በብሉቱዝ በኩል ከመኪናዎ ጋር ያገናኙት"</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"ብሉቱዝ አይገኝም።"</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"ጥሪዎችን ለማድረግ ወይም ለመቀበል ብሉቱዝን ያብሩ።"</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"ጥሪዎችን ለማድረግ ወይም ለመቀበል ስልክዎን ከመኪናው ጋር ያጣምሩት"</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"ከብሉቱዝ ጋር ተገናኝ"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"ድንገተኛ አደጋ"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"የአደጋ ጊዜ ጥሪ"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"እነኚህ እውቂያ ተሰርዘው ሊሆኑ ይችላሉ።"</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"ወደዚህ ቁጥር መደወል አይቻልም። ይፈትሹትና እንደገና ይሞክሩ።"</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"የስልክ ጥሪ አይገኝም። እባክዎ ቆይተው እንደገና ይሞክሩ።"</string>
-    <string name="decline_call" msgid="2505987200485272226">"አትቀበል"</string>
-    <string name="answer_call" msgid="3272474440561548115">"ያንሱ"</string>
-    <string name="call_back" msgid="5745638356098600872">"መልሰው ይደውሉ"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"የተሽከርካሪ ብሉቱዝ"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"የስልክ ድምጽ ማጉያ"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"የስልክ ቀፎ"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"ወደ አንድ የስልክ ቁጥር ደውል"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"ተወዳጆች"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"የጥሪ ታሪክ"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"ዕውቂያዎች"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"የመደወያ ሰሌዳ"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"ዛሬ"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"ትላንትና"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"የቆዩ"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"ተወዳጅ አክል"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"ገና ምንም ተወዳጆችን አላከሉም"</string>
-    <string name="search_title" msgid="5412680850141871664">"እውቂያዎችን ይፈልጉ"</string>
-    <string name="search_hint" msgid="3099066132607042439">"እውቂያዎችን ይፈልጉ"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"በርካታ"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"ስልክ ቁጥር ይምረጡ"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"አንዴ ብቻ"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"ሁልጊዜ"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  - ነባሪ"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  - ተወዳጅ"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"የገቢ ጥሪ ማሳወቂያ"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"ገቢ ጥሪ"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"ያመለጠ ጥሪ ማሳወቂያ"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"ያመለጠ ጥሪ"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"ያዝ እና ቆይ"</string>
-    <string name="setting_title" msgid="1296639422364732365">"ቅንብሮች"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"የመጀመሪያ ማያ ገጽ"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"የእውቂያ ቅደም ተከተል"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"የመጀመርያ ስም"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"የአያት ስም"</string>
-</resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
deleted file mode 100644
index 757e185..0000000
--- a/res/values-ar/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"الهاتف"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"لاستئناف المكالمة، يجب أولاً توصيل الهاتف بالسيارة من خلال بلوتوث."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"البلوتوث غير مُتاح."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"لإجراء مكالمات أو تلقّيها، يُرجى تفعيل البلوتوث."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"لإجراء مكالمات أو تلقّيها، يُرجى إقران هاتفك بالسيارة."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"الاتصال ببلوتوث"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"طوارئ"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"مكالمة طوارئ"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"ربما تم حذف جهة الاتصال هذه."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"يتعذّر الاتصال بهذا الرقم. يُرجى التأكُّد وإعادة المحاولة."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"مكالمة الهاتف غير متوفّرة. يُرجى إعادة المحاولة لاحقًا."</string>
-    <string name="decline_call" msgid="2505987200485272226">"رفض"</string>
-    <string name="answer_call" msgid="3272474440561548115">"ردّ"</string>
-    <string name="call_back" msgid="5745638356098600872">"معاودة الاتصال"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"بلوتوث المركَبة"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"مكبّر الصوت"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"سماعة الهاتف"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"طلب رقم"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"المفضّلة"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"سجلّ المكالمات"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"جهات الاتصال"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"لوحة الاتصال"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"اليوم"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"الأمس"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"المكالمات الأقدَم"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"إضافة جهة اتصال مفضّلة"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"لم يسبق لك إضافة أي عناصر مفضّلة بعد."</string>
-    <string name="search_title" msgid="5412680850141871664">"البحث في جهات الاتصال"</string>
-    <string name="search_hint" msgid="3099066132607042439">"البحث في جهات الاتصال"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"متعدد"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"اختيار رقم هاتف"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"مرّة واحدة فقط"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"دومًا"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  - تلقائي"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  - وضع في المفضَّلة"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"إشعار مكالمة واردة"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"مكالمة واردة"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"إشعار المكالمة الفائتة"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"مكالمة فائتة"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"قيد الانتظار"</string>
-    <string name="setting_title" msgid="1296639422364732365">"الإعدادات"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"شاشة البدء"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"ترتيب جهات الاتصال"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"الاسم الأول"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"اسم العائلة"</string>
-</resources>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
deleted file mode 100644
index 53cb9ef..0000000
--- a/res/values-as/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"ফ’ন"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"আপোনাৰ কলটো সম্পূৰ্ণ কৰিবলৈ প্ৰথমে ব্লুটুথৰ জৰিয়তে নিজৰ ফ\'নটো গাড়ীৰ সৈতে সংযোগ কৰক।"</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"ব্লুটুথৰ সুবিধা নাই।"</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"কল কৰিবলৈ বা গ্ৰহণ কৰিবলৈ, ব্লুটুথ অন কৰক।"</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"কল কৰিবলৈ বা গ্ৰহণ কৰিবলৈ, ফ’নটো গাড়ীৰ সৈতে যোৰা লগাওক।"</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"ব্লুটুথৰ সৈতে সংযোগ কৰক"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"জৰুৰীকালীন"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"জৰুৰীকালীন কল"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"এই সম্পৰ্কটো হয়তো মচা হৈছে।"</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"এই নম্বৰটো ডায়েল কৰিব নোৱাৰি। এইটো পৰীক্ষা কৰি আকৌ চেষ্টা কৰক।"</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"ফ’ন কল উপলব্ধ নহয়। অনুগ্ৰহ কৰি পাছত পুনৰ চেষ্টা কৰক।"</string>
-    <string name="decline_call" msgid="2505987200485272226">"অস্বীকাৰ কৰক"</string>
-    <string name="answer_call" msgid="3272474440561548115">"কল গ্ৰহণ কৰক"</string>
-    <string name="call_back" msgid="5745638356098600872">"কলবেক কৰক"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"বাহনৰ ব্লুটুথ"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"স্পীকাৰ ফ’ন"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"হেণ্ডছেট"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"কোনো নম্বৰ ডায়েল কৰক"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"অগ্ৰাধিকাৰসমূহ"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"কলৰ ইতিহাস"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"সম্পর্কবোৰ"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"ডায়েলপেড"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"আজি"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"কালি"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"পুৰণি"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"এটা প্ৰিয় সম্পৰ্ক যোগ কৰক"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"আপুনি এতিয়ালৈকে কোনো প্ৰিয় যোগ কৰা নাই"</string>
-    <string name="search_title" msgid="5412680850141871664">"সম্পর্কসমূহ সন্ধান কৰক"</string>
-    <string name="search_hint" msgid="3099066132607042439">"সম্পর্কসমূহ সন্ধান কৰক"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"একাধিক"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"এটা ফ’ন নম্বৰ বাছনি কৰক"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"মাত্ৰ এবাৰ"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"সদায়"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  - ডিফ’ল্ট"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  - প্ৰিয়"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"অন্তৰ্গামী কলৰ জাননী"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"অন্তৰ্গামী কল"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"মিছড কলৰ জাননী"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"মিছড কল"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"হ’ল্ডত আছে"</string>
-    <string name="setting_title" msgid="1296639422364732365">"ছেটিংসমূহ"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"আৰম্ভণিৰ স্ক্ৰীণ"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"সম্পৰ্কৰ ক্ৰম"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"প্ৰথম নাম"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"উপাধি"</string>
-</resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
deleted file mode 100644
index a79934c..0000000
--- a/res/values-az/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Telefon"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Zəngi tamamlamaq üçün əvvəlcə telefonu Bluetooth ilə avtomobilə qoşun."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth əlçatan deyil."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Zəng etmək və ya qəbul etmək üçün Bluetooth\'u aktiv edin."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Zəng etmək və ya qəbul etmək üçün telefonu avtomobilə birləşdirin."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Bluetooth\'a qoşulun"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Təcili"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Təcili zəng"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Bu kontakt silinmiş ola bilər."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Bu nömrəni yığmaq olmur. Yoxlayın və yenidən cəhd edin."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Telefon zəngi əlçatan deyil. Sonra cəhd edin."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Rədd edin"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Cavab"</string>
-    <string name="call_back" msgid="5745638356098600872">"Geriyə zəng"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Avtomobilin bluetooth\'u"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Dinamik"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Dəstək"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Nömrə yığın"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Sevimlilər"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Zəng Tarixçəsi"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Kontaktlar"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Yığım paneli"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Bu gün"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Dünən"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Əvvəlki"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Sevimli kontakt əlavə edin"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Hələ heç bir sevimli element əlavə etməmisiniz"</string>
-    <string name="search_title" msgid="5412680850141871664">"Kontaktları axtarın"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Kontaktları axtarın"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Çoxsaylı"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Telefon nömrəsi seçin"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Sadəcə bir dəfə"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Həmişə"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  - Defolt"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  - Sevimli"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Gələn zəng bildirişi"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Gələn zəng"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Buraxılmış zəng bildirişi"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Buraxılmış zəng"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"Gözləmədə"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Ayarlar"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Başlanğıc ekranı"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Kontakt sırası"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Ad"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Soyad"</string>
-</resources>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
deleted file mode 100644
index 1aaaae6..0000000
--- a/res/values-b+sr+Latn/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Telefon"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Da biste dovršili poziv, prvo povežite telefon sa automobilom preko Bluetooth-a."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth nije dostupan."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Da biste upućivali ili primali pozive, uključite Bluetooth."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Da biste upućivali ili primali pozive, uparite telefon sa automobilom."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Poveži sa Bluetooth-om"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Hitan slučaj"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Hitni poziv"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Ovaj kontakt je možda izbrisan."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Pozivanje ovog broja nije uspelo. Proverite ga i probajte ponovo."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Telefonski poziv nije dostupan. Probajte ponovo kasnije."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Odbij"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Odgovori"</string>
-    <string name="call_back" msgid="5745638356098600872">"Uzvrati poziv"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Bluetooth vozila"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Spikerfon"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Slušalice"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Unesite broj"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Omiljeno"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Istorija poziva"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Kontakti"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Numerička tastatura"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Danas"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Juče"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Starije"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Dodajte omiljen kontakt"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Još niste dodali omiljene kontakte"</string>
-    <string name="search_title" msgid="5412680850141871664">"Pretražite kontakte"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Pretražite kontakte"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Više"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Odaberite broj telefona"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Samo jednom"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Uvek"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g> – podrazumevano"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  – Omiljeno"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Obaveštenje o dolaznom pozivu"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Dolazni poziv"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Obaveštenje o propuštenom pozivu"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Propušten poziv"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"Na čekanju"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Podešavanja"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Početni ekran"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Redosled kontakata"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Ime"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Prezime"</string>
-</resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
deleted file mode 100644
index f44d589..0000000
--- a/res/values-be/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Тэлефон"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Каб завяршыць выклік, спачатку падключыце тэлефон да аўтамабіля праз Bluetooth."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth недаступны."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Каб рабіць ці прымаць выклікі, уключыце Bluetooth."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Каб рабіць ці прымаць выклікі, спалучыце тэлефон з аўтамабілем."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Падключыцца да Bluetooth"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Экстранны выклік"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Экстранны выклік"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Магчыма, гэты кантакт выдалены."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Не ўдалося набраць гэты нумар. Праверце яго і паўтарыце спробу."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Тэлефонны выклік недаступны. Паўтарыце спробу пазней."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Адхіліць"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Адказаць"</string>
-    <string name="call_back" msgid="5745638356098600872">"Зваротны выклік"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Bluetooth аўтамабіля"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Гучная сувязь"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Дынамік тэлефона"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Набраць нумар"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Абраныя"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Гісторыя выклікаў"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Кантакты"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Панэль набору"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Сёння"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Учора"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Ранейшыя"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Дадаць у абраныя"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Вы яшчэ нічога не дадалі ў абраныя"</string>
-    <string name="search_title" msgid="5412680850141871664">"Шукаць у кантактах"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Шукаць у кантактах"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Некалькі"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Выберыце нумар тэлефона"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Толькі адзін раз"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Заўсёды"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g> – Стандартна"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g> – дадаць у абраныя"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Апавяшчэнне аб уваходным выкліку"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Уваходны выклік"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Апавяшчэнне аб прапушчаным выкліку"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Прапушчаны выклік"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"На ўтрыманні"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Налады"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Пачатковы экран"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Парадак кантактаў"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Імя"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Прозвішча"</string>
-</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
deleted file mode 100644
index 1b4a3e9..0000000
--- a/res/values-bg/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Телефон"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"За да завършите обаждането, първо свържете телефона с автомобила си през Bluetooth."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth не се поддържа."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"За да извършвате или получавате обаждания, включете Bluetooth."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"За да извършвате или получавате обаждания, сдвоете телефона си с автомобила."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Свързване с Bluetooth"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Спешно обаждане"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Спешно обаждане"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Този контакт може да е изтрит."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Този номер не може да бъде набран. Проверете го и опитайте отново."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Функцията за телефонни обаждания не е налице. Моля, опитайте отново по-късно."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Отхвърляне"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Отговаряне"</string>
-    <string name="call_back" msgid="5745638356098600872">"Обратно обаждане"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Bluetooth в автомобила"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Високоговорител"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Слушалка"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Набиране на номер"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Любими"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"История на обажданията"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Контакти"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Клавиатура за набиране"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Днес"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Вчера"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"По-стари"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Добавяне на любим контакт"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Още не сте добавили любими"</string>
-    <string name="search_title" msgid="5412680850141871664">"Търсене в контактите"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Търсене в контактите"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Няколко"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Избиране на телефонен номер"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Само веднъж"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Винаги"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g> – по подразбиране"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g> – Означаване като любимо"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Известие за входящо обаждане"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Входящо обаждане"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Известие за пропуснато обаждане"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Пропуснато обаждане"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"Задържано"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Настройки"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Начален екран"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Подредба на контактите"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Собствено име"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Фамилно име"</string>
-</resources>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
deleted file mode 100644
index 1b5cb7b..0000000
--- a/res/values-bn/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"ফোন"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"আপনার কলটি করার জন্য প্রথমে ফোনটি গাড়ির সাথে ব্লুটুথের সাহায্যে কানেক্ট করুন।"</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"ব্লুটুথ উপলভ্য নেই।"</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"কল করা বা রিসিভ করার জন্য ব্লুটুথ চালু করুন।"</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"কল করতে বা রিসিভ করতে ফোনটি গাড়ির সাথে পেয়ার করুন।"</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"ব্লুটুথে কানেক্ট করুন"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"জরুরি"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"জরুরি কল"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"সম্ভবত এই পরিচিতি মুছে ফেলা হয়েছে।"</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"এই নম্বরটি ডায়াল করা যায়নি। চেক করে আবার চেষ্টা করুন।"</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"ফোন কলের সুবিধা পাওয়া যাবে না। পরে আবার চেষ্টা করুন।"</string>
-    <string name="decline_call" msgid="2505987200485272226">"প্রত্যাখ্যান করুন"</string>
-    <string name="answer_call" msgid="3272474440561548115">"উত্তর দিন"</string>
-    <string name="call_back" msgid="5745638356098600872">"কল ব্যাক করুন"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"গাড়ির ব্লুটুথ"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"স্পিকার ফোন"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"হ্যান্ডসেট"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"নম্বর ডায়াল করুন"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"পছন্দসই"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"কলের ইতিহাস"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"পরিচিতি"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"ডায়ালপ্যাড"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"আজ"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"গতকাল"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"আরও পুরনো"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"একটি পছন্দ যোগ করুন"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"আপনি এখনও পর্যন্ত কাউকে পছন্দসই হিসেবে যোগ করেননি"</string>
-    <string name="search_title" msgid="5412680850141871664">"পরিচিতি খুঁজুন"</string>
-    <string name="search_hint" msgid="3099066132607042439">"পরিচিতি খুঁজুন"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"একাধিক"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"কোনও একটি ফোন নম্বর বেছে নিন"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"শুধু একবার"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"সবসময়"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  - ডিফল্ট"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  - পছন্দ"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"ইনকামিং কলের বিজ্ঞপ্তি"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"ইনকামিং কল"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"মিসড কলের বিজ্ঞপ্তি"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"মিসড কল"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"হোল্ডে আছে"</string>
-    <string name="setting_title" msgid="1296639422364732365">"সেটিংস"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"স্ক্রিন চালু করুন"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"পরিচিতির ক্রম"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"নাম"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"পদবি"</string>
-</resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
deleted file mode 100644
index c00498b..0000000
--- a/res/values-bs/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Telefon"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Da uspostavite poziv, najprije povežite telefon s automobilom preko Bluetootha."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth nije dostupan."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Za upućivanje ili primanje poziva uključite Bluetooth."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Za upućivanje ili primanje poziva uparite telefon s automobilom."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Poveži se na Bluetooth"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Hitan slučaj"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Hitni poziv"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Moguće je da je ovaj kontakt izbrisan."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Nije moguće birati ovaj broj. Provjerite ga i pokušajte ponovo."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Telefonski poziv nije dostupan. Pokušajte ponovo kasnije."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Odbij"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Odgovori"</string>
-    <string name="call_back" msgid="5745638356098600872">"Uputi povratni poziv"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Bluetooth vozila"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Zvučnik"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Slušalice"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Biraj broj"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Omiljeno"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Historija poziva"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Kontakti"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Telefonska tipkovnica"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Danas"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Jučer"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Stariji"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Dodaj omiljeni"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Još uvijek niste dodali omiljeni sadržaj"</string>
-    <string name="search_title" msgid="5412680850141871664">"Pretražite kontakte"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Pretražite kontakte"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Višestruko"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Odaberite broj telefona"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Samo ovaj put"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Uvijek"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g> – zadano"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  - Dodati u omiljeno"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Obavještenja tokom dolaznog poziva"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Dolazni poziv"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Obavještenje za propušten poziv"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Propušteni poziv"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"Na čekanju"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Postavke"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Početni ekran"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Redoslijed kontakata"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Ime"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Prezime"</string>
-</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
deleted file mode 100644
index dd6e043..0000000
--- a/res/values-ca/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Telèfon"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Per poder trucar, primer cal que connectis el telèfon al cotxe per Bluetooth."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"El Bluetooth no està disponible."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Activa el Bluetooth per fer o rebre trucades."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Vincula el telèfon amb el cotxe per fer o rebre trucades."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Connecta el Bluetooth"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Emergència"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Trucada d\'emergència"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"És possible que aquest contacte s\'hagi suprimit."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"No es pot marcar aquest número. Comprova\'l i tornar-ho a provar."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Les trucades no estan disponibles. Torna-ho a provar."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Rebutja"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Respon"</string>
-    <string name="call_back" msgid="5745638356098600872">"Torna la trucada"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Bluetooth del vehicle"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Altaveu"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Auricular"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Marca un número"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Preferits"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Historial de trucades"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Contactes"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Teclat"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Avui"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Ahir"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Anteriors"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Afegeix un preferit"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Encara no has afegit cap preferit"</string>
-    <string name="search_title" msgid="5412680850141871664">"Cerca contactes"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Cerca contactes"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Diversos"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Tria un número de telèfon"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Només una vegada"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Sempre"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>: predeterminat"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>: preferit"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Notificació de trucada entrant"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Trucada entrant"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Notificació de trucada perduda"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Trucada perduda"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"En espera"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Configuració"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Pantalla d\'inici"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Ordre dels contactes"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Nom"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Cognoms"</string>
-</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
deleted file mode 100644
index 023b056..0000000
--- a/res/values-cs/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Telefon"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Aby bylo možné volat, propojte telefon s autem pomocí Bluetooth"</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth není k dispozici."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Chcete-li přijímat a uskutečňovat hovory, zapněte Bluetooth."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Chcete-li uskutečňovat a přijímat hovory, spárujte telefon s autem."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Připojit k Bluetooth"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Stav nouze"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Tísňové volání"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Tento kontakt byl zřejmě smazán."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Toto číslo nelze vytočit. Zkontrolujte ho a zkuste to znovu."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Telefonní hovor není k dispozici. Zkuste to později."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Odmítnout"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Přijmout"</string>
-    <string name="call_back" msgid="5745638356098600872">"Zavolat zpět"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Bluetooth ve vozidle"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Telefon pro hlasitý poslech"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Sluchátko"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Vytočit číslo"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Oblíbené"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Historie hovorů"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Kontakty"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Číselník"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Dnes"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Včera"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Starší"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Přidat oblíbený kontakt"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Zatím jste nepřidali žádné oblíbené kontakty"</string>
-    <string name="search_title" msgid="5412680850141871664">"Prohledat kontakty"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Prohledat kontakty"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Více čísel"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Vyberte telefonní číslo"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Pouze jednou"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Vždy"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g> – výchozí"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g> – přidat mezi oblíbené"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Oznámení o příchozím hovoru"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Příchozí hovor"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Zmeškané oznámení o hovoru"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Zmeškaný hovor"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"Podrženo"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Nastavení"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Úvodní obrazovka"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Pořadí kontaktů"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Jméno"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Příjmení"</string>
-</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
deleted file mode 100644
index 5b5a42f..0000000
--- a/res/values-da/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Opkald"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Slut din telefon til bilen via Bluetooth for at foretage opkald."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth er ikke tilgængelig."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Aktivér Bluetooth for at foretage eller modtage opkald."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Hvis du vil foretage eller modtage opkald, skal du parre din telefon med din bil."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Opret forbindelse til Bluetooth"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Nødopkald"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Nødopkald"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Kontakten er muligvis slettet."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Dette nummer er ugyldigt. Tjek nummeret, og prøv igen."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Der kan ikke foretages telefonopkald. Prøv igen senere."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Afvis"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Besvar"</string>
-    <string name="call_back" msgid="5745638356098600872">"Ring tilbage"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Bluetooth i køretøj"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Medhør"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Håndsæt"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Angiv et nummer"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Favoritter"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Opkaldshistorik"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Kontakter"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Numerisk tastatur"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"I dag"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"I går"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Ældre"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Tilføj en favorit"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Du har endnu ikke tilføjet nogen favoritter"</string>
-    <string name="search_title" msgid="5412680850141871664">"Søg i kontakter"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Søg i kontakter"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Flere"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Vælg et telefonnummer"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Kun én gang"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Altid"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  – standard"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g> – favoritnummer"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Notifikation om indgående opkald"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Indgående opkald"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Notifikation om ubesvaret opkald"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Ubesvaret opkald"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"Afventer"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Indstillinger"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Startskærm"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Kontaktrækkefølge"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Fornavn"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Efternavn"</string>
-</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
deleted file mode 100644
index ea858ff..0000000
--- a/res/values-de/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Telefon"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Stelle eine Bluetooth-Verbindung zwischen Telefon und Auto her, um zu telefonieren."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth ist nicht verfügbar."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Aktiviere Bluetooth, um Anrufe tätigen und empfangen zu können."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Kopple dein Smartphone und Auto, um Anrufe tätigen oder empfangen zu können."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Mit Bluetooth verbinden"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Notruf"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Notruf"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Dieser Kontakt wurde eventuell gelöscht."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Diese Nummer kann nicht gewählt werden. Überprüfe sie und versuch es noch einmal."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Anrufen ist nicht verfügbar. Versuch es später noch einmal."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Ablehnen"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Annehmen"</string>
-    <string name="call_back" msgid="5745638356098600872">"Zurückrufen"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Bluetooth des Fahrzeugs"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Freisprechfunktion"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Mobiltelefon"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Nummer wählen"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Favoriten"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Anrufliste"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Kontakte"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Wähltasten"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Heute"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Gestern"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Älter"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Favoriten hinzufügen"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Du hast noch keine Favoriten hinzugefügt"</string>
-    <string name="search_title" msgid="5412680850141871664">"Kontakte suchen"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Kontakte suchen"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Mehrere"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Telefonnummer auswählen"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Nur diesmal"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Immer"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g> – Standardeinstellung"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g> – Favorit"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Benachrichtigung zu eingehendem Anruf"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Eingehender Anruf"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Benachrichtigung für verpassten Anruf"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Verpasster Anruf"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"Wird gehalten"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Einstellungen"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Startbildschirm"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Reihenfolge der Kontakte"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Vorname"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Nachname"</string>
-</resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
deleted file mode 100644
index c4c93fc..0000000
--- a/res/values-el/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Τηλέφωνο"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Για να ολοκληρώσετε την κλήση, συνδέστε πρώτα το τηλέφωνό σας στο αυτοκίνητό σας μέσω Bluetooth."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Το Bluetooth δεν είναι διαθέσιμο."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Για να πραγματοποιήσετε ή να λάβετε κλήσεις, ενεργοποιήστε το Bluetooth."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Για να πραγματοποιήσετε ή να λάβετε κλήσεις, κάντε σύζευξη του τηλεφώνου σας με το αυτοκίνητο."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Σύνδεση σε Bluetooth"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Έκτακτη ανάγκη"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Κλήση έκτακτης ανάγκης"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Αυτή η επαφή μπορεί να έχει διαγραφεί."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Δεν είναι δυνατή η κλήση αυτού του αριθμού. Ελέγξτε τον και δοκιμάστε ξανά."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Η τηλεφωνική κλήση δεν είναι διαθέσιμη. Δοκιμάστε ξανά αργότερα."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Απόρριψη"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Απάντηση"</string>
-    <string name="call_back" msgid="5745638356098600872">"Επανάκληση"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Bluetooth οχήματος"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Ανοιχτή ακρόαση"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Συσκευή"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Κλήση αριθμού"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Αγαπημένα"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Ιστορικό κλήσεων"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Επαφές"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Πληκτρολόγιο κλήσης"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Σήμερα"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Χθες"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Παλαιότερες"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Προσθήκη αγαπημένης"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Δεν έχετε προσθέσει ακόμα αγαπημένα"</string>
-    <string name="search_title" msgid="5412680850141871664">"Αναζήτηση επαφών"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Αναζήτηση επαφών"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Πολλαπλά"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Επιλέξτε αριθμό τηλεφώνου"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Μόνο μία φορά"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Πάντα"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  - Προεπιλογή"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  - Αγαπημένο"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Ειδοποίηση εισερχόμενης κλήσης"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Εισερχόμενη κλήση"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Ειδοποίηση αναπάντητης κλήσης"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Αναπάντητη κλήση"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"Σε αναμονή"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Ρυθμίσεις"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Οθόνη έναρξης"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Παραγγελία επαφής"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Όνομα"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Επώνυμο"</string>
-</resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
deleted file mode 100644
index a53e57b..0000000
--- a/res/values-en-rAU/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Phone"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"To complete your call, first connect your phone to your car via Bluetooth."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth is not available."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"To make or receive calls, turn Bluetooth on."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"To make or receive calls, pair your phone with the car."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Connect to Bluetooth"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Emergency"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Emergency call"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"This contact might have been deleted."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Can\'t dial this number. Check it and try again."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Phone call is not available. Please try again later."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Decline"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Answer"</string>
-    <string name="call_back" msgid="5745638356098600872">"Call back"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Vehicle Bluetooth"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Speaker phone"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Handset"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Dial a number"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Favourites"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Call History"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Contacts"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Dial Pad"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Today"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Yesterday"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Older"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Add a favourite"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"You haven\'t added any favourites yet"</string>
-    <string name="search_title" msgid="5412680850141871664">"Search contacts"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Search contacts"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Multiple"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Choose a phone number"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Just once"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Always"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g> – Default"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  – Favourite"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Incoming call notification"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Incoming call"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Missed call notification"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Missed call"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"On Hold"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Settings"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Start screen"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Contact order"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"First name"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Surname"</string>
-</resources>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
deleted file mode 100644
index a53e57b..0000000
--- a/res/values-en-rCA/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Phone"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"To complete your call, first connect your phone to your car via Bluetooth."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth is not available."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"To make or receive calls, turn Bluetooth on."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"To make or receive calls, pair your phone with the car."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Connect to Bluetooth"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Emergency"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Emergency call"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"This contact might have been deleted."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Can\'t dial this number. Check it and try again."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Phone call is not available. Please try again later."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Decline"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Answer"</string>
-    <string name="call_back" msgid="5745638356098600872">"Call back"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Vehicle Bluetooth"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Speaker phone"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Handset"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Dial a number"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Favourites"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Call History"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Contacts"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Dial Pad"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Today"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Yesterday"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Older"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Add a favourite"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"You haven\'t added any favourites yet"</string>
-    <string name="search_title" msgid="5412680850141871664">"Search contacts"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Search contacts"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Multiple"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Choose a phone number"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Just once"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Always"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g> – Default"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  – Favourite"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Incoming call notification"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Incoming call"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Missed call notification"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Missed call"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"On Hold"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Settings"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Start screen"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Contact order"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"First name"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Surname"</string>
-</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
deleted file mode 100644
index a53e57b..0000000
--- a/res/values-en-rGB/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Phone"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"To complete your call, first connect your phone to your car via Bluetooth."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth is not available."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"To make or receive calls, turn Bluetooth on."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"To make or receive calls, pair your phone with the car."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Connect to Bluetooth"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Emergency"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Emergency call"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"This contact might have been deleted."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Can\'t dial this number. Check it and try again."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Phone call is not available. Please try again later."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Decline"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Answer"</string>
-    <string name="call_back" msgid="5745638356098600872">"Call back"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Vehicle Bluetooth"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Speaker phone"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Handset"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Dial a number"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Favourites"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Call History"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Contacts"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Dial Pad"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Today"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Yesterday"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Older"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Add a favourite"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"You haven\'t added any favourites yet"</string>
-    <string name="search_title" msgid="5412680850141871664">"Search contacts"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Search contacts"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Multiple"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Choose a phone number"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Just once"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Always"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g> – Default"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  – Favourite"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Incoming call notification"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Incoming call"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Missed call notification"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Missed call"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"On Hold"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Settings"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Start screen"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Contact order"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"First name"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Surname"</string>
-</resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
deleted file mode 100644
index a53e57b..0000000
--- a/res/values-en-rIN/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Phone"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"To complete your call, first connect your phone to your car via Bluetooth."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth is not available."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"To make or receive calls, turn Bluetooth on."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"To make or receive calls, pair your phone with the car."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Connect to Bluetooth"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Emergency"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Emergency call"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"This contact might have been deleted."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Can\'t dial this number. Check it and try again."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Phone call is not available. Please try again later."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Decline"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Answer"</string>
-    <string name="call_back" msgid="5745638356098600872">"Call back"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Vehicle Bluetooth"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Speaker phone"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Handset"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Dial a number"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Favourites"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Call History"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Contacts"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Dial Pad"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Today"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Yesterday"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Older"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Add a favourite"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"You haven\'t added any favourites yet"</string>
-    <string name="search_title" msgid="5412680850141871664">"Search contacts"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Search contacts"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Multiple"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Choose a phone number"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Just once"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Always"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g> – Default"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  – Favourite"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Incoming call notification"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Incoming call"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Missed call notification"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Missed call"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"On Hold"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Settings"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Start screen"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Contact order"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"First name"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Surname"</string>
-</resources>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
deleted file mode 100644
index 1edc210..0000000
--- a/res/values-en-rXC/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‎‎‎‎‎‏‏‏‏‎‎‏‏‎‎‎‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‏‎‎‎‎‏‎‏‏‎Phone‎‏‎‎‏‎"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‎‏‎‏‏‏‎‎‎‏‏‎‎‏‎‏‎‎‏‏‏‏‏‎‎‎‎‎‎‎‎‏‏‏‏‏‎‎‎‎‎‏‏‎‎‏‎‏‎‏‎‏‏‎To complete your call, first connect your phone to your car via Bluetooth.‎‏‎‎‏‎"</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‏‏‏‎‏‏‎‎‏‏‎‏‎‎‎‎‎‏‏‎‏‏‏‏‎‎‎‎‏‏‏‏‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‎‎‏‎‎‎‏‎Bluetooth is not available.‎‏‎‎‏‎"</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‏‎‎‏‎‏‎‎‏‎‏‏‎‎‎‏‎‏‏‎‎‎‏‏‎‏‏‏‎‎‎‎‎‎‏‏‎‎‏‎‏‎‏‎‏‎‎‎‎‎‎‏‏‎To make or receive calls, turn Bluetooth on.‎‏‎‎‏‎"</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‎‏‏‎‏‏‎‎‏‎‎‏‏‎‏‏‏‏‎‏‎‏‎‎‏‎‏‏‎‎‎‏‏‎‎‎‎‏‏‎‎‎‎‏‎‎‏‎‎‎‏‏‏‎‎‎To make or receive calls, pair your phone with the car.‎‏‎‎‏‎"</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‏‎‎‎‎‎‏‎‎‎‏‏‎‎‏‏‏‎‏‏‎‎‏‎‎‎‎‏‎‎‏‏‏‏‏‎‎‏‎‏‏‏‎‏‏‏‏‎‎‎‎‏‏‏‏‏‎‏‎‎Connect to Bluetooth‎‏‎‎‏‎"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‎‎‏‏‏‏‏‏‎‎‏‏‎‎‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‎‎‎‏‏‎‏‏‎‎‎‏‏‏‎‎‎‏‏‏‏‎Emergency‎‏‎‎‏‎"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‏‏‏‎‏‏‏‏‎‎‎‎‎‏‎‏‎‏‎‏‎‎‎‎‏‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‎‎‏‏‎‏‏‏‏‎‏‎Emergency call‎‏‎‎‏‎"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‏‎‏‏‎‏‏‏‏‎‏‏‎‏‎‎‏‏‎‏‎‏‎‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‏‎‏‏‏‏‏‎‎‏‏‎‎‎This contact might have been deleted.‎‏‎‎‏‎"</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‎‏‏‏‎‏‏‏‎‏‎‎‏‎‎‎‏‎‎‏‏‎‎‏‎‏‎‏‎‎‎‎‏‎‎‏‏‎‎‎‏‏‎‏‎‏‎‏‏‏‏‏‎‎‎‎Can\'t dial this number. Check it and try again.‎‏‎‎‏‎"</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‏‎‎‏‏‎‏‏‎‎‏‎‎‎‏‎‏‎‎‏‏‎‎‎‏‎‎‎‎‏‏‏‎‎‎‏‏‎‏‏‎‏‏‎‏‎‎‎‎‏‎‎Phone call is not available. Please try again later.‎‏‎‎‏‎"</string>
-    <string name="decline_call" msgid="2505987200485272226">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‏‎‎‎‏‏‏‎‎‎‎‏‏‏‎‎‎‎‏‎‏‎‎‏‏‏‎‎‎‎‎‏‎‎‏‏‎‎‏‏‎‏‎‏‎‏‎‏‎‏‎‎‎‏‎‎Decline‎‏‎‎‏‎"</string>
-    <string name="answer_call" msgid="3272474440561548115">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‏‎‏‎‏‎‎‎‏‎‏‎‏‎‎‎‏‎‏‎‏‎‎‏‎‏‎‏‏‎‎‎‏‏‎‏‏‏‎‏‎‏‏‎‏‏‎‏‎‏‎‎‏‏‎Answer‎‏‎‎‏‎"</string>
-    <string name="call_back" msgid="5745638356098600872">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‏‏‏‎‎‏‎‎‏‏‎‏‏‏‎‏‎‎‏‎‎‏‎‏‎‎‏‏‏‎‎‎‏‏‏‎‏‏‏‎‎‏‏‏‏‏‎‏‎‏‎‎‎‎Call back‎‏‎‎‏‎"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‎‎‏‏‏‎‎‏‎‎‎‏‏‏‏‎‏‏‏‏‎‏‎‏‎‏‏‎‏‏‎‏‏‏‎‎‏‎‏‎‎‎‎‎‎‎‎‎‎‏‎‎‎Vehicle bluetooth‎‏‎‎‏‎"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‏‎‏‏‎‏‎‎‏‏‏‏‏‎‎‏‏‎‏‏‎‎‎‏‏‎‎‎‏‎‏‎‏‎‎‎‎‏‏‏‎‏‎‏‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎Speaker phone‎‏‎‎‏‎"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‎‎‎‏‎‎‏‏‏‎‏‎‎‎‎‎‏‏‎‎‏‎‏‏‏‎‎‏‎‏‎‏‎‎‏‏‏‏‎‏‏‎‏‎‎‏‏‎‏‏‏‎‏‏‎Handset‎‏‎‎‏‎"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‎‏‎‎‏‏‏‎‏‎‎‏‏‎‏‎‎‏‎‎‎‏‏‎‏‎‎‎‏‏‏‎‏‏‎‎‎‏‎‏‎‎‎‏‎‏‎‏‏‎‎‎‎Dial a number‎‏‎‎‏‎"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‏‎‏‎‏‎‎‏‎‏‏‎‏‏‏‎‏‎‎‎‎‎‏‏‎‎‎‎‎‏‏‏‎‏‏‏‎‏‎‎‏‏‏‏‎‏‎‏‎‏‎‎‎‏‎Favorites‎‏‎‎‏‎"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‎‎‎‎‏‎‏‎‎‎‎‏‏‎‎‎‏‎‎‏‏‎‎‎‎‎‏‏‎‎‏‎‎‏‏‏‎‏‎‎‎‎‏‎‎‎‏‏‏‎‏‎‏‎‎Call History‎‏‎‎‏‎"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‏‏‎‏‎‎‎‏‏‎‎‎‎‏‏‎‎‏‎‏‏‎‏‏‏‏‎‏‎‎‎‏‎‎‎‏‏‎‏‏‎‎‎‎‎‏‎‎Contacts‎‏‎‎‏‎"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‏‏‎‏‎‎‏‏‎‎‎‏‏‏‎‎‎‎‏‏‏‎‏‎‏‎‏‎‎‏‏‎‏‏‏‏‏‎‏‎‏‎‎Dialpad‎‏‎‎‏‎"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‎‏‏‎‏‎‎‏‏‏‎‏‎‎‏‏‎‏‏‎‏‎‎‏‏‎‎‎‎‏‎‏‎‏‎‎‏‎‎‎‏‎‎‎‎‏‏‏‏‏‏‎‎Today‎‏‎‎‏‎"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‎‎‎‏‏‏‎‎‎‏‏‎‏‏‏‎‏‏‏‏‎‏‏‏‎‎‎‏‏‎‏‏‎‏‏‎‏‎‏‏‎‎‎‏‏‎‏‎‎‏‎‏‏‏‎Yesterday‎‏‎‎‏‎"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‎‏‏‏‏‎‎‎‎‏‎‏‎‎‏‎‏‏‏‎‏‏‏‎‏‎‎‏‎‎‎‏‏‎‎‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‎‏‏‎Older‎‏‎‎‏‎"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‏‏‏‏‎‎‏‎‎‏‎‎‏‏‏‏‏‏‎‎‎‎‎‏‏‏‏‎‏‏‏‎‏‎‎‏‎‎‎‏‏‏‏‏‎‎‎‎‎‎‎‎Add a favorite‎‏‎‎‏‎"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‎‏‏‏‎‏‎‎‏‎‏‏‎‎‎‏‏‏‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‏‎‎‏‏‎‎‎‏‏‏‎You haven\'t added any favorites yet‎‏‎‎‏‎"</string>
-    <string name="search_title" msgid="5412680850141871664">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‎‎‏‏‏‎‏‏‎‏‏‎‏‎‎‏‎‎‎‏‏‏‎‎‎‏‏‏‎‏‏‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‎‎Search contacts‎‏‎‎‏‎"</string>
-    <string name="search_hint" msgid="3099066132607042439">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‎‎‎‎‎‏‎‎‎‎‏‏‎‎‎‎‎‏‏‏‎‏‎‎‏‏‎‎‎‎‏‎‏‏‏‏‏‎‎‏‎‎‎‎‎‏‏‏‎‎‎‎‏‏‏‎Search contacts‎‏‎‎‏‎"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‏‏‏‎‎‏‏‎‏‏‎‏‎‎‏‎‎‎‏‏‏‏‏‎‏‏‎‏‏‎‏‏‏‎‏‏‎‏‎‎‏‏‎‎‎‎‏‏‎‏‎‏‎‎‎Multiple‎‏‎‎‏‎"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‎‏‎‏‎‏‏‎‏‎‎‏‎‏‏‎‏‎‎‏‎‏‎‎‎‏‎‏‏‎‏‎‏‎‏‏‎‏‎‎‎‎‎‎‎‎‏‎‏‏‏‏‎‏‎Choose a phone number‎‏‎‎‏‎"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‏‎‏‏‎‏‏‏‏‏‏‎‏‎‎‎‏‏‏‎‏‎‏‎‎‏‎‎‏‏‏‎‏‏‎‏‎‏‏‎‎‎‏‏‏‏‏‏‎‎‎‏‎‎‎Just once‎‏‎‎‏‎"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‏‏‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‎‏‏‎‎‏‎‏‎‏‏‏‎‏‎‎‎‏‎‎‏‏‎‎‏‎‎‎‎‏‏‎‏‎‏‎‎‎Always‎‏‎‎‏‎"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‎‏‏‎‎‎‏‏‏‎‏‏‏‏‎‏‎‎‎‎‏‏‏‎‏‎‏‏‎‏‏‎‏‏‏‎‏‏‎‏‏‎‎‎‏‏‏‏‎‎‏‎‎‎‎‎‏‎‎‏‏‎<xliff:g id="LABEL">%1$s</xliff:g>‎‏‎‎‏‏‏‎  - Default‎‏‎‎‏‎"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‏‎‎‎‏‎‎‏‎‏‎‏‎‎‎‎‎‎‎‏‎‏‎‎‏‎‏‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‏‎‎‏‎‎‏‏‎<xliff:g id="LABEL">%1$s</xliff:g>‎‏‎‎‏‏‏‎  - Favorite‎‏‎‎‏‎"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‏‎‎‏‏‏‎‎‏‏‎‎‏‏‎‏‎‏‏‎‏‎‎‏‏‎‎‏‏‎‎‏‎‎‏‏‏‏‎‎‎‏‏‎‏‎‏‏‏‎‎‏‎‎Incoming call notification‎‏‎‎‏‎"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‏‏‎‏‎‎‎‏‏‏‏‏‏‎‎‏‎‏‎‎‎‏‎‎‏‏‎‎‎‎‎‏‎‎‏‎‏‎‎‎‎‎‏‎‎‎‎‎‎‎‎‎‏‎‏‎Incoming call‎‏‎‎‏‎"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‎‎‎‏‎‏‏‎‎‎‏‎‏‎‏‎‎‎‏‏‎‏‎‏‎‏‏‏‎‎‎‎‏‎‎‏‏‏‎‏‎‎‏‎‎‎‏‏‏‏‏‎‎‎Missed call notification‎‏‎‎‏‎"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‎‎‏‏‏‎‏‏‎‎‏‏‎‏‎‏‏‎‎‎‏‎‏‎‎‎‎‎‎‏‎‏‎‏‎‎‏‏‏‏‎‏‏‎‎‎‏‎Missed call‎‏‎‎‏‎"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‎‎‎‎‏‏‎‏‏‎‏‎‎‎‏‎‎‎‏‎‎‎‎‏‏‎‏‏‎‎‏‏‏‏‏‎‏‎‏‎‏‏‏‏‎‎‎‎‏‏‎‏‏‎On Hold‎‏‎‎‏‎"</string>
-    <string name="setting_title" msgid="1296639422364732365">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‎‏‎‏‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‎‎‎‏‎‏‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎Settings‎‏‎‎‏‎"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‎‏‏‏‎‎‎‎‎‏‏‎‏‎‏‎‎‎‎‏‏‏‎‏‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‎‏‎‎‏‏‏‎‎‏‎‎‏‏‏‎Start screen‎‏‎‎‏‎"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‎‎‎‏‎‎‎‎‏‎‎‎‏‎‎‎‏‎‎‎‎‎‏‎‏‎‏‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‎‏‎‎‏‎‏‎‏‏‏‏‎‎Contact order‎‏‎‎‏‎"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‎‏‏‎‎‎‏‎‏‏‎‎‎‎‎‏‎‎‏‎‏‎‏‏‏‎‏‎‎‏‏‎‎‎‎‎‎‏‏‎‎‎‏‎‎‎‎‎‏‎‎‎‎First name‎‏‎‎‏‎"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‎‎‏‏‏‏‏‏‎‎‏‎‎‎‎‎‎‏‎‏‎‏‏‏‏‏‎‎‏‎‏‏‏‎‎‏‏‎‎‎‏‏‎‎‏‎‏‎‎‏‏‎Last name‎‏‎‎‏‎"</string>
-</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
deleted file mode 100644
index f894b0b..0000000
--- a/res/values-es-rUS/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Teléfono"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Para realizar la llamada, debes conectar el teléfono al auto mediante Bluetooth."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth no está disponible."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Para realizar y recibir llamadas, activa el Bluetooth."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Para realizar y recibir llamadas, sincroniza el teléfono con el auto."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Conectarse a Bluetooth"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Emergencia"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Llamada de emergencia"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Es posible que se haya borrado este contacto."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"No se puede marcar ese número. Revísalo y vuelve a intentarlo."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Las llamadas telefónicas no están disponibles. Vuelve a intentarlo más tarde."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Rechazar"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Responder"</string>
-    <string name="call_back" msgid="5745638356098600872">"Devolver llamada"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Bluetooth del vehículo"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Altavoz"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Auricular"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Marcar un número"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Favoritos"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Historial de llamadas"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Contactos"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Teclado"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Hoy"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Ayer"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Anteriores"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Agregar un favorito"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Todavía no agregaste ningún favorito"</string>
-    <string name="search_title" msgid="5412680850141871664">"Buscar contactos"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Buscar contactos"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Varias"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Elige un número de teléfono"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Solo una vez"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Siempre"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  - predeterminado"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g> - Favorito"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Notificación de llamada entrante"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Llamada entrante"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Notificación de llamada perdida"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Llamada perdida"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"En espera"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Configuración"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Pantalla de inicio"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Orden de los contactos"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Nombre"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Apellido"</string>
-</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
deleted file mode 100644
index 8a2cc93..0000000
--- a/res/values-es/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Teléfono"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Para hacer la llamada, conecta el teléfono al coche por Bluetooth."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"El Bluetooth no está disponible."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Para hacer o recibir llamadas, activa el Bluetooth."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Para hacer o recibir llamadas, vincula tu teléfono con el coche."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Conectarse a un dispositivo Bluetooth"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Emergencia"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Llamada de emergencia"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Es posible que este contacto se haya eliminado."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"No se puede marcar este número. Comprueba si es correcto y vuelve a intentarlo."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Las llamadas telefónicas no están disponibles. Vuelve a intentarlo más tarde."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Rechazar"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Responder"</string>
-    <string name="call_back" msgid="5745638356098600872">"Llamar"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Bluetooth del vehículo"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Altavoz del teléfono"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Auricular"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Marcar un número"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Favoritos"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Historial de llamadas"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Contactos"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Teclado"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Hoy"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Ayer"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Más antiguas"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Añadir un favorito"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Aún no has añadido favoritos"</string>
-    <string name="search_title" msgid="5412680850141871664">"Buscar contactos"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Buscar contactos"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Varios"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Elige un número de teléfono"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Solo una vez"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Siempre"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g> ‑ Predeterminado"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g> - Favorito"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Notificación de llamada entrante"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Llamada entrante"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Notificación de llamada perdida"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Llamada perdida"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"En espera"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Ajustes"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Pantalla de inicio"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Orden de los contactos"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Nombre"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Apellido"</string>
-</resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
deleted file mode 100644
index 1aa893b..0000000
--- a/res/values-et/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Telefon"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Telefonikõne tegemiseks ühendage esmalt Bluetoothi kaudu oma telefon autoga."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth ei ole saadaval."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Helistamiseks või kõnede vastuvõtmiseks lülitage Bluetooth sisse."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Helistamiseks või kõnede vastuvõtmiseks siduge oma telefon autoga."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Ühenda Bluetoothiga"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Hädaabi"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Hädaabikõne"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"See kontakt võib olla kustutatud."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Seda numbrit ei saa valida. Kontrollige seda ja proovige uuesti."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Helistamine ei ole saadaval. Proovige hiljem uuesti."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Keeldu"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Vasta"</string>
-    <string name="call_back" msgid="5745638356098600872">"Helista tagasi"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Sõiduki Bluetooth"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Valjuhääldi"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Käsitelefon"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Vali number"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Lemmikud"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Kõneajalugu"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Kontaktid"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Valimisklahvistik"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Täna"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Eile"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Vanemad"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Lisa lemmik"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Te ei ole veel lemmikuid lisanud"</string>
-    <string name="search_title" msgid="5412680850141871664">"Otsige kontakte"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Otsige kontakte"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Mitu"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Telefoninumbri valimine"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Ainult üks kord"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Alati"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g> – vaikeseade"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  – lemmik"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Sissetuleva kõne märguanne"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Sissetulev kõne"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Vastamata kõne märguanne"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Vastamata kõne"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"Ootel"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Seaded"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Avakuva"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Kontaktide järjestus"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Eesnimi"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Perekonnanimi"</string>
-</resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
deleted file mode 100644
index d221c16..0000000
--- a/res/values-eu/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Telefonoa"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Dei egiteko, konektatu telefonoa autoarekin Bluetooth bidez."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth konexioa ez dago erabilgarri."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Deiak jaso edo egiteko, aktibatu Bluetooth konexioa."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Deiak jaso edo egiteko, parekatu telefonoa autoarekin."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Konektatu Bluetooth-era"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Larrialdi-deia"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Larrialdi-deia"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Baliteke kontaktua ezabatu izatea."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Ezin da deitu zenbaki honetara. Egiaztatu zenbakia eta saiatu berriro."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Telefono-deiak egiteko aukera ez dago erabilgarri. Saiatu berriro geroago."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Baztertu"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Erantzun"</string>
-    <string name="call_back" msgid="5745638356098600872">"Itzuli deia"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Ibilgailuaren Bluetooth-a"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Bozgorailua"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Telefonoa"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Markatu zenbaki bat"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Gogokoak"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Deien historia"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Kontaktuak"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Markagailua"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Gaur"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Atzo"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Zaharragoak"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Gehitu gogoko bat"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Ez duzu gehitu gogokorik oraindik"</string>
-    <string name="search_title" msgid="5412680850141871664">"Bilatu kontaktuetan"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Bilatu kontaktuetan"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Hainbat"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Aukeratu telefono-zenbaki bat"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Behin soilik"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Beti"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  - Lehenetsia"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  - Gogokoa"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Jasotako dei bati buruzko jakinarazpena"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Jasotako deia"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Dei galduaren jakinarazpena"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Dei galdua"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"Zain"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Ezarpenak"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Hasierako pantaila"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Kontaktuak bistaratzeko ordena"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Izena"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Abizena"</string>
-</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
deleted file mode 100644
index 98d1656..0000000
--- a/res/values-fa/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"تلفن"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"برای تکمیل تماستان، ابتدا تلفنتان را ازطریق بلوتوث به خودرو متصل کنید."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"بلوتوث دردسترس نیست."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"برای برقراری یا دریافت تماس، بلوتوث را روشن کنید."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"برای برقراری یا دریافت تماس، تلفنتان را با خودرو مرتبط کنید."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"اتصال به بلوتوث"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"اضطراری"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"تماس اضطراری"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"ممکن است این مخاطب حذف شده باشد."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"این شماره را نمی‌توان شماره‌گیری کرد. آن را بررسی کنید و دوباره امتحان کنید."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"تماس تلفنی دردسترس نیست. لطفاً بعداً دوباره امتحان کنید."</string>
-    <string name="decline_call" msgid="2505987200485272226">"رد کردن"</string>
-    <string name="answer_call" msgid="3272474440561548115">"پاسخ"</string>
-    <string name="call_back" msgid="5745638356098600872">"پاسخ تماس"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"بلوتوث خودرو"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"بلندگوی تلفن"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"گوشی"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"شماره‌گیری"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"موارد دلخواه"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"سابقه تماس"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"مخاطبین"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"صفحه شماره‌گیری"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"امروز"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"دیروز"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"قدیمی‌تر"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"افزودن مورد دلخواه"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"هنوز مورد دلخواهی اضافه نکرده‌اید"</string>
-    <string name="search_title" msgid="5412680850141871664">"جستجوی مخاطبین"</string>
-    <string name="search_hint" msgid="3099066132607042439">"جستجوی مخاطبین"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"چندین"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"انتخاب شماره تلفن"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"فقط یک‌بار"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"همیشه"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  - پیش‌فرض"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g> - مورد دلخواه"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"اعلان تماس ورودی"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"تماس ورودی"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"اعلان تماس بی‌پاسخ"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"تماس بی‌پاسخ"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"در انتظار"</string>
-    <string name="setting_title" msgid="1296639422364732365">"تنظیمات"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"صفحه شروع"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"ترتیب مخاطبین"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"نام"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"نام خانوادگی"</string>
-</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
deleted file mode 100644
index 5d6d36a..0000000
--- a/res/values-fi/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Puhelin"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Yhdistä puhelin autoon Bluetoothilla soittaaksesi puhelun."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth ei käytettävissä"</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Ota Bluetooth käyttöön, niin voit soittaa puheluja ja vastata niihin."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Yhdistä auto ja puhelin laitepariksi, jotta voit soittaa puheluja ja vastata niihin."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Muodosta Bluetooth-yhteys"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Hätätilanne"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Hätäpuhelu"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Tämä yhteystieto on mahdollisesti poistettu."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Tähän numeroon ei voi soittaa. Tarkista se ja yritä uudelleen."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Soittaminen ei ole käytettävissä. Yritä myöhemmin uudelleen."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Hylkää"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Vastaa"</string>
-    <string name="call_back" msgid="5745638356098600872">"Soita takaisin"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Auton Bluetooth"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Kaiutinpuhelin"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Matkapuhelin"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Soita numeroon"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Suosikit"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Soittohistoria"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Yhteystiedot"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Näppäimistö"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Tänään"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Eilen"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Vanhemmat"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Lisää suosikki"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Et ole vielä lisännyt suosikkeja"</string>
-    <string name="search_title" msgid="5412680850141871664">"Hae yhteystietoja"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Hae yhteystietoja"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Useita"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Valitse puhelinnumero"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Vain kerran"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Aina"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  – Oletus"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  – Suosikki"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Ilmoitus saapuvasta puhelusta"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Saapuva puhelu"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Ilmoitus vastaamattomasta puhelusta"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Vastaamaton puhelu"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"Pidossa"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Asetukset"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Aloitusnäyttö"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Yhteystietojen järjestys"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Etunimi"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Sukunimi"</string>
-</resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
deleted file mode 100644
index 989cbcf..0000000
--- a/res/values-fr-rCA/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Téléphone"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Pour passer votre appel, connectez d\'abord votre téléphone à votre voiture par Bluetooth."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth n\'est pas disponible."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Pour passer ou recevoir des appels, activez le Bluetooth."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Pour passer ou recevoir des appels, associez votre téléphone à votre voiture."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Connexion au Bluetooth"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Urgence"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Appel d\'urgence"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Ce contact a peut-être été supprimé."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Impossible de composer ce numéro. Vérifiez-le, puis réessayez."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Vous ne pouvez pas passer d\'appels téléphoniques pour le moment. Veuillez réessayer plus tard."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Refuser"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Répondre"</string>
-    <string name="call_back" msgid="5745638356098600872">"Rappeler"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Bluetooth du véhicule"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Haut-parleur"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Combiné"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Composer un numéro"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Favoris"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Historique des appels"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Contacts"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Pavé numérique"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Aujourd\'hui"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Hier"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Plus anciens"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Ajouter un favori"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Vous n\'avez pas encore ajouté de favoris"</string>
-    <string name="search_title" msgid="5412680850141871664">"Rechercher dans les contacts"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Rechercher dans les contacts"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Plusieurs"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Choisir un numéro de téléphone"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Une seule fois"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Toujours"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g> – Par défaut"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g> – Favoris"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Notification d\'appel entrant"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Appel entrant"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Notification d\'appel manqué"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Appel manqué"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"En attente"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Paramètres"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Écran de démarrage"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Ordre des contacts"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Prénom"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Nom de famille"</string>
-</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
deleted file mode 100644
index ee3419c..0000000
--- a/res/values-fr/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Téléphone"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Pour passer un appel, connectez tout d\'abord votre téléphone à la voiture en Bluetooth."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Le Bluetooth n\'est pas disponible."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Pour passer ou recevoir des appels, activez le Bluetooth."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Pour passer ou recevoir des appels, associez votre téléphone à la voiture."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Se connecter en Bluetooth"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Urgence"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Appel d\'urgence"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Ce contact a peut-être été supprimé."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Impossible de composer ce numéro. Vérifiez-le, puis réessayez."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Vous ne pouvez pas passer d\'appels téléphoniques pour le moment. Veuillez réessayer plus tard."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Refuser"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Répondre"</string>
-    <string name="call_back" msgid="5745638356098600872">"Rappeler"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Bluetooth du véhicule"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Haut-parleur"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Combiné"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Composer un numéro"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Favoris"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Historique des appels"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Contacts"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Clavier"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Aujourd\'hui"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Hier"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Plus anciens"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Ajouter un favori"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Pour le moment, vous n\'avez ajouté aucun contact aux favoris"</string>
-    <string name="search_title" msgid="5412680850141871664">"Recherchez dans les contacts"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Recherchez dans les contacts"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Plusieurs"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Sélectionner un numéro de téléphone"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Une seule fois"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Toujours"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g> – Par défaut"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g> - Favori"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Notification d\'appel entrant"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Appel entrant"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Notification d\'appel manqué"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Appel manqué"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"En attente"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Paramètres"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Écran d\'accueil"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Ordre des contacts"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Prénom"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Nom"</string>
-</resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
deleted file mode 100644
index 515a86e..0000000
--- a/res/values-gl/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Teléfono"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Para completar a chamada, primeiro conecta o teléfono ao coche por Bluetooth."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"O Bluetooth non está dispoñible."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Para facer ou recibir chamadas, activa o Bluetooth."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Para facer ou recibir chamadas, vincula o teléfono co coche."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Conectar ao Bluetooth"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Chamada de emerxencia"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Chamada de emerxencia"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"É posible que se eliminase este contacto."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Non se puido marcar este número. Compróbao e téntao de novo."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"As chamadas telefónicas non están dispoñibles. Téntao de novo máis tarde."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Rexeitar"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Responder"</string>
-    <string name="call_back" msgid="5745638356098600872">"Devolver chamada"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Bluetooth do vehículo"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Altofalante"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Auricular"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Marcar un número"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Favoritos"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Historial de chamadas"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Contactos"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Teclado de marcación"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Hoxe"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Onte"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Máis antigas"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Engadir favorito"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Aínda non engadiches ningún favorito"</string>
-    <string name="search_title" msgid="5412680850141871664">"Buscar contactos"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Buscar contactos"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Varios"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Escoller un número de teléfono"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Só unha vez"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Sempre"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g> (número predeterminado)"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g> (favorito)"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Notificación de chamada entrante"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Chamada entrante"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Notificación de chamada perdida"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Chamada perdida"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"En espera"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Configuración"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Pantalla de inicio"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Orde dos contactos"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Nome"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Apelidos"</string>
-</resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
deleted file mode 100644
index af7c8e3..0000000
--- a/res/values-gu/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"ફોન"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"તમારો કૉલ પૂર્ણ કરવા માટે, પહેલાં તમારા ફોનને બ્લૂટૂથ મારફતે તમારી કાર સાથે કનેક્ટ કરો."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"બ્લૂટૂથ ઉપલબ્ધ નથી."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"કૉલ કરવા અથવા મેળવવા માટે, બ્લૂટૂથ ચાલુ કરો."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"કૉલ કરવા અથવા મેળવવા માટે, તમારા ફોનનું કાર સાથે જોડાણ કરો."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"બ્લૂટૂથ સાથે કનેક્ટ કરો"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"ઇમર્જન્સી"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"ઇમર્જન્સી કૉલ"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"એવું બની શકે છે કે આ સંપર્કને ડિલીટ કરવામાં આવ્યો હોય."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"આ નંબર ડાયલ કરી શકાતો નથી. તેને ચેક કરીને ફરી પ્રયાસ કરો."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"ફોન કૉલ ઉપલબ્ધ નથી. થોડા સમય પછી ફરી પ્રયાસ કરો."</string>
-    <string name="decline_call" msgid="2505987200485272226">"નકારો"</string>
-    <string name="answer_call" msgid="3272474440561548115">"જવાબ આપો"</string>
-    <string name="call_back" msgid="5745638356098600872">"કૉલ બેક"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"વાહનનું બ્લૂટૂથ"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"સ્પીકર ફોન"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"હૅન્ડસેટ"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"કોઈ નંબર ડાયલ કરો"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"મનપસંદ"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"કૉલ ઇતિહાસ"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"સંપર્કો"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"ડાયલપૅડ"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"આજે"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"ગઈ કાલે"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"જૂના"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"મનપસંદ સંપર્ક તરીકે ઉમેરો"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"તમે હજી સુધી કોઈ મનપસંદ ઉમેર્યા નથી"</string>
-    <string name="search_title" msgid="5412680850141871664">"સંપર્કોમાં શોધો"</string>
-    <string name="search_hint" msgid="3099066132607042439">"સંપર્કોમાં શોધો"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"એકથી વધુ"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"કોઈ ફોન નંબર પસંદ કરો"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"માત્ર એક વાર"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"હંમેશાં"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  - ડિફૉલ્ટ"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  - મનપસંદ"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"ઇનકમિંગ કૉલના નોટિફિકેશન"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"ઇનકમિંગ કૉલ"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"ચૂકી ગયેલ કૉલનું નોટિફિકેશન"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"ચૂકી ગયેલ કૉલ"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"હોલ્ડ પર"</string>
-    <string name="setting_title" msgid="1296639422364732365">"સેટિંગ"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"શરૂઆતની સ્ક્રીન"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"સંપર્કનો ક્રમ સૉર્ટ કરો"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"નામ"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"અટક"</string>
-</resources>
diff --git a/res/values-h1200dp/bools.xml b/res/values-h1200dp/bools.xml
deleted file mode 100644
index b737bbc..0000000
--- a/res/values-h1200dp/bools.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2019 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.
-  -->
-
-<resources>
-    <bool name="screen_size_tall">true</bool>
-</resources>
diff --git a/res/values-h1200dp/dimens.xml b/res/values-h1200dp/dimens.xml
index 9842357..b4b512f 100644
--- a/res/values-h1200dp/dimens.xml
+++ b/res/values-h1200dp/dimens.xml
@@ -20,6 +20,4 @@
     <dimen name="keypad_margin_x">48dp</dimen>
     <dimen name="keypad_margin_y">@*android:dimen/car_padding_4</dimen>
     <dimen name="keypad_margin">@*android:dimen/car_padding_6</dimen>
-
-    <dimen name="contact_details_title_margin_bottom">@*android:dimen/car_padding_5</dimen>
 </resources>
diff --git a/res/values-h610dp/bools.xml b/res/values-h610dp/bools.xml
deleted file mode 100644
index ab691bc..0000000
--- a/res/values-h610dp/bools.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2019 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.
-  -->
-
-<resources>
-    <bool name="screen_size_short">false</bool>
-</resources>
diff --git a/res/values-h610dp/dimens.xml b/res/values-h610dp/dimens.xml
index 9dba83d..23a9548 100644
--- a/res/values-h610dp/dimens.xml
+++ b/res/values-h610dp/dimens.xml
@@ -27,8 +27,6 @@
     <dimen name="fab_outline_size">104dp</dimen>
     <dimen name="fab_ripple_radius">52dp</dimen>
 
-    <dimen name="contact_details_avatar_size">126dp</dimen>
-
     <!-- Components -->
     <dimen name="control_bar_height">128dp</dimen>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
deleted file mode 100644
index 6e36238..0000000
--- a/res/values-hi/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"फ़ोन"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"कॉल पूरी करने के लिए, फ़ोन को पहले ब्लूटूथ के ज़रिए कार से कनेक्ट करें."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"ब्लूटूथ उपलब्ध नहीं है."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"कॉल करने या उसका जवाब देने के लिए ब्लूटूथ चालू करें."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"कॉल करने या कॉल का जवाब देने के लिए, अपने फ़ोन को कार से जोड़ें."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"ब्लूटूथ से कनेक्ट करें"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"आपातकालीन कॉल"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"आपातकालीन कॉल"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"यह संपर्क शायद मिटा दिया गया है."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"यह नंबर डायल नहीं किया जा सकता. इसे जाँचें और फिर से कोशिश करें."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"फ़ोन कॉल की सुविधा उपलब्ध नहीं है. कृपया बाद में कोशिश करें."</string>
-    <string name="decline_call" msgid="2505987200485272226">"अस्वीकार करें"</string>
-    <string name="answer_call" msgid="3272474440561548115">"जवाब दें"</string>
-    <string name="call_back" msgid="5745638356098600872">"वापस कॉल करें"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"गाड़ी का ब्लूटूथ"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"स्पीकर फ़ोन"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"हैंडसेट"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"नंबर डायल करें"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"पसंदीदा"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"कॉल इतिहास"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"संपर्क"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"डायलपैड"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"आज के"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"कल के"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"पहले के"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"पसंदीदा संपर्क जोड़ें"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"आपने पसंदीदा संपर्क के तौर पर किसी को नहीं जोड़ा है"</string>
-    <string name="search_title" msgid="5412680850141871664">"संपर्क खोजें"</string>
-    <string name="search_hint" msgid="3099066132607042439">"संपर्क खोजें"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"कई"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"फ़ोन नंबर चुनें"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"सिर्फ़ एक बार"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"हमेशा"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  - डिफ़ॉल्ट"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  - पसंदीदा"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"आने वाले कॉल (इनकमिंग) की सूचना"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"आने वाला कॉल (इनकमिंग)"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"मिस्ड कॉल (छूटी हुई कॉल) की सूचना"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"मिस्ड कॉल (छूटी हुई कॉल)"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"कॉल होल्ड पर है"</string>
-    <string name="setting_title" msgid="1296639422364732365">"सेटिंग"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"शुरुआती स्क्रीन"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"संपर्कों का क्रम"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"नाम"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"उपनाम"</string>
-</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
deleted file mode 100644
index 910e2d8..0000000
--- a/res/values-hr/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Telefon"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Da biste uputili ili prihvatili poziv, najprije povežite telefon s automobilom putem Bluetootha."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth nije dostupan."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Da biste upućivali ili primali pozive, uključite Bluetooth."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Da biste upućivali ili primali pozive, uparite telefon s automobilom."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Povezivanje s Bluetoothom"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Hitno"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Hitni poziv"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Taj je kontakt možda izbrisan."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Biranje tog broja nije uspjelo. Provjerite broj i pokušajte ponovo."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Telefonski poziv nije dostupan. Pokušajte ponovo kasnije."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Odbij"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Odgovori"</string>
-    <string name="call_back" msgid="5745638356098600872">"Uzvrati poziv"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Bluetooth vozila"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Telefonski zvučnik"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Slušalica"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Biraj broj"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Favoriti"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Povijest poziva"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Kontakti"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Površina za biranje brojeva"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Danas"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Jučer"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Starije"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Dodaj favorita"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Još niste dodali nijednog favorita"</string>
-    <string name="search_title" msgid="5412680850141871664">"Pretražite kontakte"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Pretražite kontakte"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Više brojeva"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Odaberite telefonski broj"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Samo jednom"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Uvijek"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g> – zadano"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  – favorit"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Obavijest o dolaznom pozivu"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Dolazni poziv"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Obavijest o propuštenom pozivu"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Propušteni poziv"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"Na čekanju"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Postavke"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Početni zaslon"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Redoslijed kontakata"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Ime"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Prezime"</string>
-</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
deleted file mode 100644
index 830aedb..0000000
--- a/res/values-hu/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Telefon"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"A hívás felépítéséhez csatlakoztassa telefonját az autóval Bluetooth-on keresztül."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Nem áll rendelkezésre a Bluetooth."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Hívás indításához és fogadásához kapcsolja be a Bluetooth-t."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Hívások indításához és fogadásához párosítsa a telefont az autóval."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Csatlakozás Bluetooth-eszközhöz"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Segélyhívás"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Segélyhívás"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Előfordulhat, hogy ezt a névjegyet már törölte."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Nem lehet tárcsázni ezt a számot. Ellenőrizze, majd próbálja meg újra."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"A telefonhívás funkció nem áll rendelkezésre. Próbálja újra később."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Elutasítás"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Hívás fogadása"</string>
-    <string name="call_back" msgid="5745638356098600872">"Visszahívás"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Jármű Bluetooth-kapcsolata"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Kihangosító"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Kézibeszélő"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Szám tárcsázása"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Kedvencek"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Híváslista"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Címtár"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Tárcsázó"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Ma"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Tegnap"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Korábbi"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Kedvenc hozzáadása"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Még nem adott hozzá kedvenceket"</string>
-    <string name="search_title" msgid="5412680850141871664">"Keresés a névjegyek közt"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Keresés a névjegyek közt"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Több"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Telefonszám kiválasztása"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Csak egyszer"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Mindig"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g> – Alapértelmezett"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g> – Kedvenc"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Bejövő hívásról szóló értesítés"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Bejövő hívás"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Nem fogadott hívásról szóló értesítés"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Nem fogadott hívás"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"Várakoztatva"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Beállítások"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Kezdőképernyő"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Névjegyek rendezése"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Utónév"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Családnév"</string>
-</resources>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
deleted file mode 100644
index 9487a8c..0000000
--- a/res/values-hy/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Հեռախոս"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Զանգելու համար նախ հեռախոսը միացրեք ավտոմեքենային Bluetooth-ի միջոցով։"</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth-ը հասանելի չէ։"</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Զանգեր կատարելու և ստանալու համար միացրեք Bluetooth-ը։"</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Զանգեր կատարելու և ստանալու համար հեռախոսը միացրեք ավտոմեքենային։"</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Միանալ Bluetooth-ին"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Շտապ կանչ"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Շտապ կանչ"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Հնարավոր է՝ այս կոնտակտը ջնջվել է։"</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Չի հաջողվում հավաքել այս համարը։ Ստուգեք՝ արդյոք այն ճիշտ է, և նորից փորձեք։"</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Հնարավոր չէ զանգել։ Փորձեք ավելի ուշ։"</string>
-    <string name="decline_call" msgid="2505987200485272226">"Մերժել"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Պատասխանել"</string>
-    <string name="call_back" msgid="5745638356098600872">"Հետ զանգել"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Մեքենայի Bluetooth"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Բարձրախոս"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Լսափող"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Հավաքել համար"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Ընտրանի"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Զանգերի պատմություն"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Կոնտակտներ"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Թվաշար"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Այսօր"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Երեկ"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Ավելի հին"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Ավելացնել ընտրանիում"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Ցանկում դեռ նախընտրած կոնտակտներ չեք ավելացրել"</string>
-    <string name="search_title" msgid="5412680850141871664">"Որոնեք կոնտակտներ"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Որոնեք կոնտակտներ"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Մի քանի"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Ընտրեք հեռախոսահամար"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Միայն այս անգամ"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Միշտ"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g> – կանխադրված"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  – Ընտրանի"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Մուտքային զանգի ծանուցում"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Մուտքային զանգ"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Ծանուցում բաց թողնված զանգի մասին"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Բաց թողնված զանգ"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"Զանգը սպասման մեջ է"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Կարգավորումներ"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Սկզբնական էկրան"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Կոնտակտների հերթականություն"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Անուն"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Ազգանուն"</string>
-</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
deleted file mode 100644
index 8ab8b28..0000000
--- a/res/values-in/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Ponsel"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Untuk menyelesaikan panggilan telepon, terlebih dahulu hubungkan ponsel ke mobil melalui Bluetooth."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth tidak tersedia."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Untuk melakukan atau menerima panggilan telepon, aktifkan Bluetooth."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Untuk melakukan atau menerima panggilan telepon, sambungkan ponsel ke mobil."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Hubungkan ke Bluetooth"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Darurat"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Panggilan darurat"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Kontak ini mungkin telah dihapus."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Tidak dapat memanggil nomor ini. Periksa dan coba lagi."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Panggilan telepon tidak tersedia. Coba lagi nanti."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Tolak"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Jawab"</string>
-    <string name="call_back" msgid="5745638356098600872">"Telepon balik"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Bluetooth kendaraan"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Speaker ponsel"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Handset"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Panggil nomor"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Favorit"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Histori Panggilan"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Kontak"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Tombol nomor"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Hari ini"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Kemarin"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Lebih lama"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Tambahkan favorit"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Anda belum menambahkan satu pun favorit"</string>
-    <string name="search_title" msgid="5412680850141871664">"Telusuri kontak"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Telusuri kontak"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Beberapa"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Pilih nomor telepon"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Sekali ini saja"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Selalu"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  - Default"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  - Favorit"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Notifikasi panggilan masuk"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Panggilan masuk"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Notifikasi panggilan tak terjawab"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Panggilan tak terjawab"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"Harap Tunggu"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Setelan"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Layar awal"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Urutan kontak"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Nama depan"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Nama belakang"</string>
-</resources>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
deleted file mode 100644
index 018110b..0000000
--- a/res/values-is/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Sími"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Til að hringja þarftu fyrst að tengja símann þinn við bílinn í gegnum Bluetooth."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth er ekki í boði."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Kveiktu á Bluetooth til að hringja eða svara símtölum."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Paraðu símann við bílinn til að hringja eða svara símtölum."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Tengjast við Bluetooth"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Neyðartilvik"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Neyðarsímtal"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Þessum tengilið var hugsanlega eytt."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Ekki er hægt að velja þetta númer. Athugaðu númerið og reyndu aftur."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Ekki er hægt að hringja símtal. Reyndu aftur síðar."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Hafna"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Svara"</string>
-    <string name="call_back" msgid="5745638356098600872">"Hringja til baka"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Bluetooth ökutækis"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Hátalari"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Símtól"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Velja númer"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Uppáhald"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Símtalaferill"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Tengiliðir"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Símatakkaborð"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Í dag"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Í gær"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Eldra"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Bæta uppáhaldi við"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Þú hefur ekki bætt neinu við uppáhald ennþá"</string>
-    <string name="search_title" msgid="5412680850141871664">"Leita að tengiliðum"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Leita að tengiliðum"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Mörg"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Veldu símanúmer"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Bara einu sinni"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Alltaf"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g> – sjálfgefinn"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  - Eftirlæti"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Tilkynning um móttekið símtal"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Móttekið símtal"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Tilkynning um ósvarað símtal"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Ósvarað símtal"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"Í bið"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Stillingar"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Upphafsskjár"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Röðun tengiliða"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Fornafn"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Eftirnafn"</string>
-</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
deleted file mode 100644
index b1a7023..0000000
--- a/res/values-it/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Telefono"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Per completare la chiamata, devi prima connettere il tuo telefono alla tua auto tramite Bluetooth."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Il Bluetooth non è disponibile."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Per effettuare o ricevere chiamate, attiva il Bluetooth."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Per effettuare o ricevere chiamate, accoppia il telefono con l\'auto."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Connettiti a Bluetooth"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Emergenza"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Chiamata di emergenza"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Questo contatto potrebbe essere stato eliminato."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Impossibile comporre questo numero. Verificalo e riprova."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Il servizio telefonico non è disponibile. Riprova più tardi."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Rifiuta"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Rispondi"</string>
-    <string name="call_back" msgid="5745638356098600872">"Richiama"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Bluetooth del veicolo"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Vivavoce"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Auricolare"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Componi un numero"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Preferiti"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Cronologia chiamate"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Contatti"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Tastierino"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Oggi"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Ieri"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Meno recenti"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Aggiungi un preferito"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Non hai ancora aggiunto preferiti"</string>
-    <string name="search_title" msgid="5412680850141871664">"Cerca nei contatti"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Cerca nei contatti"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Multipli"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Scegli un numero di telefono"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Solo una volta"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Sempre"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>: predefinito"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g> - Preferito"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Notifica di chiamata in arrivo"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Chiamata in arrivo"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Notifica di chiamata senza risposta"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Chiamata senza risposta"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"In attesa"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Impostazioni"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Schermata iniziale"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Ordine dei contatti"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Nome"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Cognome"</string>
-</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
deleted file mode 100644
index 577e274..0000000
--- a/res/values-iw/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"טלפון"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"כדי להשלים את השיחה, תחילה צריך לחבר את הטלפון לרכב באמצעות Bluetooth."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"רשת Bluetooth לא זמינה."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"כדי להתקשר או לקבל שיחות, יש להפעיל את ה-Bluetooth."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"כדי להתקשר או לקבל שיחות, יש לבצע התאמה של הטלפון עם הרכב."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"התחברות באמצעות Bluetooth"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"חירום"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"שיחת חירום"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"ייתכן שאיש הקשר הזה נמחק."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"לא ניתן לחייג את המספר. עליך לבדוק אותו ולנסות שוב."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"שיחת הטלפון לא זמינה. יש לנסות מאוחר יותר."</string>
-    <string name="decline_call" msgid="2505987200485272226">"דחייה"</string>
-    <string name="answer_call" msgid="3272474440561548115">"מענה"</string>
-    <string name="call_back" msgid="5745638356098600872">"התקשרות חזרה"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Bluetooth ברכב"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"דיבורית"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"אוזניה"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"חיוג מספר"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"מועדפים"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"היסטוריית שיחות"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"אנשי קשר"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"לוח חיוג"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"מהיום"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"מאתמול"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"ממועד מוקדם יותר"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"הוספה למועדפים"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"רשימת המועדפים שלך עדיין ריקה"</string>
-    <string name="search_title" msgid="5412680850141871664">"חיפוש אנשי קשר"</string>
-    <string name="search_hint" msgid="3099066132607042439">"חיפוש אנשי קשר"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"כמה"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"בחירת מספר טלפון"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"פעם אחת בלבד"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"תמיד"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  - ברירת מחדל"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  – מועדף"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"התראה על שיחה נכנסת"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"שיחה נכנסת"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"התראה על שיחה שלא נענתה"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"שיחה שלא נענתה"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"בהמתנה"</string>
-    <string name="setting_title" msgid="1296639422364732365">"הגדרות"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"המסך ההתחלתי"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"סדר אנשי הקשר"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"שם פרטי"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"שם משפחה"</string>
-</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
deleted file mode 100644
index 478ac5c..0000000
--- a/res/values-ja/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"電話"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"通話を行うには、まずスマートフォンと車を Bluetooth で接続してください。"</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth を使用できません。"</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"電話を使うには、Bluetooth をオンにしてください。"</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"電話を使うには、スマートフォンと車をペア設定してください。"</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Bluetooth に接続する"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"緊急通報"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"緊急通報"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"この連絡先は削除された可能性があります。"</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"この電話番号はダイヤルできません。確認してから、もう一度お試しください。"</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"通話を利用できません。しばらくしてからもう一度お試しください。"</string>
-    <string name="decline_call" msgid="2505987200485272226">"拒否"</string>
-    <string name="answer_call" msgid="3272474440561548115">"応答"</string>
-    <string name="call_back" msgid="5745638356098600872">"折り返す"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"車の Bluetooth"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"スピーカーフォン"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"ハンドセット"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"電話番号をダイヤル"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"お気に入り"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"通話履歴"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"連絡先"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"ダイヤルパッド"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"今日"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"昨日"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"それ以前"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"お気に入りとして追加"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"お気に入りはまだ追加されていません"</string>
-    <string name="search_title" msgid="5412680850141871664">"連絡先を検索"</string>
-    <string name="search_hint" msgid="3099066132607042439">"連絡先を検索"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"複数"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"電話番号の選択"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"1 回のみ"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"常時"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  - デフォルト"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  - お気に入り"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"着信通知"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"着信"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"不在着信の通知"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"不在着信"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"保留中"</string>
-    <string name="setting_title" msgid="1296639422364732365">"設定"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"起動画面"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"連絡先の順序"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"名"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"姓"</string>
-</resources>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
deleted file mode 100644
index 379640e..0000000
--- a/res/values-ka/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"ტელეფონი"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"ზარის შესასრულებლად, ჯერ ტელეფონი Bluetooth-ის საშუალებით მანქანასთან დააკავშირეთ."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth მიუწვდომელია."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"ზარების განსახორციელებლად და მისაღებად ჩართეთ Bluetooth."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"ზარების განსახორციელებლად და მისაღებად დააწყვილეთ ტელეფონი მანქანასთან."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Bluetooth-თან დაკავშირება"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"გადაუდებელი"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"გადაუდებელი ზარი"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"ეს კონტაქტი შესაძლოა წაიშალა."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"ამ ნომრის აკრეფა ვერ ხერხდება. შეამოწმეთ და ცადეთ ხელახლა."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"სატელეფონო ზარი მიუწვდომელია. გთხოვთ, ცადოთ მოგვიანებით."</string>
-    <string name="decline_call" msgid="2505987200485272226">"უარყოფა"</string>
-    <string name="answer_call" msgid="3272474440561548115">"პასუხი"</string>
-    <string name="call_back" msgid="5745638356098600872">"გადარეკვა"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"ავტომობილის bluetooth"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"სპიკერფონი"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"ყურსაცვამი"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"ნომრის აკრეფა"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"რჩეულები"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"საუბრის ისტორია"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"კონტაქტები"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"ციფერბლატი"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"დღეს"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"გუშინ"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"უფრო ძველი"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"რჩეულებში დამატება"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"რჩეულები ჯერ არ დაგიმატებიათ"</string>
-    <string name="search_title" msgid="5412680850141871664">"კონტაქტებში ძიება"</string>
-    <string name="search_hint" msgid="3099066132607042439">"კონტაქტებში ძიება"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"მრავალი"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"აირჩიეთ ტელეფონის ნომერი"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"მხოლოდ ერთხელ"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"ყოველთვის"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g> - ნაგულისხმევი"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  — რჩეული"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"შემომავალი ზარის შეტყობინება"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"შემომავალი ზარი"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"გამოტოვებული ზარის შეტყობინება"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"გამოტოვებული ზარი"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"შეყოვნების რეჟიმში"</string>
-    <string name="setting_title" msgid="1296639422364732365">"პარამეტრები"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"საწყისი ეკრანი"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"კონტაქტების თანმიმდევრობა"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"სახელი"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"გვარი"</string>
-</resources>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
deleted file mode 100644
index f0072bd..0000000
--- a/res/values-kk/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Телефон"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Қоңырау шалу үшін алдымен телефонды Bluetooth арқылы көлігіңізге жалғаңыз."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth қолжетімді емес."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Қоңырау шалу не қабылдау үшін Bluetooth функциясын қосыңыз."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Қоңырау шалу немесе қабылдау үшін телефоныңызды көлікпен жұптаңыз."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Bluetooth-ке жалғау"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Төтенше жағдай"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Құтқару қызметіне қоңырау шалу"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Бұл контакт жойылған."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Нөмір терілмейді. Оны тексеріп, қайталап көріңіз."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Қоңырау шалу мүмкін емес. Кейінірек қайталап көріңіз."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Қабылдамау"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Жауап беру"</string>
-    <string name="call_back" msgid="5745638356098600872">"Қоңырау шалу"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Көліктегі Bluetooth"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Спикерфон"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Телефон"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Нөмір теру"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Таңдаулылар"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Қоңыраулар тарихы"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Контактілер"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Нөмір теру тақтасы"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Бүгін"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Кеше"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Бұрынғы"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Таңдаулы контактіні енгізу"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Әлі ешбір контакт қосылған жоқ."</string>
-    <string name="search_title" msgid="5412680850141871664">"Контактілер іздеу"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Контактілер іздеу"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Бірнеше"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Телефон нөмірін таңдаңыз."</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Бір рет қана"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Әрқашан"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  - Әдепкі"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  — таңдаулы"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Келген қоңырау туралы хабарландыру"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Кіріс қоңырау"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Өткізіп алған қоңырау туралы хабарландыру"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Өткізіп алған қоңырау"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"Күтуде"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Параметрлер"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Бастау экраны"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Контактілер реті"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Аты"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Тегі"</string>
-</resources>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
deleted file mode 100644
index 3200945..0000000
--- a/res/values-km/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"ទូរសព្ទ"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"ដើម្បី​ហៅទូរសព្ទ សូមភ្ជាប់​ទូរសព្ទ​របស់អ្នក​ទៅរថយន្ត​របស់អ្នក​តាមរយៈ​ប៊្លូធូស​ជាមុន​សិន។"</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"មិនអាច​ប្រើ​ប៊្លូធូស​បានទេ។"</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"ដើម្បី​ហៅ​ទូរសព្ទ ឬ​ទទួលការហៅ​ទូរសព្ទ សូម​បើក​ប៊្លូធូស។"</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"ដើម្បី​ហៅ​ទូរសព្ទ ឬ​ទទួលការហៅ​ទូរសព្ទ សូមផ្គូផ្គង​ទូរសព្ទ​របស់អ្នក​ជាមួយ​រថយន្ត។"</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"ភ្ជាប់​ប៊្លូធូស"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"អាសន្ន"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"ការហៅទៅលេខសង្គ្រោះបន្ទាន់"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"ទំនាក់ទំនងនេះ​ប្រហែលជា​ត្រូវបាន​លុបចេញ​ហើយ។"</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"មិនអាច​ហៅទៅកាន់​លេខទូរសព្ទនេះ​បានទេ។ សូម​ពិនិត្យមើល​លេខទូរសព្ទ​នេះ រួច​ព្យាយាម​ម្ដងទៀត។"</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"មិន​អាចហៅទូរសព្ទបានទេ។ សូមព្យាយាមម្ដងទៀតនៅពេលក្រោយ។"</string>
-    <string name="decline_call" msgid="2505987200485272226">"បដិសេធ"</string>
-    <string name="answer_call" msgid="3272474440561548115">"ទទួល​ទូរសព្ទ"</string>
-    <string name="call_back" msgid="5745638356098600872">"ហៅ​ទៅ​វិញ"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"ប៊្លូធូស​របស់​យានជំនិះ"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"ទូរសព្ទ​ឧបករណ៍​បំពង​សំឡេង"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"កាស"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"ហៅ​ទៅកាន់​លេខទូរសព្ទ"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"សំណព្វ"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"ប្រវត្តិហៅ​ទូរសព្ទ"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"ទំនាក់ទំនង"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"បន្ទះ​លេខ"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"ថ្ងៃនេះ"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"ម្សិលមិញ"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"ចាស់ៗ"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"បញ្ចូលសំណព្វ"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"អ្នក​មិនទាន់​​បាន​បញ្ចូល​​សំណព្វ​ណា​មួយ​នៅ​ឡើយ​ទេ"</string>
-    <string name="search_title" msgid="5412680850141871664">"ស្វែងរកទំនាក់ទំនង"</string>
-    <string name="search_hint" msgid="3099066132607042439">"ស្វែងរកទំនាក់ទំនង"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"ច្រើន"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"ជ្រើសរើស​លេខទូរសព្ទ"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"តែ​ម្ដង"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"ជានិច្ច"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  - លំនាំដើម"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  - សំណព្វ"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"ការជូនដំណឹង​អំពីការហៅចូល"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"ការ​ហៅ​ចូល"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"ការជូនដំណឹង​អំពីការខកខាន​ទទួល"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"ខកខាន​ទទួល"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"រង់ចាំ"</string>
-    <string name="setting_title" msgid="1296639422364732365">"ការកំណត់"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"​អេក្រង់ចាប់​ផ្ដើម"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"លំដាប់​ទំនាក់ទំនង"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"នាម​ខ្លួន"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"នាមត្រកូល"</string>
-</resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
deleted file mode 100644
index f9f372f..0000000
--- a/res/values-kn/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"ಫೋನ್"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"ನಿಮ್ಮ ಕರೆಯನ್ನು ಪೂರ್ಣಗೊಳಿಸಲು, ಮೊದಲು ನಿಮ್ಮ ಫೋನ್‌ ಅನ್ನು ಬ್ಲೂಟೂತ್ ಮೂಲಕ ಕಾರ್‌ಗೆ ಸಂಪರ್ಕಿಸಿ."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"ಬ್ಲೂಟೂತ್ ಲಭ್ಯವಿಲ್ಲ."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"ಕರೆಗಳನ್ನು ಮಾಡಲು ಅಥವಾ ಸ್ವೀಕರಿಸಲು, ಬ್ಲೂಟೂತ್ ಆನ್ ಮಾಡಿ."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"ಕರೆಗಳನ್ನು ಮಾಡಲು ಅಥವಾ ಸ್ವೀಕರಿಸಲು, ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಕಾರ್‌ನ ಸಾಧನಕ್ಕೆ ಸಂಪರ್ಕಿಸಿ."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"ಬ್ಲೂಟೂತ್‌ಗೆ ಸಂಪರ್ಕಿಸಿ"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"ತುರ್ತು"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"ತುರ್ತು ಕರೆ"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"ಈ ಸಂಪರ್ಕವನ್ನು ಅಳಿಸಿರಬಹುದು."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"ಈ ಸಂಖ್ಯೆಯನ್ನು ಡಯಲ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ. ಪರಿಶೀಲಿಸಿದ ನಂತರ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"ಫೋನ್ ಕರೆಯು ಲಭ್ಯವಿಲ್ಲ. ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
-    <string name="decline_call" msgid="2505987200485272226">"ನಿರಾಕರಿಸಿ"</string>
-    <string name="answer_call" msgid="3272474440561548115">"ಉತ್ತರ"</string>
-    <string name="call_back" msgid="5745638356098600872">"ಪುನಃ ಕರೆ ಮಾಡಿ"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"ವಾಹನದ ಬ್ಲೂಟೂತ್"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"ಸ್ಪೀಕರ್ ಫೋನ್"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"ಹ್ಯಾಂಡ್‌ಸೆಟ್"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"ಸಂಖ್ಯೆಯೊಂದನ್ನು ಡಯಲ್ ಮಾಡಿ"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"ಮೆಚ್ಚಿನವುಗಳು"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"ಕರೆ ಇತಿಹಾಸ"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"ಸಂಪರ್ಕಗಳು"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"ಡಯಲ್‌ಪ್ಯಾಡ್‌"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"ಇಂದು"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"ನಿನ್ನೆ"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"ಹಳೆಯದು"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"ಮೆಚ್ಚಿನದನ್ನು ಸೇರಿಸಿ"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"ನೀವು ಇದುವರೆಗೂ ಯಾವುದೇ ಮೆಚ್ಚಿನವುಗಳನ್ನು ಸೇರಿಸಿಲ್ಲ"</string>
-    <string name="search_title" msgid="5412680850141871664">"ಸಂಪರ್ಕಗಳನ್ನು ಹುಡುಕಿ"</string>
-    <string name="search_hint" msgid="3099066132607042439">"ಸಂಪರ್ಕಗಳನ್ನು ಹುಡುಕಿ"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"ಹಲವಾರು"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"ಫೋನ್ ಸಂಖ್ಯೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"ಒಮ್ಮೆ ಮಾತ್ರ"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"ಯಾವಾಗಲೂ"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  - ಡೀಫಾಲ್ಟ್"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  - ಮೆಚ್ಚಿನದು"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"ಒಳಬರುವ ಕರೆ ಅಧಿಸೂಚನೆ"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"ಒಳಬರುವ ಕರೆ"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"ಮಿಸ್ಡ್ ಕಾಲ್ ಅಧಿಸೂಚನೆ"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"ಮಿಸ್ಡ್‌ ಕಾಲ್‌"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"ತಡೆಹಿಡಿಯಲಾಗಿದೆ"</string>
-    <string name="setting_title" msgid="1296639422364732365">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"ಸ್ಕ್ರೀನ್ ಪ್ರಾರಂಭಿಸಿ"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"ಸಂಪರ್ಕದ ಕ್ರಮ"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"ಮೊದಲ ಹೆಸರು"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"ಕೊನೆಯ ಹೆಸರು"</string>
-</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
deleted file mode 100644
index 2595f50..0000000
--- a/res/values-ko/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"전화"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"통화를 완료하려면 먼저 블루투스를 통해 휴대전화를 자동차에 연결하세요."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"블루투스를 사용할 수 없습니다."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"전화를 걸거나 받으려면 블루투스를 켜세요."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"전화를 걸거나 받으려면 휴대전화와 자동차를 페어링하세요."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"블루투스에 연결"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"긴급 전화"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"긴급 전화"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"삭제된 연락처일 수도 있습니다."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"이 번호로 전화를 걸 수 없습니다. 확인 후 다시 시도해 보세요."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"전화 통화 기능은 사용할 수 없습니다. 나중에 다시 시도해 보세요."</string>
-    <string name="decline_call" msgid="2505987200485272226">"거부"</string>
-    <string name="answer_call" msgid="3272474440561548115">"통화"</string>
-    <string name="call_back" msgid="5745638356098600872">"전화 걸기"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"차량 블루투스"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"스피커폰"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"핸드셋"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"전화번호 입력"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"즐겨찾기"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"통화 기록"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"연락처"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"다이얼패드"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"오늘"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"어제"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"이전"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"즐겨찾기 추가"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"아직 즐겨찾기를 추가하지 않았습니다."</string>
-    <string name="search_title" msgid="5412680850141871664">"연락처 검색"</string>
-    <string name="search_hint" msgid="3099066132607042439">"연락처 검색"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"여러 전화번호"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"전화번호 선택"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"한 번만"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"항상"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  - 기본값"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  - 즐겨찾기"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"수신 전화 알림"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"수신 전화"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"부재중 전화 알림림"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"부재중 전화"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"대기 중"</string>
-    <string name="setting_title" msgid="1296639422364732365">"설정"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"시작 화면"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"연락처 순서"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"이름"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"성"</string>
-</resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
deleted file mode 100644
index a9e6492..0000000
--- a/res/values-ky/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Телефон"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Чалуу үчүн адегенде Bluetooth аркылуу телефонуңузду унаа менен байланыштырыңыз."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth жеткиликсиз."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Телефон чалуу үчүн Bluetooth\'ду күйгүзүңүз."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Телефон чалуу үчүн телефонуңузду унаа менен жупташтырыңыз."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Bluetooth\'га туташуу"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Тез жардам"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Шашылыш чалуу"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Бул байланыш өчүрүлгөн болушу керек."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Бул телефон номери терилбей жатат. Аны текшерип, кайра аракет кылыңыз."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Телефонго чалуу мүмкүн эмес. Кийинчерээк кайталаңыз."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Баш тартуу"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Жооп берүү"</string>
-    <string name="call_back" msgid="5745638356098600872">"Кайра чалуу"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Унаанын bluetooth\'у"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Динамик"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Трубка"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Номер терүү"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Сүйүктүүлөр"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Чалуулар таржымалы"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Байланыштар"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Тергич"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Бүгүн"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Кечээ"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Эскирээк"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Сүйүктүү номер кошуу"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Азырынча бир да сүйүктүү байланышыңыз жок"</string>
-    <string name="search_title" msgid="5412680850141871664">"Байланыштарды издеңиз"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Байланыштарды издеңиз"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Бир нече"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Телефон номерин тандоо"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Бир жолу гана"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Ар дайым"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  - Демейки"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  - Сүйүктүүлөргө кошуу"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Кириш чалуу билдирмеси"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Кирүүчү чалуу"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Жооп берилбеген чалуу жөнүндө билдирүү"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Жооп берилбеген чалуу"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"Күтүү режиминде"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Жөндөөлөр"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Баштоо экраны"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Байланыштын ирети"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Аты"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Фамилиясы"</string>
-</resources>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
deleted file mode 100644
index 41f6a09..0000000
--- a/res/values-lo/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"ໂທລະສັບ"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"ເພື່ອເຮັດສຳເລັດການໂທຂອງທ່ານ, ກ່ອນອື່ນກະລຸນາເຊື່ອມຕໍ່ໂທລະສັບຂອງທ່ານກັບລົດຂອງທ່ານຜ່ານ Bluetooth."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth ບໍ່ສາມາດໃຊ້ໄດ້."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"ເພື່ອໂທອອກ ຫຼື ຮັບສາຍ, ກະລຸນາເປີດ Bluetooth."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"ເພື່ອໂທອອກ ຫຼື ຮັບສາຍ, ກະລຸນາເປີດຈັບຄູ່ໂທລະສັບຂອງທ່ານກັບລົດ."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"ເຊື່ອມຕໍ່ກັບ Bluetooth"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"ສຸກເສີນ"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"ການໂທສຸກເສີນ"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"ລາຍຊື່ຜູ້ຕິດຕໍ່ອາດຈະຖືກລຶບແລ້ວ."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"ບໍ່ສາມາດໂທຫາເບີນີ້ໄດ້. ກວດເບິ່ງມັນ ແລ້ວລອງໃໝ່."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"ບໍ່ສາມາດໂທໄດ້. ກະລຸນາລອງໃໝ່ພາຍຫຼັງ."</string>
-    <string name="decline_call" msgid="2505987200485272226">"ປະຕິເສດ"</string>
-    <string name="answer_call" msgid="3272474440561548115">"ຮັບສາຍ"</string>
-    <string name="call_back" msgid="5745638356098600872">"ໂທກັບ"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Bluetooth ຂອງພາຫານະ"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"ລຳໂພງໂທລະສັບ"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"ຫູຟັງ"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"ກົດເບີ"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"ລາຍການທີ່ມັກ"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"ປະຫວັດການໂທ"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"ລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"ແປ້ນໂທ"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"ມື້ນີ້"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"ມື້ວານນີ້"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"ເກົ່າກວ່າ"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"ເພີ່ມລາຍການທີ່ມັກ"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"ທ່ານຍັງບໍ່ໄດ້ເພີ່ມລາຍການທີ່ມັກໃດໆເທື່ອ"</string>
-    <string name="search_title" msgid="5412680850141871664">"ຊອກຫາລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
-    <string name="search_hint" msgid="3099066132607042439">"ຊອກຫາລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"ຫຼາຍເບີ"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"ເລືອກເບີໂທລະສັບ"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"ຄັ້ງດຽວ"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"ທຸກເທື່ອ"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  - ຄ່າເລີ່ມຕົ້ນ"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  - ລາຍການທີ່ມັກ"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"ການແຈ້ງເຕືອນສາຍໂທເຂົ້າ"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"ສາຍໂທເຂົ້າ"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"ການແຈ້ງເຕືອນສາຍບໍ່ໄດ້ຮັບ"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"ສາຍບໍ່ໄດ້ຮັບ"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"ຖືສາຍລໍຖ້າ"</string>
-    <string name="setting_title" msgid="1296639422364732365">"ການຕັ້ງຄ່າ"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"ໜ້າຈໍເລີ່ມຕົ້ນ"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"ລຳດັບລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"ຊື່"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"ນາມສະກຸນ"</string>
-</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
deleted file mode 100644
index 339e477..0000000
--- a/res/values-lt/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Telefonas"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Kad galėtumėte skambinti, pirmiausia susiekite telefoną su automobiliu „Bluetooth“ ryšiu."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"„Bluetooth“ ryšys nepasiekiamas."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Kad galėtumėte skambinti ir atsiliepti, įjunkite „Bluetooth“."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Kad galėtumėte skambinti ir atsiliepti, susiekite telefoną su automobiliu."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Prisijungti prie „Bluetooth“"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Skambutis pagalbos numeriu"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Skambutis pagalbos numeriu"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Gali būti, kad šis kontaktas buvo ištrintas."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Nepavyko paskambinti šiuo numeriu. Patikrinkite ir bandykite dar kartą."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Telefono skambučio atlikti negalima. Vėliau bandykite dar kartą."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Atmesti"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Atsakyti"</string>
-    <string name="call_back" msgid="5745638356098600872">"Atskambinti"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Transporto priem. „Bluetooth“"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Telefonas su garsiakalbiu"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Telefono ragelis"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Rinkti numerį"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Mėgstamiausi"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Skambučių istorija"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Kontaktai"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Skambinimo skydelis"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Šiandien"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Vakar"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Senesni"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Pridėti mėgstamiausią"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Dar nepridėjote jokių mėgstamiausių"</string>
-    <string name="search_title" msgid="5412680850141871664">"Ieškoti kontaktų"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Ieškoti kontaktų"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Keli"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Pasirinkite telefono numerį"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Tik kartą"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Visada"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g> – numatytasis"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"„<xliff:g id="LABEL">%1$s</xliff:g>“ – įtraukti į mėgstamiausius"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Pranešimas apie gaunamąjį skambutį"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Gaunamasis skambutis"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Praleisto skambučio pranešimas"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Praleistas skambutis"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"Sulaikyta"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Nustatymai"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Pradžios ekranas"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Kontaktų rūšiavimo tvarka"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Vardas"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Pavardė"</string>
-</resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
deleted file mode 100644
index 471272d..0000000
--- a/res/values-lv/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Tālrunis"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Lai veiktu zvanu, vispirms savienojiet tālruni ar automašīnu, izmantojot Bluetooth."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth nav pieejams."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Lai veiktu vai saņemtu zvanus, ieslēdziet Bluetooth."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Lai veiktu vai saņemtu zvanus, tālruni savienojiet pārī ar automašīnu."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Izveidot savienojumu ar Bluetooth"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Ārkārtas zvans"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Ārkārtas zvans"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Iespējams, šī kontaktpersona ir izdzēsta."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Nevar sastādīt šo numuru. Pārbaudiet to un mēģiniet vēlreiz."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Nevar veikt tālruņa zvanu. Lūdzu, vēlāk mēģiniet vēlreiz."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Noraidīt"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Atbildēt"</string>
-    <string name="call_back" msgid="5745638356098600872">"Atzvanīt"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Transportlīdzekļa Bluetooth"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Tālruņa skaļrunis"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Austiņas"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Sastādīt tālruņa numuru"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Izlase"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Zvanu vēsture"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Kontaktpersonas"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Numura sastādīšanas tastatūra"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Šodien"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Vakar"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Vecāki zvani"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Pievienot izlasei"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Jūs vēl neesat pievienojis nevienu izlases vienumu."</string>
-    <string name="search_title" msgid="5412680850141871664">"Meklēt kontaktpersonas"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Meklēt kontaktpersonas"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Vairākas"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Tālruņa numura izvēle"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Tikai vienreiz"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Vienmēr"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g> — noklusējums"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g> — izlase"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Paziņojums par ienākošu zvanu"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Ienākošais zvans"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Paziņojums par neatbildētu zvanu"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Neatbildēts zvans"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"Aizturēts"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Iestatījumi"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Sākuma ekrāns"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Kontaktpersonu secība"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Vārds"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Uzvārds"</string>
-</resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
deleted file mode 100644
index 6c17451..0000000
--- a/res/values-mk/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Телефон"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"За да го завршите повикот, прво поврзете го телефонот со автомобилот преку Bluetooth."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth не е достапен."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"За да остварувате или примате повици, вклучете Bluetooth."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"За да остварувате или примате повици, спарете го телефонот со автомобилот."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Поврзи се со Bluetooth"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Итен случај"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Итен повик"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Можно е контактов да е избришан."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Не може да се повика бројов. Проверете го и обидете се повторно."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Телефонски разговор не е достапен. Обидете се повторно подоцна."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Одбиј"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Одговори"</string>
-    <string name="call_back" msgid="5745638356098600872">"Повратен повик"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Bluetooth на автомобилот"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Интерфон"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Слушалка"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Повикај број"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Омилени"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Историја"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Контакти"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Копчиња за бирање"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Денес"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Вчера"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Постари"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Додај омилен"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Сѐ уште немате додадено омилени"</string>
-    <string name="search_title" msgid="5412680850141871664">"Пребарајте контакти"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Пребарајте контакти"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Повеќе"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Изберете телефонски број"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Само еднаш"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Секогаш"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  - Стандарден"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g> - омилен"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Известување за дојдовен време"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Дојдовен повик"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Известување за пропуштен повик"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Пропуштен повик"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"На чекање"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Поставки"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Почетен екран"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Подредување контакти"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Име"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Презиме"</string>
-</resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
deleted file mode 100644
index facda03..0000000
--- a/res/values-ml/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"ഫോൺ"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"നിങ്ങളുടെ കോൾ പൂർത്തിയാക്കാൻ, ആദ്യം ഫോൺ Bluetooth വഴി നിങ്ങളുടെ കാറുമായി കണക്റ്റ് ചെയ്യുക."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth ലഭ്യമല്ല."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"കോളുകൾ ചെയ്യാനോ സ്വീകരിക്കാനോ Bluetooth ഓണാക്കുക."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"കോളുകൾ ചെയ്യാനോ സ്വീകരിക്കാനോ ഫോൺ കാറുമായി ജോടിയാക്കുക."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Bluetooth-ലേക്ക് കണക്‌റ്റ് ചെയ്യുക"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"അടിയന്തിരാവശ്യം"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"എമർജൻസി കോൾ"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"ഈ കോൺടാക്‌റ്റ് ഇല്ലാതാക്കിയിരിക്കാം."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"ഈ നമ്പർ ഡയൽ ചെയ്യാൻ കഴിയില്ല. അത് പരിശോധിച്ച് വീണ്ടും ശ്രമിക്കുക."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"ഫോൺ കോൾ ലഭ്യമല്ല. പിന്നീട് വീണ്ടും ശ്രമിക്കുക."</string>
-    <string name="decline_call" msgid="2505987200485272226">"നിരസിക്കുക"</string>
-    <string name="answer_call" msgid="3272474440561548115">"മറുപടി നൽകുക"</string>
-    <string name="call_back" msgid="5745638356098600872">"തിരിച്ചുവിളിക്കുക"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"വാഹന Bluetooth"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"സ്‌പീക്കർ ഫോൺ"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"ഹാൻഡ്സെറ്റ്"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"നമ്പർ ഡയൽ ചെയ്യുക"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"പ്രിയപ്പെട്ടവ"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"കോള്‍‌ ചരിത്രം"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"കോൺടാക്റ്റുകൾ"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"ഡയൽപാഡ്"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"ഇന്ന്"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"ഇന്നലെ"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"പഴയത്"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"പ്രിയപ്പെട്ടത് ചേർക്കുക"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"നിങ്ങൾ ഇതുവരെ പ്രിയപ്പെട്ടവയൊന്നും ചേർത്തിട്ടില്ല"</string>
-    <string name="search_title" msgid="5412680850141871664">"കോണ്‍‌ടാക്റ്റുകള്‍ തിരയുക"</string>
-    <string name="search_hint" msgid="3099066132607042439">"കോണ്‍‌ടാക്റ്റുകള്‍ തിരയുക"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"ഒന്നിലധികം"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"ഫോൺ നമ്പർ തിരഞ്ഞെടുക്കുക"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"ഒരിക്കൽ മാത്രം"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"എപ്പോഴും"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  - ഡിഫോൾട്ട്"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  - പ്രിയപ്പെട്ടത്"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"ഇൻകമിംഗ് കോൾ അറിയിപ്പ്"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"ഇന്‍‌കമിംഗ് കോള്‍"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"മിസ്‌ഡ് കോൾ അറിയിപ്പ്"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"മിസ്‌ഡ് കോൾ"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"ഹോൾഡിലാണ്"</string>
-    <string name="setting_title" msgid="1296639422364732365">"ക്രമീകരണം"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"സ്‌ക്രീൻ ആരംഭിക്കുക"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"കോൺടാക്റ്റ് ഓർഡർ"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"ഫസ്റ്റ് നെയിം"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"ലാസ്റ്റ് നെയിം"</string>
-</resources>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
deleted file mode 100644
index deef84a..0000000
--- a/res/values-mn/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Утас"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Дуудлагаа гүйцээхийн тулд эхлээд утсаа Bluetooth-р дамжуулан машинтайгаа холбоно уу."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth боломжгүй байна."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Дуудлага хийх эсвэл хүлээн авахын тулд Bluetooth-г асаана уу."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Дуудлага хийх эсвэл хүлээн авахын тулд утсаа машинтай хослуулна уу."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Bluetooth-тэй холбогдох"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Яаралтай тусламж"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Яаралтай дуудлага"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Энэ харилцагчийг устгасан байж болзошгүй."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Энэ дугаар руу залгах боломжгүй байна. Шалгаад дахин оролдоно уу."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Утасны дуудлага хийх боломжгүй байна. Дараа дахин оролдоно уу."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Татгалзах"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Хариулах"</string>
-    <string name="call_back" msgid="5745638356098600872">"Буцааж залгах"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Тээврийн хэрэгслийн bluetooth"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Чанга яригчтай утас"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Чихэвч"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Дугаар руу залгах"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Дуртай"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Дуудлагын түүх"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Харилцагч"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Дугаар цуглуулах самбар"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Өнөөдөр"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Өчигдөр"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Хуучин"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Дуртай харилцагч нэмэх"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Та ямар нэгэн дуртай зүйл хараахан нэмээгүй байна"</string>
-    <string name="search_title" msgid="5412680850141871664">"Харилцагч хайх"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Харилцагч хайх"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Олон"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Утасны дугаар сонгоно уу"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Нэг удаа"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Байнга"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  - Өгөгдмөл"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  - Дуртай"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Ирсэн дуудлагын мэдэгдэл"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Ирсэн дуудлага"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Аваагүй дуудлагын мэдэгдэл"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Аваагүй дуудлага"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"Хүлээлгэнд байгаа"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Тохиргоо"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Дэлгэцийг эхлүүлэх"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Харилцагчийн захиалга"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Нэр"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Овог"</string>
-</resources>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
deleted file mode 100644
index e793d7c..0000000
--- a/res/values-mr/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"फोन"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"तुमचा कॉल पूर्ण करण्यासाठी, सर्वप्रथम तुमचा फोन ब्लूटूथने तुमच्या कारशी कनेक्ट करा."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"ब्लूटूथ उपलब्ध नाही."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"कॉल करण्यासाठी किंवा ते घेण्यासाठी, ब्लूटूथ सुरू करा."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"कॉल करण्यासाठी किंवा ते घेण्यासाठी, तुमचा फोन कारशी पेअर करा."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"ब्लूटूथशी कनेक्ट करा"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"आणीबाणी"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"आणीबाणी कॉल"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"हा संपर्क कदाचित हटवला गेला आहे."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"हा नंबर डायल करू शकत नाही. तो तपासा आणि पुन्हा प्रयत्न करा."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"फोन कॉल उपलब्ध नाही. पुन्हा प्रयत्न करा."</string>
-    <string name="decline_call" msgid="2505987200485272226">"नकार द्या"</string>
-    <string name="answer_call" msgid="3272474440561548115">"उत्तर"</string>
-    <string name="call_back" msgid="5745638356098600872">"पुन्हा कॉल करा"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"वाहनामधील ब्लूटूथ"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"स्पीकर फोन"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"हँडसेट"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"नंबर डायल करा"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"आवडीचे"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"कॉल इतिहास"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"संपर्क"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"डायलपॅड"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"आज"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"काल"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"जुने"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"आवडते जोडा"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"तुम्ही अजून कोणतेही आवडीचे जोडलेले नाहीत"</string>
-    <string name="search_title" msgid="5412680850141871664">"संपर्क शोधा"</string>
-    <string name="search_hint" msgid="3099066132607042439">"संपर्क शोधा"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"एकाहून अधिक"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"फोन नंबर निवडा"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"फक्त एकदा"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"नेहमी"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  - डीफॉल्ट"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  - आवडते"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"येणाऱ्या कॉलची सूचना"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"येणारा कॉल"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"मिस्ड कॉलची सूचना"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"मिस्ड कॉल"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"होल्डवर"</string>
-    <string name="setting_title" msgid="1296639422364732365">"सेटिंग्ज"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"सुरुवातीची स्क्रीन"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"संपर्क क्रम"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"नाव"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"आडनाव"</string>
-</resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
deleted file mode 100644
index 5d46e0e..0000000
--- a/res/values-ms/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Telefon"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Untuk melengkapkan panggilan anda, mula-mula sambungkan telefon ke kereta anda melalui Bluetooth."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth tidak tersedia."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Untuk membuat atau menerima panggilan, hidupkan Bluetooth."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Untuk membuat atau menerima panggilan, gandingkan telefon anda dengan kereta."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Sambung ke Bluetooth"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Kecemasan"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Panggilan kecemasan"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Kenalan ini mungkin telah dipadamkan."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Tidak dapat mendail nombor ini. Semak dan cuba lagi."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Panggilan telefon tidak tersedia. Sila cuba lagi nanti."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Tolak"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Jawab"</string>
-    <string name="call_back" msgid="5745638356098600872">"Panggil balik"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Bluetooth kenderaan"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Fon pembesar suara"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Telefon bimbit"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Dail nombor"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Kegemaran"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Sejarah Panggilan"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Kenalan"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Pad pendail"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Hari ini"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Semalam"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Lebih lama"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Tambah kegemaran"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Anda belum menambah sebarang kegemaran"</string>
-    <string name="search_title" msgid="5412680850141871664">"Cari kenalan"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Cari kenalan"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Berbilang"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Pilih nombor telefon"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Hanya sekali"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Sentiasa"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  - Lalai"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  - Kegemaran"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Pemberitahuan panggilan masuk"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Panggilan masuk"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Pemberitahuan panggilan terlepas"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Panggilan terlepas"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"Ditunda"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Tetapan"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Skrin mula"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Tertib kenalan"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Nama pertama"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Nama keluarga"</string>
-</resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
deleted file mode 100644
index a69abda..0000000
--- a/res/values-my/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"ဖုန်း"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"သင့်ခေါ်ဆိုမှု အပြီးသတ်ထည့်သွင်းရန် ဖုန်းကို \'ဘလူးတုသ်\' မှတစ်ဆင့် သင့်ကားနှင့် ဦးစွာချိတ်ဆက်ပါ။"</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"ဘလူးတုသ် အသုံးပြု၍မရပါ။"</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"ခေါ်ဆိုမှုများ ပြုလုပ်ရန် သို့မဟုတ် လက်ခံရန် \'ဘလူးတုသ်\' ဖွင့်ပါ။"</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"ခေါ်ဆိုမှုများ ပြုလုပ်ရန် သို့မဟုတ် လက်ခံရန် သင့်ဖုန်းကို ကားနှင့် တွဲချိတ်ပါ။"</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"ဘလူးတုသ်သို့ ချိတ်ဆက်ရန်"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"အရေးပေါ်"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"အရေးပေါ်ဖုန်းခေါ်ခြင်း"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"ဤအဆက်အသွယ်ကို ဖျက်ထားခြင်း ဖြစ်နိုင်သည်။"</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"ဤနံပါတ်ကို ခေါ်ဆို၍မရပါ။ စစ်ဆေးပြီး ထပ်စမ်းကြည့်ပါ။"</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"ဖုန်းခေါ်ဆို၍ မရနိုင်ပါ။ နောက်မှ ထပ်စမ်းကြည့်ပါ။"</string>
-    <string name="decline_call" msgid="2505987200485272226">"ငြင်းပယ်ရန်"</string>
-    <string name="answer_call" msgid="3272474440561548115">"ဖြေကြားရန်"</string>
-    <string name="call_back" msgid="5745638356098600872">"ပြန်ခေါ်ပါ"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"ယာဉ်၏ ဘလူးတုသ်"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"စပီကာ ဖုန်း"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"ဟန်းဆက်"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"နံပါတ်ကို ခေါ်ဆိုရန်"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"အကြိုက်ဆုံး"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"ယခင်ခေါ်ဆိုမှုများ"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"အဆက်အသွယ်များ"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"နံပါတ်ကွက်"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"ယနေ့"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"မနေ့က"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"ယခင်နေ့များက"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"အကြိုက်ဆုံး ထည့်ရန်"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"သင့်အကြိုက်ဆုံးတစ်ခုမျှ မထည့်ရသေးပါ"</string>
-    <string name="search_title" msgid="5412680850141871664">"အဆက်အသွယ်များ ရှာရန်"</string>
-    <string name="search_hint" msgid="3099066132607042439">"အဆက်အသွယ်များ ရှာရန်"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"အများအပြား"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"ဖုန်းနံပါတ် ရွေးချယ်ပါ"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"တစ်ကြိမ်သာ"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"အမြဲတမ်း"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  - မူရင်း"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  - အနှစ်သက်ဆုံး"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"အဝင်ခေါ်ဆိုမှု အကြောင်းကြားချက်"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"အဝင်ခေါ်ဆိုမှု"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"လွတ်သွားသော ခေါ်ဆိုမှု အကြောင်းကြားချက်"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"လွတ်သွားသော ခေါ်ဆိုမှု"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"ဖုန်းကိုင်ထားသည်"</string>
-    <string name="setting_title" msgid="1296639422364732365">"ဆက်တင်များ"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"စတင်မှု ဖန်သားပြင်"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"အဆက်အသွယ် အစီအစဉ်"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"ရှေ့အမည်"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"နောက်အမည်"</string>
-</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
deleted file mode 100644
index f1c1d91..0000000
--- a/res/values-nb/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Telefon"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"For å fullføre anropet må du først koble telefonen din til bilen via Bluetooth."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth er ikke tilgjengelig."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"For å ringe eller motta anrop, slå på Bluetooth."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Koble sammen telefonen og bilen for å ringe eller motta anrop."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Koble til Bluetooth"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Nødssituasjon"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Nødanrop"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Denne kontakten kan ha blitt slettet."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Kan ikke ringe dette nummeret. Sjekk at det er riktig, og prøv på nytt."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Ringing er ikke tilgjengelig. Prøv igjen senere."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Avvis"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Svar"</string>
-    <string name="call_back" msgid="5745638356098600872">"Ring tilbake"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Bluetooth i kjøretøyet"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Høyttaler"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Telefon"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Slå et nummer"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Favoritter"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Anropslogg"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Kontakter"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Tastatur"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"I dag"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"I går"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Eldre"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Legg til en favoritt"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Du har ikke lagt til noen favoritter ennå"</string>
-    <string name="search_title" msgid="5412680850141871664">"Søk i kontakter"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Søk i kontakter"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Flere"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Velg et telefonnummer"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Bare én gang"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Alltid"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  – Standard"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  – Favoritt"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Varsel om innkommende anrop"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Innkommende anrop"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Varsel om tapt anrop"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Tapt anrop"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"På vent"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Innstillinger"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Startskjerm"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Kontaktrekkefølge"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Fornavn"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Etternavn"</string>
-</resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
deleted file mode 100644
index cb1f932..0000000
--- a/res/values-ne/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"फोन"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"कल गर्न पहिले ब्लुटुथमार्फत आफ्नो फोन कारमा जोड्नुहोस्।"</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"ब्लुटुथ उपलब्ध छैन।"</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"फोन गर्न वा फोन उठाउन ब्लुटुथ सक्रिय गर्नुहोस्।"</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"कल गर्न वा उठाउन आफ्नो फोन र कारको जोडा बनाउनुहोस्।"</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"ब्लुटुथमा जोड्नुहोस्"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"आपतकालीन"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"आपतकालीन कल"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"यो सम्पर्क ठेगाना मेटाइसकिएको हुन सक्छ।"</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"यो नम्बर डायल गर्न सकिएन। नम्बरको जाँच गरी फेरि प्रयास गर्नुहोस्।"</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"फोन कल गर्ने सुविधा उपलब्ध छैन। कृपया पछि फेरि प्रयास गर्नुहोस्।"</string>
-    <string name="decline_call" msgid="2505987200485272226">"अस्वीकार गर्नुहोस्"</string>
-    <string name="answer_call" msgid="3272474440561548115">"उठाउनुहोस्"</string>
-    <string name="call_back" msgid="5745638356098600872">"कल ब्याक गर्नुहोस्"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"सवारी साधनको ब्लुटुथ"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"स्पिकर फोन"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"ह्यान्डसेट"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"नम्बर डायल गर्नुहोस्"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"मन पर्ने सम्पर्क ठेगानाहरू"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"कलको इतिहास"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"सम्पर्क ठेगानाहरू"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"डायलप्याड"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"आज"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"हिजो"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"अझ पुरानो"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"सम्पर्क सूचीमा भएको कुनै मन पर्ने व्यक्ति थप्नु…"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"तपाईंले अहिलेसम्म कुनै पनि मन पर्ने सम्पर्क ठेगाना थप्नुभएको छैन"</string>
-    <string name="search_title" msgid="5412680850141871664">"सम्पर्क ठेगानाहरू खोज्नुहोस्"</string>
-    <string name="search_hint" msgid="3099066132607042439">"सम्पर्क ठेगानाहरू खोज्नुहोस्"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"बहु"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"फोन नम्बर छनौट गर्नुहोस्"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"एक पटक मात्र"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"सधैँ"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  - पूर्वनिर्धारित"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  - मन पर्ने कुराको सूचीमा सार्नु…"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"आगमन कलसम्बन्धी सूचना"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"आगमन कल"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"छुटेको कलसम्बन्धी सूचना"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"छुटेको कल"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"होल्डमा छ"</string>
-    <string name="setting_title" msgid="1296639422364732365">"सेटिङ"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"सुरु गर्ने स्क्रिन"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"सम्पर्क ठेगानाको क्रम"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"नाम"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"थर"</string>
-</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
deleted file mode 100644
index b8720bd..0000000
--- a/res/values-nl/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Telefoon"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Als je wilt bellen, moet je je telefoon eerst via Bluetooth verbinden met de auto."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth is niet beschikbaar."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Schakel Bluetooth in als je gesprekken wilt plaatsen of ontvangen."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Als je gesprekken wilt plaatsen of ontvangen, koppel je je telefoon met de auto."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Verbinding maken met Bluetooth"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Noodgeval"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Noodoproep"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Dit contact is mogelijk al verwijderd."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Kan dit nummer niet bellen. Controleer het nummer en probeer het opnieuw."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Je kunt momenteel niet bellen. Probeer het later opnieuw."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Weigeren"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Beantwoorden"</string>
-    <string name="call_back" msgid="5745638356098600872">"Terugbellen"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Bluetooth van voertuig"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Luidspreker"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Handset"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Een nummer kiezen"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Favorieten"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Gespreksgeschiedenis"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Contacten"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Toetsenblok"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Vandaag"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Gisteren"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Ouder"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Een favoriet toevoegen"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Je hebt nog geen favorieten toegevoegd"</string>
-    <string name="search_title" msgid="5412680850141871664">"Contacten zoeken"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Contacten zoeken"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Meerdere"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Een telefoonnummer kiezen"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Eén keer"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Altijd"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g> - Standaard"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  - favoriet"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Melding over inkomend gesprek"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Inkomend gesprek"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Melding voor gemist gesprek"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Gemist gesprek"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"In de wacht"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Instellingen"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Startscherm"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Contactvolgorde"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Voornaam"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Achternaam"</string>
-</resources>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
deleted file mode 100644
index d7babdb..0000000
--- a/res/values-or/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"ଫୋନ୍"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"ଆପଣଙ୍କ କଲ୍‌କୁ ସମାପ୍ତ କରିବା ପାଇଁ ପ୍ରଥମେ ଆପଣଙ୍କ ଫୋନ୍‌କୁ ବ୍ଲୁଟୁଥ୍ ମାଧ୍ୟମରେ ଆପଣଙ୍କର କାର୍ ସହିତ ସଂଯୋଗ କରନ୍ତୁ।"</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"ବ୍ଲୁଟୁଥ୍ ଉପଲବ୍ଧ ନାହିଁ।"</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"କଲ୍ କରିବା କିମ୍ବା ପ୍ରାପ୍ତ କରିବା ପାଇଁ ବ୍ଲୁଟୁଥ୍ ଚାଲୁ କରନ୍ତୁ।"</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"କଲ୍ କରିବା କିମ୍ବା ପ୍ରାପ୍ତ କରିବା ପାଇଁ ଆପଣଙ୍କର ଫୋନ୍‌କୁ କାର୍ ସହିତ ପେୟାର୍ କରନ୍ତୁ।"</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"ବ୍ଲୁଟୁଥ୍‍କୁ ସଂଯୋଗ କରନ୍ତୁ"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"ଜରୁରୀକାଳୀନ"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"ଜରୁରୀକାଳୀନ କଲ୍"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"ବୋଧହୁଏ ଏହି ଯୋଗାଯୋଗଟି ଡିଲିଟ୍ ହୋଇଯାଇଛି।"</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"ଏହି ନମ୍ବରକୁ ଡାଏଲ୍ କରାଯାଇ ପାରିବ ନାହିଁ। ଏହା ଯାଞ୍ଚ କରନ୍ତୁ ଏବଂ ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"ଫୋନ୍ କଲ୍ ଉପଲବ୍ଧ ନାହିଁ। ଦୟାକରି ପରେ ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
-    <string name="decline_call" msgid="2505987200485272226">"ଅସ୍ୱୀକାର କରନ୍ତୁ"</string>
-    <string name="answer_call" msgid="3272474440561548115">"ଉତ୍ତର ଦିଅନ୍ତୁ"</string>
-    <string name="call_back" msgid="5745638356098600872">"କଲବ୍ୟାକ୍ କରନ୍ତୁ"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"ଯାନବାହନ ବ୍ଲୁଟୁଥ୍"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"ସ୍ପିକର୍ ଫୋନ୍"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"ହ୍ୟାଣ୍ଡସେଟ୍"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"ଏକ ନମ୍ବର ଡାଏଲ୍ କରନ୍ତୁ"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"ପସନ୍ଦଗୁଡ଼ିକ"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"କଲ୍ ଇତିବୃତି"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"ଯୋଗାଯୋଗଗୁଡ଼ିକ"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"ଡାଏଲପ୍ୟାଡ୍"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"ଆଜି"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"ଗତକାଲି"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"ପୁରୁଣା"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"ଏକ ପସନ୍ଦ ଯୋଗ କରନ୍ତୁ"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"ଆପଣ ଏପର୍ଯ୍ୟନ୍ତ କୌଣସି ପସନ୍ଦ ଯୋଗ କରିନାହାଁନ୍ତି"</string>
-    <string name="search_title" msgid="5412680850141871664">"ଯୋଗାଯୋଗଗୁଡ଼ିକୁ ଖୋଜନ୍ତୁ"</string>
-    <string name="search_hint" msgid="3099066132607042439">"ଯୋଗାଯୋଗଗୁଡ଼ିକୁ ଖୋଜନ୍ତୁ"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"ଏକାଧିକ"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"ଏକ ଫୋନ୍ ନମ୍ବର ବାଛନ୍ତୁ"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"ଥରେ ମାତ୍ର"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"ସର୍ବଦା"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  - ଡିଫଲ୍ଟ"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  - ପସନ୍ଦ"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"ଇନ୍‌କମିଙ୍ଗ୍ କଲ୍ ବିଜ୍ଞପ୍ତି"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"ଇନ୍‌କମିଂ କଲ୍"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"ମିସ୍ଡ କଲ୍ ବିଜ୍ଞପ୍ତି"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"ମିସ୍ଡ କଲ୍"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"ହୋଲ୍ଡରେ ଅଛି"</string>
-    <string name="setting_title" msgid="1296639422364732365">"ସେଟିଂସ୍"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"ସ୍କ୍ରିନ୍ ଆରମ୍ଭ କରନ୍ତୁ"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"ଯୋଗାଯୋଗ କ୍ରମରେ ସଜାନ୍ତୁ"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"ପ୍ରଥମ ନାମ"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"ଶେଷ ନାମ"</string>
-</resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
deleted file mode 100644
index d1beeef..0000000
--- a/res/values-pa/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"ਫ਼ੋਨ"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"ਆਪਣੀ ਕਾਲ ਨੂੰ ਪੂਰਾ ਕਰਨ ਲਈ, ਪਹਿਲਾਂ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਬਲੂਟੁੱਥ ਰਾਹੀਂ ਕਾਰ ਨਾਲ ਕਨੈਕਟ ਕਰੋ।"</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"ਬਲੂਟੁੱਥ ਉਪਲਬਧ ਨਹੀਂ ਹੈ।"</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"ਕਾਲਾਂ ਕਰਨ ਜਾਂ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ, ਬਲੂਟੁੱਥ ਚਾਲੂ ਕਰੋ।"</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"ਕਾਲਾਂ ਕਰਨ ਜਾਂ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ, ਆਪਣਾ ਫ਼ੋਨ ਕਾਰ ਨਾਲ ਜੋੜਾਬੱਧ ਕਰੋ।"</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"ਬਲੂਟੁੱਥ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"ਸੰਕਟਕਾਲ"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"ਸੰਕਟਕਾਲੀਨ ਕਾਲ"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"ਸ਼ਾਇਦ ਇਹ ਸੰਪਰਕ ਮਿਟਾ ਦਿੱਤਾ ਗਿਆ ਹੋਵੇ।"</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"ਇਹ ਨੰਬਰ ਡਾਇਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ। ਇਸਨੂੰ ਜਾਂਚ ਕੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"ਫ਼ੋਨ ਕਾਲ ਉਪਲਬਧ ਨਹੀਂ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
-    <string name="decline_call" msgid="2505987200485272226">"ਅਸਵੀਕਾਰ ਕਰੋ"</string>
-    <string name="answer_call" msgid="3272474440561548115">"ਜਵਾਬ ਦਿਓ"</string>
-    <string name="call_back" msgid="5745638356098600872">"ਵਾਪਸ ਕਾਲ ਕਰੋ"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"ਵਾਹਨ ਬਲੂਟੁੱਥ"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"ਸਪੀਕਰਫ਼ੋਨ"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"ਹੈਂਡਸੈੱਟ"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"ਨੰਬਰ ਡਾਇਲ ਕਰੋ"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"ਮਨਪਸੰਦ"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"ਕਾਲ ਇਤਿਹਾਸ"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"ਸੰਪਰਕ"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"ਡਾਇਲਪੈਡ"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"ਅੱਜ"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"ਕੱਲ੍ਹ"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"ਵਧੇਰੇ ਪੁਰਾਣੀਆਂ"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"ਕੋਈ ਮਨਪਸੰਦ ਸੰਪਰਕ ਸ਼ਾਮਲ ਕਰੋ"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"ਤੁਸੀਂ ਹਾਲੇ ਤੱਕ ਕੋਈ ਵੀ ਸੰਪਰਕ ਮਨਪਸੰਦ ਵਜੋਂ ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤਾ ਹੈ"</string>
-    <string name="search_title" msgid="5412680850141871664">"ਸੰਪਰਕ ਖੋਜੋ"</string>
-    <string name="search_hint" msgid="3099066132607042439">"ਸੰਪਰਕ ਖੋਜੋ"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"ਇੱਕ ਤੋਂ ਵਧੇਰੇ"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"ਇੱਕ ਫ਼ੋਨ ਨੰਬਰ ਚੁਣੋ"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"ਬੱਸ ਇੱਕ ਵਾਰ"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"ਹਮੇਸ਼ਾਂ"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  - ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  - ਮਨਪਸੰਦ"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"ਇਨਕਮਿੰਗ ਕਾਲ ਦੀ ਸੂਚਨਾ"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"ਇਨਕਮਿੰਗ ਕਾਲ"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"ਮਿਸ ਕਾਲ ਦੀ ਸੂਚਨਾ"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"ਮਿਸ ਕਾਲ"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"ਰੋਕ ਕੇ ਰੱਖੀ ਗਈ"</string>
-    <string name="setting_title" msgid="1296639422364732365">"ਸੈਟਿੰਗਾਂ"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"ਸ਼ੁਰੂਆਤੀ ਸਕ੍ਰੀਨ"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"ਸੰਪਰਕ ਕ੍ਰਮ"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"ਨਾਮ ਦਾ ਪਹਿਲਾ ਭਾਗ"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"ਨਾਮ ਦਾ ਆਖਰੀ ਭਾਗ"</string>
-</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
deleted file mode 100644
index 9c79bb5..0000000
--- a/res/values-pl/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Telefon"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Aby zadzwonić, najpierw musisz połączyć telefon z samochodem przez Bluetooth."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth jest niedostępny."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Aby wykonywać i odbierać połączenia, włącz Bluetooth."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Aby wykonywać i odbierać połączenia, sparuj telefon z samochodem."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Połącz z Bluetoothem"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Połączenie alarmowe"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Połączenie alarmowe"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Ten kontakt mógł zostać usunięty."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Nie można wybrać tego numeru. Sprawdź go i spróbuj jeszcze raz."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Połączenie jest niemożliwe. Spróbuj ponownie później."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Odrzuć"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Odbierz"</string>
-    <string name="call_back" msgid="5745638356098600872">"Oddzwoń"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Bluetooth w pojeździe"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Głośnik"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Słuchawka"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Wybierz numer"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Ulubione"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Historia połączeń"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Kontakty"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Klawiatura"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Dzisiaj"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Wczoraj"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Starsze"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Dodaj ulubiony kontakt"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Nie masz jeszcze nic w ulubionych"</string>
-    <string name="search_title" msgid="5412680850141871664">"Wyszukaj kontakty"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Wyszukaj kontakty"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Wiele"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Wybierz numer telefonu"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Tylko raz"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Zawsze"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g> – numer domyślny"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g> – dodaj do ulubionych"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Powiadomienie o połączeniu przychodzącym"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Połączenie przychodzące"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Powiadomienie o nieodebranym połączeniu"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Nieodebrane połączenie"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"Oczekujące"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Ustawienia"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Ekran powitalny"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Kolejność kontaktów"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Imię"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Nazwisko"</string>
-</resources>
diff --git a/res/values-port/strings.xml b/res/values-port/configs.xml
similarity index 82%
rename from res/values-port/strings.xml
rename to res/values-port/configs.xml
index 572bb37..ea45c2c 100644
--- a/res/values-port/strings.xml
+++ b/res/values-port/configs.xml
@@ -14,9 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-
 <resources>
-    <!-- Titles -->
-    <!-- Toolbar title for tabbed pages -->
-    <string name="default_toolbar_title">@string/phone_app_name</string>
-</resources>
\ No newline at end of file
+    <!-- Use app name as toolbar title. Supported value see @attr/toolbarTitleMode -->
+    <integer name="config_toolbar_title_mode">0</integer>
+</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
deleted file mode 100644
index 2508412..0000000
--- a/res/values-pt-rPT/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Telefone"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Para realizar a chamada, ligue primeiro o telemóvel ao automóvel através de Bluetooth."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"O Bluetooth não está disponível."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Para efetuar ou receber chamadas, ative o Bluetooth."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Para efetuar ou receber chamadas, sincronize o telemóvel com o automóvel."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Ligar ao Bluetooth"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Emergência"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Chamada de emergência"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Este contacto pode ter sido eliminado."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Não é possível marcar este número. Verifique e tente novamente."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"A chamada telefónica não está disponível. Tente novamente mais tarde."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Recusar"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Atender"</string>
-    <string name="call_back" msgid="5745638356098600872">"Ligar de volta"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Bluetooth do veículo"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Altifalante"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Auricular"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Marcar um número"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Favoritos"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Histórico de chamadas"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Contactos"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Teclado"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Hoje"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Ontem"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Mais antigas"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Adicionar um favorito"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Ainda não adicionou nenhum favorito."</string>
-    <string name="search_title" msgid="5412680850141871664">"Pesquise contactos"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Pesquise contactos"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Múltiplos"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Escolha um número de telefone"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Apenas uma vez"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Sempre"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g> – Predefinição"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g> – favorito"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Notificação de chamada recebida"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Chamada recebida"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Notificação de chamada não atendida"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Chamada não atendida"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"Em espera"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Definições"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Ecrã inicial"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Ordem dos contactos"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Nome próprio"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Apelido"</string>
-</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
deleted file mode 100644
index fbbf958..0000000
--- a/res/values-pt/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Telefone"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Para completar a chamada, conecte o smartphone ao seu carro via Bluetooth."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"O Bluetooth não está disponível."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Para fazer ou receber chamadas, ative o Bluetooth."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Para fazer ou receber chamadas, pareie o smartphone com o carro."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Conectar ao Bluetooth"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Emergência"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Chamada de emergência"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Esse contato pode ter sido excluído."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Não é possível discar esse número. Verifique se ele está correto e tente novamente."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"As chamadas telefônicas não estão disponíveis. Tente novamente mais tarde."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Recusar"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Atender"</string>
-    <string name="call_back" msgid="5745638356098600872">"Retornar chamada"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Bluetooth do veículo"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Viva-voz"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Aparelho"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Discar um número"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Favoritos"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Histórico de chamadas"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Contatos"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Teclado"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Hoje"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Ontem"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Mais antigas"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Adicionar favorito"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Você ainda não adicionou favoritos"</string>
-    <string name="search_title" msgid="5412680850141871664">"Pesquisar contatos"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Pesquisar contatos"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Vários"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Escolha um número de telefone"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Só uma vez"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Sempre"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  - Padrão"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g> (favorito)"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Notificação de chamada recebida"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Chamada recebida"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Notificação de chamada perdida"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Chamada perdida"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"Em espera"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Configurações"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Tela inicial"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Ordem dos contatos"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Nome"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Sobrenome"</string>
-</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
deleted file mode 100644
index 486dcfe..0000000
--- a/res/values-ro/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Telefon"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Pentru a efectua apelul, conectați telefonul la mașină prin Bluetooth."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth nu este disponibil."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Pentru a efectua sau a primi apeluri, activați Bluetooth."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Pentru a efectua sau a primi apeluri, asociați telefonul cu mașina."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Conectați-vă la Bluetooth"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Urgență"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Apel de urgență"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Este posibil să fi șters persoana de contact."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Nu se poate forma numărul. Verificați-l și încercați din nou."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Apelarea telefonică nu este disponibilă. Încercați din nou mai târziu."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Refuzați"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Răspundeți"</string>
-    <string name="call_back" msgid="5745638356098600872">"Sunați"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Bluetooth vehicul"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Difuzor"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Receptor"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Formați un număr"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Favorite"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Istoricul apelurilor"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Agendă"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Tastatură numerică"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Azi"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Ieri"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Mai vechi"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Adăugați o persoană de contact preferată"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Nu ați adăugat nimic la preferințe încă."</string>
-    <string name="search_title" msgid="5412680850141871664">"Căutați persoane de contact"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Căutați persoane de contact"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Mai multe"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Alegeți un număr de telefon"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Numai o dată"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Mereu"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g> – prestabilit"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g> – Preferat"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Notificare de apel primit"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Apel primit"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Notificare privind apelul nepreluat"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Apel nepreluat"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"În așteptare"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Setări"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Ecran de pornire"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Ordinea persoanelor de contact"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Prenume"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Nume"</string>
-</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
deleted file mode 100644
index c6da8ae..0000000
--- a/res/values-ru/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Телефон"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Чтобы позвонить, сначала подключите телефон к автомобилю по Bluetooth."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth не поддерживается."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Чтобы совершать и принимать вызовы, включите Bluetooth."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Чтобы совершать и принимать вызовы, подключите телефон к автомобилю."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Подключиться по Bluetooth"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Экстренный вызов"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Экстренный вызов"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Вероятно, контакт удален."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Не удается набрать номер. Проверьте, правильно ли он введен, и повторите попытку."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Звонок недоступен. Повторите попытку."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Отклонить"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Ответить"</string>
-    <string name="call_back" msgid="5745638356098600872">"Перезвонить"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Bluetooth в автомобиле"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Громкая связь"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Телефон"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Набрать номер"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Избранное"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Звонки"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Контакты"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Кнопки"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Сегодня"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Вчера"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Раньше"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Настроить быстрый набор"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"У вас пока нет избранных контактов."</string>
-    <string name="search_title" msgid="5412680850141871664">"Поиск в контактах"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Поиск в контактах"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Несколько"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Выберите номер телефона"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Только сейчас"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Всегда"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g> – по умолчанию"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g> (в избранном)"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Уведомление при входящем вызове"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Входящий вызов"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Уведомление о пропущенном вызове"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Пропущенный вызов"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"На удержании"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Настройки"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Начальный экран"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Порядок контактов"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Имя"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"По фамилии"</string>
-</resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
deleted file mode 100644
index 9e1ec66..0000000
--- a/res/values-si/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"දුරකථනය"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"ඔබේ ඇමතුම සම්පූර්ණ කිරීමට, පළමුව ඔබේ දුරකථනය ඔබේ මෝටර් රථයට බ්ලූටූත් හරහා සබඳින්න."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"බ්ලූටූත් නොලැබේ."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"ඇමතුම් ගැනීමට හෝ ලැබීමට, බ්ලූටූත් ක්‍රියාත්මක කරන්න."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"ඇමතුම් ගැනීමට හෝ ලැබීමට, ඔබේ දුරකථනය මෝටර් රථය සමඟ යුගලනය කරන්න."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"බ්ලූටූත් වෙත සබඳින්න"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"හදිසි"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"හදිසි ඇමතුම"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"මෙම සම්බන්ධතාව මකා දමා තිබිය හැක."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"මෙම අංකය ඇමතිය නොහැක. එය පරීක්ෂා කර නැවත උත්සාහ කරන්න."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"දුරකථන ඇමතුම ලබා ගත නොහැක. පසුව නැවත උත්සාහ කරන්න."</string>
-    <string name="decline_call" msgid="2505987200485272226">"ප්‍රතික්ෂේපය"</string>
-    <string name="answer_call" msgid="3272474440561548115">"පිළිතුරු දෙන්න"</string>
-    <string name="call_back" msgid="5745638356098600872">"ආපසු අමතන්න"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"වාහන බ්ලූටූත්"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"ස්පීකර් දුරකථනය"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"හෑන්ඩ්සෙට්"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"අංකයක් ඩයල් කරන්න"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"ප්‍රියතම"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"ඇමතුම් ඉතිහාසය"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"සම්බන්ධතා"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"ඇමතුම් පෑඩය"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"අද"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"ඊයේ"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"පැරණි"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"ප්‍රියතමයක් එක් කරන්න"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"ඔබ තවම ප්‍රියතමයන් එක් කර නැත"</string>
-    <string name="search_title" msgid="5412680850141871664">"සම්බන්ධතා සොයන්න"</string>
-    <string name="search_hint" msgid="3099066132607042439">"සම්බන්ධතා සොයන්න"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"බහුවිධ"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"දුරකථන අංකයක් තෝරා ගන්න"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"එක් වරක්"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"සැමවිටම"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  - පෙරනිමි"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  - ප්‍රියතමය"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"එන ඇමතුම් දැනුම්දීම"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"එන ඇමතුම"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"මඟ හැරුණු ඇමතුම් දැනුම්දීම"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"මඟ හැරුණු ඇමතුම"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"රඳවා ඇත"</string>
-    <string name="setting_title" msgid="1296639422364732365">"සැකසීම්"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"ආරම්භක තිරය"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"සම්බන්ධතා අනුපිළිවෙළ"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"පළමු නම"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"අග නම"</string>
-</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
deleted file mode 100644
index f221793..0000000
--- a/res/values-sk/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Telefón"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Ak chcete volať, pripojte telefón k autu pomocou rozhrania Bluetooth."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth nie je k dispozícii."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Ak chcete volať alebo prijímať hovory, zapnite Bluetooth."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Ak chcete volať alebo prijímať hovory, spárujte telefón s autom."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Pripojiť k zariadeniu Bluetooth"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Tiesňové volanie"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Tiesňové volanie"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Tento kontakt bol zrejme odstránený."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Toto číslo sa nedá vytočiť. Skontrolujte ho a skúste to znova."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Volanie nie je k dispozícii. Skúste to znova neskôr."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Odmietnuť"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Prijať"</string>
-    <string name="call_back" msgid="5745638356098600872">"Zavolať späť"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Bluetooth vozidla"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Reproduktor"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Slúchadlo"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Vytočiť číslo"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Obľúbené"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"História hovorov"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Kontakty"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Číselná klávesnica"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Dnes"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Včera"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Staršie"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Pridať obľúbený kontakt"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Zatiaľ ste nepridali žiadne obľúbené kontakty"</string>
-    <string name="search_title" msgid="5412680850141871664">"Hľadať v kontaktoch"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Hľadať v kontaktoch"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Viaceré"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Vyberte telefónne číslo"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Len raz"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Vždy"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g> – predvolené"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g> – zaradiť medzi obľúbené"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Upozornenie na prichádzajúci hovor"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Prichádzajúci hovor"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Upozornenie na zmeškaný hovor"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Zmeškaný hovor"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"Pozdržané"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Nastavenia"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Úvodná obrazovka"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Poradie kontaktov"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Krstné meno"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Priezvisko"</string>
-</resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
deleted file mode 100644
index 7e877ff..0000000
--- a/res/values-sl/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Telefon"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Če želite opraviti klic, najprej povežite telefon z avtomobilom prek Bluetootha."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth ni na voljo."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Če želite opravljati ali sprejemati klice, vklopite Bluetooth."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Če želite opravljati ali sprejemati klice, seznanite telefon in avtomobil."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Povezovanje z Bluetoothom"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Nujni primer"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Klic v sili"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Ta stik je morda izbrisan."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Te številke ni mogoče poklicati. Preverite jo in poskusite znova."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Telefonski klic ni na voljo. Poskusite znova pozneje."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Zavrni"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Odgovor"</string>
-    <string name="call_back" msgid="5745638356098600872">"Povratni klic"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Vmesnik Bluetooth vozila"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Telefon z zvočnikom"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Slušalka"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Izbiranje številke"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Priljubljene"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Zgodovina klicev"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Stiki"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Številčnica"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Danes"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Včeraj"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Starejši"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Dodaj priljubljenega"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Dodali niste še nobenega priljubljenega"</string>
-    <string name="search_title" msgid="5412680850141871664">"Iskanje stikov"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Iskanje stikov"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Več"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Izberite telefonsko številko"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Samo enkrat"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Vedno"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g> – privzeto"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g> – Priljubljena"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Obvestilo o dohodnem klicu"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Dohodni klic"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Obvestilo o neodgovorjenem klicu"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Neodgovorjeni klic"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"Na čakanju"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Nastavitve"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Začetni zaslon"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Vrstni red stikov"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Ime"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Priimek"</string>
-</resources>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
deleted file mode 100644
index 265b76a..0000000
--- a/res/values-sq/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Telefon"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Për të përfunduar telefonatën, në fillim lidh telefonin me makinën nëpërmjet Bluetooth."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth nuk ofrohet."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Për të bërë ose për të marrë telefonata, aktivizo Bluetooth-in."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Për të bërë ose për të marrë telefonata, çiftoje telefonin me makinën."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Lidhu me Bluetooth-in"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Urgjenca"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Telefonata e urgjencës"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Ky kontakt mund të jetë fshirë."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Nuk mund ta formosh këtë numër. Kontrolloje dhe provo përsëri."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Telefonatat nuk ofrohen. Provo përsëri më vonë."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Refuzo"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Përgjigju"</string>
-    <string name="call_back" msgid="5745638356098600872">"Telefono mbrapsht"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Bluetooth-i i automjetit"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Altoparlanti"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Receptori"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Formo një numër"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Të preferuarat"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Historiku i telefonatave"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Kontaktet"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Blloku i formimit të numrit"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Sot"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Dje"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Më të vjetra"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Shto një të preferuar"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Nuk ke shtuar ende asnjë të preferuar"</string>
-    <string name="search_title" msgid="5412680850141871664">"Kërko për kontakte"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Kërko për kontakte"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Disa"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Zgjidh një numër telefoni"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Vetëm një herë"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Gjithmonë"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  - parazgjedhja"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  - E preferuar"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Njoftimi i telefonatës hyrëse"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Telefonatë hyrëse"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Njoftimi i telefonatës së humbur"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Telefonatë e humbur"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"Në pritje"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Cilësimet"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Ekrani i nisjes"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Renditja e kontakteve"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Emri"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Mbiemri"</string>
-</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
deleted file mode 100644
index 1cd41b7..0000000
--- a/res/values-sr/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Телефон"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Да бисте довршили позив, прво повежите телефон са аутомобилом преко Bluetooth-а."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth није доступан."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Да бисте упућивали или примали позиве, укључите Bluetooth."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Да бисте упућивали или примали позиве, упарите телефон са аутомобилом."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Повежи са Bluetooth-ом"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Хитан случај"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Хитни позив"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Овај контакт је можда избрисан."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Позивање овог броја није успело. Проверите га и пробајте поново."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Телефонски позив није доступан. Пробајте поново касније."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Одбиј"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Одговори"</string>
-    <string name="call_back" msgid="5745638356098600872">"Узврати позив"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Bluetooth возила"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Спикерфон"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Слушалице"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Унесите број"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Омиљено"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Историја позива"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Контакти"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Нумеричка тастатура"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Данас"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Јуче"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Старије"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Додајте омиљен контакт"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Још нисте додали омиљене контакте"</string>
-    <string name="search_title" msgid="5412680850141871664">"Претражите контакте"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Претражите контакте"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Више"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Одаберите број телефона"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Само једном"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Увек"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g> – подразумевано"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  – Омиљено"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Обавештење о долазном позиву"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Долазни позив"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Обавештење о пропуштеном позиву"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Пропуштен позив"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"На чекању"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Подешавања"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Почетни екран"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Редослед контаката"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Име"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Презиме"</string>
-</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
deleted file mode 100644
index 93f0c0f..0000000
--- a/res/values-sv/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Telefon"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Om du vill ringa ett samtal måste du först ansluta mobilen till bilen via Bluetooth."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth är inte tillgängligt."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Aktivera Bluetooth om du vill ringa och ta emot samtal."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Koppla mobilen till bilen om du vill ringa eller ta emot samtal."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Anslut till Bluetooth"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Nödsamtal"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Nödsamtal"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Den här kontakten kan ha raderats."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Det går inte att ringa detta nummer. Kontrollera det och försök igen."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Samtalsfunktionen är inte tillgänglig. Försök igen senare."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Avvisa"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Svara"</string>
-    <string name="call_back" msgid="5745638356098600872">"Ring tillbaka"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Fordonets Bluetooth"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Högtalartelefon"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Hörlur"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Slå ett nummer"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Favoriter"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Samtalshistorik"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Kontakter"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Knappsats"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"I dag"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"I går"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Äldre"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Lägg till en favorit"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Du har inte lagt till några favoriter än"</string>
-    <string name="search_title" msgid="5412680850141871664">"Sök efter kontakter"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Sök efter kontakter"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Flera"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Välj ett telefonnummer"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Bara en gång"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Alltid"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  – standard"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g> – markera som favorit"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Avisering om inkommande samtal"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Inkommande samtal"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Avisering om missat samtal"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Missat samtal"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"Parkerat"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Inställningar"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Startskärm"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Kontaktordning"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Förnamn"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Efternamn"</string>
-</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
deleted file mode 100644
index 2376a32..0000000
--- a/res/values-sw/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Simu"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Ili upige simu, kwanza unganisha simu yako kwenye gari lako kupitia Bluetooth."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth haipatikani."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Ili upige au upokee simu, washa Bluetooth."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Ili upige au upokee simu, oanisha simu yako na gari."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Unganisha kwenye Bluetooth"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Dharura"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Simu ya dharura"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Huenda anwani hii ilifutwa."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Imeshindwa kupigia nambari hii. Ikague kisha ujaribu tena."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Huduma ya kupiga simu haipatikani. Tafadhali jaribu tena baadaye."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Kataa"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Jibu"</string>
-    <string name="call_back" msgid="5745638356098600872">"Mpigie"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Bluetooth ya gari"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Spika ya simu"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Spika ya masikioni"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Pigia nambari"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Vipendwa"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Rekodi ya Simu Zilizopigwa"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Anwani"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Vitufe vya kupiga simu"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Leo"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Jana"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Za zamani"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Ongeza anwani unazowasiliana nazo sana"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Bado hujaongeza anwani zozote unazowasiliana nazo sana"</string>
-    <string name="search_title" msgid="5412680850141871664">"Tafuta anwani"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Tafuta anwani"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Nyingi"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Chagua nambari ya simu"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Mara moja tu"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Kila wakati"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  - Chaguomsingi"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g> - Kipendwa"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Arifa ya simu inayoingia"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Simu inayoingia"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Arifa ya simu ambayo hukujibu"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Simu ambayo hukujibu"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"Imesitishwa."</string>
-    <string name="setting_title" msgid="1296639422364732365">"Mipangilio"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Skrini ya kwanza"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Mpangilio wa anwani"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Jina la kwanza"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Jina la mwisho"</string>
-</resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
deleted file mode 100644
index bc0a2c5..0000000
--- a/res/values-ta/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"ஃபோன்"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"அழைப்பை நிறைவுசெய்ய முதலில் புளூடூத் மூலம் மொபைலைக் காருடன் இணைக்கவும்."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"புளூடூத் இல்லை."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"அழைப்புகளைச் செய்யவோ பெறவோ புளூடூத்தை ஆன் செய்க."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"அழைப்புகளைச் செய்யவோ பெறவோ மொபைலைக் காருடன் இணைக்கவும்."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"புளூடூத் உடன் இணை"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"அவசர அழைப்பு"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"அவசர அழைப்பு"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"இந்தத் தொடர்பு நீக்கப்பட்டிருக்கக்கூடும்."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"இந்த எண்ணிற்கு டயல் செய்ய இயலவில்லை. சரிபார்த்து மீண்டும் முயல்க."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"ஃபோன் அழைப்பு வசதி இல்லை. பிறகு முயலவும்."</string>
-    <string name="decline_call" msgid="2505987200485272226">"நிராகரி"</string>
-    <string name="answer_call" msgid="3272474440561548115">"பதிலளி"</string>
-    <string name="call_back" msgid="5745638356098600872">"அழை"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"வாகன புளூடூத்"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"ஸ்பீக்கர் ஃபோன்"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"ஹேண்ட்செட்"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"டயல் செய்"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"பிடித்தவை"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"அழைப்பு வரலாறு"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"தொடர்புகள்"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"டயல்பேட்"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"இன்று"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"நேற்று"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"பழையவை"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"பிடித்ததைச் சேர்"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"பிடித்தவை எதையும் நீங்கள் இதுவரை சேர்க்கவில்லை"</string>
-    <string name="search_title" msgid="5412680850141871664">"தொடர்புகளில் தேடுக"</string>
-    <string name="search_hint" msgid="3099066132607042439">"தொடர்புகளில் தேடுக"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"பலர்"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"மொபைல் எண்ணைத் தேர்ந்தெடுக்கவும்"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"இப்போது மட்டும்"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"எப்போதும்"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  - இயல்பு"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  - பிடித்தது"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"உள்வரும் அழைப்புக்கான அறிவிப்பு"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"உள்வரும் அழைப்பு"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"தவறிய அழைப்புக்கான அறிவிப்பு"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"தவறிய அழைப்பு"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"ஹோல்டில் உள்ளது"</string>
-    <string name="setting_title" msgid="1296639422364732365">"அமைப்புகள்"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"தொடக்கப் பக்கம்"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"தொடர்புகளின் வரிசை"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"பெயரின் முற்பகுதி"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"பெயரின் பிற்பகுதி"</string>
-</resources>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
deleted file mode 100644
index 8154fda..0000000
--- a/res/values-te/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"ఫోన్"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"మీ కాల్‌ను పూర్తి చేయడానికి, మొదట మీ ఫోన్‌ను బ్లూటూత్ ద్వారా మీ కారుకు కనెక్ట్ చేయండి."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"బ్లూటూత్ అందుబాటులో లేదు."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"కాల్‌లు చేయడానికి లేదా స్వీకరించడానికి, బ్లూటూత్‌ను ఆన్ చేయండి."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"కాల్‌లు చేయడానికి లేదా స్వీకరించడానికి, మీ ఫోన్‌ను కారుతో జత చేయండి."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"బ్లూటూత్‌కు కనెక్ట్ చేయండి"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"అత్యవసరం"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"అత్యవసర కాల్"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"ఈ పరిచయం తొలగించబడి ఉండవచ్చు."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"ఈ నంబర్‌కు డయల్ చేయలేరు. దీన్ని పరిశీలించి, మళ్ళీ ప్రయత్నించండి."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"ఫోన్ కాల్ అందుబాటులో లేదు దయచేసి మళ్లీ ప్రయత్నించండి."</string>
-    <string name="decline_call" msgid="2505987200485272226">"తిరస్కరించండి"</string>
-    <string name="answer_call" msgid="3272474440561548115">"సమాధానమివ్వండి"</string>
-    <string name="call_back" msgid="5745638356098600872">"కాల్ చేయి"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"వాహన బ్లూటూత్"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"స్పీకర్ ఫోన్"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"హ్యాండ్‌సెట్"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"నంబర్‌ను డయల్ చేయండి"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"ఇష్టమైనవి"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"కాల్ చరిత్ర"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"పరిచయాలు"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"డయల్‌ప్యాడ్"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"నేడు"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"నిన్న"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"పాతది"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"ఇష్టమైన వారిని జోడించండి"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"మీరు ఇష్టమైనవి ఏవీ ఇంకా జోడించలేదు"</string>
-    <string name="search_title" msgid="5412680850141871664">"పరిచయాలను వెతకండి"</string>
-    <string name="search_hint" msgid="3099066132607042439">"పరిచయాలను వెతకండి"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"అనేకం"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"ఒక ఫోన్ నంబర్‌ను ఎంచుకోండి"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"కేవలం ఒకసారి"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"ఎల్లప్పుడూ"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  - డిఫాల్ట్"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  - ఇష్టమైనది"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"ఇన్‌కమింగ్ కాల్ నోటిఫికేషన్"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"ఇన్‌కమింగ్ కాల్"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"సమాధానమివ్వని కాల్ నోటిఫికేషన్"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"సమాధానమివ్వని కాల్"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"హోల్డ్‌లో ఉంది"</string>
-    <string name="setting_title" msgid="1296639422364732365">"సెట్టింగ్‌లు"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"స్క్రీన్‌ను ప్రారంభించు"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"పరిచయాల క్రమం"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"మొదటి పేరు"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"చివరి పేరు"</string>
-</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
deleted file mode 100644
index 7dff1ba..0000000
--- a/res/values-th/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"โทรศัพท์"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"ต้องเชื่อมต่อโทรศัพท์กับรถผ่านบลูทูธก่อนเพื่อให้โทรได้"</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"บลูทูธไม่พร้อมใช้งาน"</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"เปิดบลูทูธเพื่อโทรออกหรือรับสาย"</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"หากต้องการโทรออกหรือรับสาย ให้จับคู่โทรศัพท์กับรถ"</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"เชื่อมต่อบลูทูธ"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"ฉุกเฉิน"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"หมายเลขฉุกเฉิน"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"รายชื่อติดต่อนี้อาจถูกลบไปแล้ว"</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"โทรหาหมายเลขนี้ไม่ได้ โปรดตรวจสอบหมายเลขแล้วลองอีกครั้ง"</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"การโทรติดต่อไม่พร้อมใช้งาน โปรดลองอีกครั้งภายหลัง"</string>
-    <string name="decline_call" msgid="2505987200485272226">"ปฏิเสธ"</string>
-    <string name="answer_call" msgid="3272474440561548115">"รับสาย"</string>
-    <string name="call_back" msgid="5745638356098600872">"โทรกลับ"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"บลูทูธของยานพาหนะ"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"ลำโพง"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"ชุดหูฟัง"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"กดหมายเลขโทรศัพท์"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"รายการโปรด"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"ประวัติการโทร"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"รายชื่อติดต่อ"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"แป้นหมายเลข"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"วันนี้"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"เมื่อวานนี้"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"เก่ากว่า"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"เพิ่มรายการโปรด"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"คุณยังไม่ได้เพิ่มรายการโปรดใดๆ"</string>
-    <string name="search_title" msgid="5412680850141871664">"ค้นหารายชื่อติดต่อ"</string>
-    <string name="search_hint" msgid="3099066132607042439">"ค้นหารายชื่อติดต่อ"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"หลายรายการ"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"เลือกหมายเลขโทรศัพท์"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"เฉพาะครั้งนี้"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"ทุกครั้ง"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  - ค่าเริ่มต้น"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  - รายการโปรด"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"การแจ้งเตือนสายเรียกเข้า"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"สายเรียกเข้า"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"การแจ้งเตือนสายที่ไม่ได้รับ"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"สายที่ไม่ได้รับ"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"พักสาย"</string>
-    <string name="setting_title" msgid="1296639422364732365">"การตั้งค่า"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"หน้าจอเริ่มต้น"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"ลำดับรายชื่อติดต่อ"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"ชื่อ"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"นามสกุล"</string>
-</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
deleted file mode 100644
index f3741ea..0000000
--- a/res/values-tl/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Telepono"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Para makumpleto ang iyong tawag, ikonekta muna ang telepono mo sa iyong sasakyan sa pamamagitan ng Bluetooth."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Hindi available ang Bluetooth."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Para makatawag o makatanggap ng mga tawag, i-on ang Bluetooth."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Para makatawag o makatanggap ng mga tawag, ipares ang iyong telepono sa sasakyan."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Kumonekta sa Bluetooth"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Emergency"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Emergency na tawag"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Puwedeng na-delete na ang contact na ito."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Hindi ma-dial ang numerong ito. Suriin ito at subukan ulit."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Hindi available ang tawag sa telepono. Pakisubukan ulit sa ibang pagkakataon."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Tanggihan"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Sagutin"</string>
-    <string name="call_back" msgid="5745638356098600872">"Tawagan"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Bluetooth ng sasakyan"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Speaker phone"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Handset"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Mag-dial ng numero"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Mga Paborito"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"History ng Tawag"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Mga Contact"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Dialpad"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Ngayon"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Kahapon"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Mas Luma"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Magdagdag ng paborito"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Hindi ka pa nagdaragdag ng anumang paborito"</string>
-    <string name="search_title" msgid="5412680850141871664">"Maghanap ng mga contact"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Maghanap ng mga contact"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Marami"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Pumili ng numero ng telepono"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Isang beses lang"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Palagi"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  - Default"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  - Paborito"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Notification ng papasok na tawag"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Papasok na tawag"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Notification ng hindi nasagot na tawag"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Hindi nasagot na tawag"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"Naka-hold"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Mga Setting"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Screen ng simula"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Pagkakasunud-sunod ng contact"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Pangalan"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Apelyido"</string>
-</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
deleted file mode 100644
index fbe2741..0000000
--- a/res/values-tr/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Telefon"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Aramanızı tamamlamak için önce telefonunuzu Bluetooth ile aracınıza bağlayın."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth kullanılamıyor."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Çağrı yapmak veya almak için Bluetooth\'u açın."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Çağrı yapmak veya almak için telefonunuzu araçla eşleştirin."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Bluetooth\'a bağlan"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Acil durum"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Acil durum araması"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Bu kişi silinmiş olabilir."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Bu numara aranamıyor. Numarayı kontrol edip tekrar deneyin."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Telefonla arama yapılamıyor. Lütfen daha sonra tekrar deneyin."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Reddet"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Yanıtla"</string>
-    <string name="call_back" msgid="5745638356098600872">"Geri ara"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Araç Bluetooth\'u"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Hoparlör"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Ahize"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Numara çevir"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Favoriler"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Çağrı Geçmişi"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Kişiler"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Tuş takımı"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Bugün"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Dün"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Daha eski"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Favori ekle"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Henüz herhangi bir favori eklemediniz"</string>
-    <string name="search_title" msgid="5412680850141871664">"Kişilerde arayın"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Kişilerde arayın"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Birden fazla"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Telefon numarası seçin"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Yalnızca bir defa"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Her zaman"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g> - Varsayılan"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  - Favori"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Gelen arama bildirimi"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Gelen arama"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Cevapsız arama bildirimi"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Cevapsız arama"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"Beklemede"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Ayarlar"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Başlangıç ekranı"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Kişi sırası"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Ad"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Soyadı"</string>
-</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
deleted file mode 100644
index 17f979a..0000000
--- a/res/values-uk/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Телефон"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Щоб здійснити виклик, підключіть телефон до автомобіля через Bluetooth."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Функція Bluetooth недоступна."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Щоб здійснювати або отримувати виклики, увімкніть Bluetooth."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Щоб здійснювати або отримувати виклики, підключіть телефон до автомобіля."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Підключитися до Bluetooth"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Екстрений виклик"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Екстрений виклик"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Можливо, цей контакт видалено."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Не вдається набрати цей номер. Перевірте його та повторіть спробу."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Телефонні виклики недоступні. Зачекайте."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Відхилити"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Відповісти"</string>
-    <string name="call_back" msgid="5745638356098600872">"Передзвонити"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Bluetooth автомобіля"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Гучний зв’язок"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Гарнітура"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Набрати номер"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Вибране"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Історія викликів"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Контакти"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Цифрова клавіатура"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Сьогодні"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Вчора"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Старіші"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Додати у вибране"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"У вас ще немає вибраних контактів"</string>
-    <string name="search_title" msgid="5412680850141871664">"Пошук контактів"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Пошук контактів"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Кілька"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Виберіть номер телефону"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Лише цього разу"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Завжди"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g> (за умовчанням)"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g> – вибране"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Сповіщення про вхідні виклики"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Вхідний виклик"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Сповіщення про пропущений виклик"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Пропущений виклик"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"Утримується"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Налаштування"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Початковий екран"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Порядок відображення"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Ім\'я"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Прізвище"</string>
-</resources>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
deleted file mode 100644
index 011d209..0000000
--- a/res/values-ur/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"فون"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"اپنے کال کو مکمل کرنے کے لیے، سب سے پہلے بلوٹوتھ کے ذریعہ اپنے فون کو اپنی کار سے منسلک کریں۔"</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"بلوٹوتھ دستیاب نہیں ہے۔"</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"کال کرنے یا موصول کرنے کے لیے، بلوٹوتھ آن کریں۔"</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"کال کرنے یا موصول کرنے کے لیے، کار سے اپنے فون کو جوڑیں۔"</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"بلوٹوتھ سے منسلک کریں"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"ہنگامی"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"ہنگامی کال"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"ہو سکتا ہے یہ رابطہ حذف ہو گیا ہو۔"</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"یہ نمبر ڈائل نہیں ہو سکتا۔ چیک کریں اور دوبارہ کوشش کریں۔"</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"فون کال دستیاب نہیں ہے۔ براہ کرم بعد میں دوبارہ کوشش کریں۔"</string>
-    <string name="decline_call" msgid="2505987200485272226">"مسترد کریں"</string>
-    <string name="answer_call" msgid="3272474440561548115">"جواب دیں"</string>
-    <string name="call_back" msgid="5745638356098600872">"واپس کال کریں"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"گاڑی کا بلوٹوتھ"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"اسپیکر فون"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"ہینڈ سیٹ"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"کوئی نمبر ڈائل کریں"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"پسندیدگیاں"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"کال کی سرگزشت"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"رابطے"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"ڈائل پیڈ"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"آج"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"گزشتہ کل"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"زیادہ پرانا"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"پسندیدگی شامل کریں"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"آپ نے ابھی تک کوئی پسندیدگی شامل نہیں کی ہے"</string>
-    <string name="search_title" msgid="5412680850141871664">"رابطے تلاش کریں"</string>
-    <string name="search_hint" msgid="3099066132607042439">"رابطے تلاش کریں"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"متعدد"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"کوئی فون نمبر منتخب کریں"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"بس ایک بار"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"ہمیشہ"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  - ڈیفالٹ"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  - پسندیدہ"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"موصول ہونے والی کال کی اطلاع"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"موصول ہونے والی کال"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"چھوٹی ہوئی کال کی اطلاع"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"چھوٹی ہوئی کال"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"ہولڈ پر ہے"</string>
-    <string name="setting_title" msgid="1296639422364732365">"ترتیبات"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"اسکرین شروع کریں"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"رابطہ کی ترتیب"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"پہلا نام"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"آخری نام"</string>
-</resources>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
deleted file mode 100644
index ede2d07..0000000
--- a/res/values-uz/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Telefon"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Chaqiruvni bajarish uchun avval telefonni Bluetooth orqali avtomobilga ulang."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth ishlamayapti."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Chaqiruv bajarish yoki qabul qilishdan oldin Bluetoothni yoqing."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Chaqiruv bajarish yoki qabul qilishdan oldin telefonni avtomobilga ulang."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Bluetoothga ulanish"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Favqulodda chaqiruv"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Favqulodda chaqiruv"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Bu kontakt oʻchirib tashlanganga oʻxshaydi."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Bu raqam ishlamayapti. Aniqligini tekshiring va qaytadan urining."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Telefon xizmati hozir ishlamaydi. Keyinroq qayta urining."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Rad etish"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Javob berish"</string>
-    <string name="call_back" msgid="5745638356098600872">"Telefon"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Avtomobildagi bluetooth"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Karnaylar"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Telefon"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Raqam terish"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Saralanganlar"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Tarix"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Kontaktlar"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Raqamlar paneli"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Bugun"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Kecha"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Eskiroq"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Saralanganlarga kiritish"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Herch qaysi kontakt saralanmagan"</string>
-    <string name="search_title" msgid="5412680850141871664">"Kontaktlar ichidan qidiring"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Kontaktlar ichidan qidiring"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Bir nechta"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Raqam tanlang"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Bir marta"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Har doim"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  – Standart"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  - Saralangan"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Kiruvchi chaqiruvlar uchun bildirishnoma"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Kiruvchi chaqiruv"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Javobsiz chaqiruv bildirishnomasi"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Javobsiz chaqiruv"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"Kutish holatida"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Sozlamalar"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Bosh ekran"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Kontaktlar tartibi"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Ismi"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Familiyalar asosida"</string>
-</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
deleted file mode 100644
index 0435f40..0000000
--- a/res/values-vi/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Điện thoại"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Để thực hiện cuộc gọi, trước tiên, hãy kết nối điện thoại với ô tô qua Bluetooth."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"Không có kết nối Bluetooth."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Để gọi điện hoặc nhận cuộc gọi, hãy bật Bluetooth."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Để gọi điện hoặc nhận cuộc gọi, hãy ghép nối điện thoại với ô tô."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Kết nối với Bluetooth"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Khẩn cấp"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Cuộc gọi khẩn cấp"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Người liên hệ này có thể đã bị xóa."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Không thể gọi số điện thoại này. Hãy kiểm tra rồi thử lại."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Bạn chưa thể gọi điện thoại. Vui lòng thử lại sau."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Từ chối"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Trả lời"</string>
-    <string name="call_back" msgid="5745638356098600872">"Gọi lại"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"Bluetooth trên xe"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Loa ngoài"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Thiết bị cầm tay"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Quay số"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Mục yêu thích"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Nhật ký cuộc gọi"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Danh bạ"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Bàn phím số"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Hôm nay"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Hôm qua"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Cũ hơn"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Thêm một mục liên hệ yêu thích"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Bạn chưa thêm người liên hệ yêu thích nào"</string>
-    <string name="search_title" msgid="5412680850141871664">"Tìm kiếm trong danh bạ"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Tìm kiếm trong danh bạ"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Nhiều"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Chọn một số điện thoại"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Chỉ một lần"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Luôn bật"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  - Mặc định"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g> – Số điện thoại yêu thích"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Thông báo khi có cuộc gọi đến"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Cuộc gọi đến"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Thông báo cuộc gọi nhỡ"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Cuộc gọi nhỡ"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"Đang chờ"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Cài đặt"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Màn hình bắt đầu"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"Thứ tự danh bạ"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Tên"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Họ"</string>
-</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
deleted file mode 100644
index 3d673d9..0000000
--- a/res/values-zh-rCN/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"电话"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"要完成通话,请先通过蓝牙将您的手机连接到汽车。"</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"蓝牙不可用。"</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"要拨打或接听电话,请开启蓝牙。"</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"要拨打或接听电话,请将您的手机与汽车配对。"</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"连接到蓝牙"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"紧急"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"紧急呼叫"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"该联系人可能已被删除。"</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"无法拨打此号码。请检查号码,然后重试。"</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"无法使用通话功能。请稍后重试。"</string>
-    <string name="decline_call" msgid="2505987200485272226">"拒接"</string>
-    <string name="answer_call" msgid="3272474440561548115">"接听"</string>
-    <string name="call_back" msgid="5745638356098600872">"回电"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"车载蓝牙"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"扬声器模式"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"手机听筒"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"拨号"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"常用联系人"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"通话记录"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"通讯录"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"拨号键盘"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"今天"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"昨天"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"更早"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"添加常用联系人"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"您尚未添加任何常用联系人"</string>
-    <string name="search_title" msgid="5412680850141871664">"搜索联系人"</string>
-    <string name="search_hint" msgid="3099066132607042439">"搜索联系人"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"多个"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"选择电话号码"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"仅此一次"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"一律允许"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g> - 默认"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  - 收藏"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"来电通知"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"来电"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"未接电话通知"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"未接电话"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"呼叫等待"</string>
-    <string name="setting_title" msgid="1296639422364732365">"设置"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"开始屏幕"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"联系人顺序"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"名字"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"姓氏"</string>
-</resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
deleted file mode 100644
index ffa3a58..0000000
--- a/res/values-zh-rHK/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"電話"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"如要完成通話,請先透過藍牙連接手機和汽車。"</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"無法使用藍牙。"</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"如要撥打或接聽電話,請開啟藍牙。"</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"如要撥打或接聽電話,請將手機與汽車配對。"</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"連接藍牙"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"緊急"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"緊急電話"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"此聯絡人可能已被刪除。"</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"無法撥打此號碼。請檢查並再試一次。"</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"無法撥打電話,請稍後再試。"</string>
-    <string name="decline_call" msgid="2505987200485272226">"拒絕"</string>
-    <string name="answer_call" msgid="3272474440561548115">"接聽"</string>
-    <string name="call_back" msgid="5745638356098600872">"回電"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"汽車藍牙"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"擴音器"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"免提聽筒"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"撥號"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"常用"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"通話記錄"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"聯絡人"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"撥號盤"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"今天"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"昨天"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"較早"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"新增常用聯絡人"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"您尚未新增任何常用聯絡人"</string>
-    <string name="search_title" msgid="5412680850141871664">"搜尋聯絡人"</string>
-    <string name="search_hint" msgid="3099066132607042439">"搜尋聯絡人"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"多個"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"請選擇電話號碼"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"只此一次"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"一律"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g> - 預設"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  - 加入收藏"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"來電通知"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"來電"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"未接來電通知"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"未接來電"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"保留通話"</string>
-    <string name="setting_title" msgid="1296639422364732365">"設定"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"開始畫面"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"聯絡人排序"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"名字"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"姓氏"</string>
-</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
deleted file mode 100644
index b32fe84..0000000
--- a/res/values-zh-rTW/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"電話"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"如要完成通話,請先透過藍牙將手機連接至車輛。"</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"無法使用藍牙功能。"</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"如要撥打或接聽電話,請開啟藍牙功能。"</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"如要撥打或接聽電話,請將手機與車輛配對。"</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"使用藍牙連線"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"緊急電話"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"緊急電話"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"這位聯絡人可能已遭到刪除。"</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"無法撥打這組電話號碼,請檢查號碼是否正確,然後再試一次。"</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"通話服務無法使用,請稍後再試。"</string>
-    <string name="decline_call" msgid="2505987200485272226">"拒接"</string>
-    <string name="answer_call" msgid="3272474440561548115">"接聽"</string>
-    <string name="call_back" msgid="5745638356098600872">"回撥"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"車輛藍牙"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"擴音模式"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"聽筒模式"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"撥號"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"常用聯絡人"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"通話記錄"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"聯絡人"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"撥號鍵盤"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"今天"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"昨天"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"較舊"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"新增常用聯絡人"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"你尚未新增任何常用聯絡人"</string>
-    <string name="search_title" msgid="5412680850141871664">"搜尋聯絡人"</string>
-    <string name="search_hint" msgid="3099066132607042439">"搜尋聯絡人"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"多個"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"選擇電話號碼"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"僅限一次"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"一律允許"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g> - 預設"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g> - 加入收藏"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"來電通知"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"來電"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"未接來電通知"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"未接來電"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"保留中"</string>
-    <string name="setting_title" msgid="1296639422364732365">"設定"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"開始畫面"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"聯絡人順序"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"名字"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"姓氏"</string>
-</resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
deleted file mode 100644
index 6f16969..0000000
--- a/res/values-zu/strings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phone_app_name" msgid="238824437273544459">"Ifoni"</string>
-    <string name="no_hfp" msgid="7371139867234667691">"Ukuze uqedele ikholi yakho, qala ngokuxhuma ifoni yakho emotweni yakho nge-Bluetooth."</string>
-    <string name="bluetooth_unavailable" msgid="5258854283739591569">"I-Bluetooth ayitholakali."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"Ukuze wenze noma wamukele amakholi, vula i-Bluetooth."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Ukuze wenze noma wamukele amakholi, bhanqa ifoni yakho nemoto."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Xhumeka ku-Bluetooth"</string>
-    <string name="emergency_button_text" msgid="3467659545392931727">"Isimo esiphuthumayo"</string>
-    <string name="emergency_call_description" msgid="6700161437750325693">"Ikholi ephuthumayo"</string>
-    <string name="error_contact_deleted" msgid="6356539067659368396">"Lo oxhumana naye kungenzeka ukuthi ususiwe."</string>
-    <string name="error_invalid_phone_number" msgid="5349049631580646136">"Ayikwazi ukudayela le nombolo. Ihlole bese uyazama futhi."</string>
-    <string name="error_telephony_not_available" msgid="8715829862083386178">"Ikholi yefoni ayitholakali. Sicela uzame futhi emuva kwesikhathi."</string>
-    <string name="decline_call" msgid="2505987200485272226">"Yenqaba"</string>
-    <string name="answer_call" msgid="3272474440561548115">"Phendula"</string>
-    <string name="call_back" msgid="5745638356098600872">"Phinda ushayele"</string>
-    <string name="audio_route_vehicle" msgid="6274519162997743620">"I-bluetooth yemoto"</string>
-    <string name="audio_route_phone_speaker" msgid="407520293892557697">"Ifoni yesipikha"</string>
-    <string name="audio_route_handset" msgid="1100259514278439355">"Okuphathwa ngesandla"</string>
-    <string name="dial_a_number" msgid="7432322177412387160">"Dayela inombolo"</string>
-    <string name="favorites_title" msgid="4767723901530488145">"Izintandokazi"</string>
-    <string name="call_history_title" msgid="1495905524218923242">"Umlando wekholi"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"Oxhumana nabo"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Iphedi yokudayela"</string>
-    <string name="call_log_header_today" msgid="2069013936632793214">"Namhlanje"</string>
-    <string name="call_log_header_yesterday" msgid="4613686845163357847">"Izolo"</string>
-    <string name="call_log_header_older" msgid="3971634717537073179">"Okudala"</string>
-    <string name="add_favorite_button" msgid="7914955940249767808">"Engeza intandokazi"</string>
-    <string name="favorites_empty" msgid="6712416359691979975">"Awukangezi noma yikuphi ukubhalisa okwamanje"</string>
-    <string name="search_title" msgid="5412680850141871664">"Sesha oxhumana nabo"</string>
-    <string name="search_hint" msgid="3099066132607042439">"Sesha oxhumana nabo"</string>
-    <string name="type_multiple" msgid="3402949522797441236">"Okuningi"</string>
-    <string name="select_number_dialog_title" msgid="5770700626013782205">"Khetha inombolo yefoni"</string>
-    <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"Kanye nje"</string>
-    <string name="select_number_dialog_always_button" msgid="6862338683635863764">"Njalo"</string>
-    <string name="primary_number_description" msgid="7428950659304219592">"<xliff:g id="LABEL">%1$s</xliff:g>  - Okuzenzakalelayo"</string>
-    <string name="favorite_number_description" msgid="6490014728613395653">"<xliff:g id="LABEL">%1$s</xliff:g>  - Intandokazi"</string>
-    <string name="in_call_notification_channel_name" msgid="1978093630512401778">"Isaziso sekholi engenayo"</string>
-    <string name="notification_incoming_call" msgid="1722904631804432389">"Ikholi engenayo"</string>
-    <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"Isaziso sekholi ephuthiwe"</string>
-    <string name="notification_missed_call" msgid="7127823385811396529">"Ikholi ephuthiwe"</string>
-    <string name="onhold_call_label" msgid="1937027519810985499">"Ibanjiwe"</string>
-    <string name="setting_title" msgid="1296639422364732365">"Izilungiselelo"</string>
-    <string name="pref_start_page_title" msgid="1953465507368478503">"Isikrini sokuqala"</string>
-    <string name="sort_order_title" msgid="975104366728292702">"I-oda loxhumana naye"</string>
-    <string name="given_name_first_title" msgid="8072187841056104968">"Igama"</string>
-    <string name="family_name_first_title" msgid="7721976826282427987">"Isibongo"</string>
-</resources>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 6ddffe9..f085c19 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -17,12 +17,30 @@
     <!-- The configurable text for a keypad button. -->
     <declare-styleable name="KeypadButton">
         <!-- The keypad number, such as "1". -->
-        <attr name="numberText" format="string" />
+        <attr name="numberText" format="string"/>
 
         <!-- The letters below the number, such as "ABC". -->
-        <attr name="letterText" format="string" />
+        <attr name="letterText" format="string"/>
 
         <!-- An image that appears below the number, such as a voicemail icon. -->
-        <attr name="image" format="reference" />
+        <attr name="image" format="reference"/>
+    </declare-styleable>
+
+    <declare-styleable name="Theme">
+        <!-- Tab bar height that only applies to portrait layout where tabs are under action bar.-->
+        <attr name="tabBarSize" format="dimension"/>
+
+        <!-- Toolbar title mode -->
+        <attr name="toolbarTitleMode" format="enum">
+            <enum name="app_name" value="0"/>
+            <enum name="none" value="1"/>
+            <enum name="device_name" value="2"/>
+        </attr>
+    </declare-styleable>
+
+    <declare-styleable name="LoadingFrameLayout">
+        <attr name="progressViewLayout" format="reference"/>
+        <attr name="emptyViewLayout" format="reference"/>
+        <attr name="errorViewLayout" format="reference"/>
     </declare-styleable>
 </resources>
diff --git a/res/values/bools.xml b/res/values/bools.xml
deleted file mode 100644
index 6cc068d..0000000
--- a/res/values/bools.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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.
--->
-
-<resources>
-    <bool name="screen_size_short">true</bool>
-    <bool name="screen_size_tall">false</bool>
-</resources>
\ No newline at end of file
diff --git a/res/values/configs.xml b/res/values/configs.xml
index 47bcd2c..03bb96e 100644
--- a/res/values/configs.xml
+++ b/res/values/configs.xml
@@ -25,4 +25,27 @@
     <item name="config_background_image_error_alpha" format="float" type="dimen">1.0</item>
 
     <bool name="config_show_detailed_user_profile_on_dialpad">false</bool>
+
+    <!-- A config determines whether to show divider and callog_action_button for callog items
+    that are not stored as contacts. "true" will show divider and button as disable state and
+    "false" will make divider and button invisible for non contacts. -->
+    <bool name="config_show_calllog_action_button_for_non_contact">false</bool>
+
+    <!-- A config determines whether to show divider and the button on the right side for contacts
+    without any contact details. "true" will show divider and button as disable state and "false"
+    will make divider and button invisible for empty contacts. -->
+    <bool name="config_show_contact_detail_button_for_empty_contact">false</bool>
+
+    <!-- A config determines whether to show postal address in contact details page. -->
+    <bool name="config_show_postal_address">true</bool>
+    <!-- A config determines whether to show the action bar view in the contact details page.-->
+    <bool name="config_show_contact_details_action_bar_view">false</bool>
+    <!-- A config determines if to show the action bar avatar in the contact details page.-->
+    <bool name="config_show_contact_details_action_bar_avatar">true</bool>
+
+    <!-- No toolbar title. Supported value see @attr/toolbarTitleMode -->
+    <integer name="config_toolbar_title_mode">1</integer>
+
+    <!-- Config gate the full screen incall ui -->
+    <bool name="config_show_fullscreen_incall_ui">true</bool>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 44f0e95..010fca4 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -14,7 +14,6 @@
      limitations under the License.
 -->
 <resources>
-    <dimen name="action_bar_height">96dp</dimen>
     <!-- Dialer -->
     <dimen name="dialer_card_elevation">2dp</dimen>
 
@@ -36,13 +35,13 @@
     <!-- Contact details dimensions -->
     <dimen name="contact_details_avatar_margin_top">@*android:dimen/car_padding_4</dimen>
     <dimen name="contact_details_title_margin_top">@*android:dimen/car_padding_4</dimen>
-    <dimen name="contact_details_title_margin_bottom">48dp</dimen>
-    <dimen name="contact_details_avatar_size">@dimen/primary_icon_size</dimen>
+    <dimen name="contact_details_title_margin_bottom">@*android:dimen/car_padding_5</dimen>
+    <dimen name="contact_details_avatar_size">126dp</dimen>
     <dimen name="contact_details_item_height">@dimen/list_item_height</dimen>
     <dimen name="contact_details_number_padding_start">@*android:dimen/car_keyline_1</dimen>
     <dimen name="contact_details_number_padding_end">@*android:dimen/car_padding_2</dimen>
     <dimen name="contact_details_text_button_guideline">@*android:dimen/car_keyline_3</dimen>
-    <dimen name="contact_details_action_bar_name_margin">@*android:dimen/car_padding_2</dimen>
+    <dimen name="contact_details_action_bar_avatar_size">@dimen/primary_icon_size</dimen>
 
     <!-- Contact list dimensions -->
     <dimen name="contact_list_item_height">@dimen/list_item_height</dimen>
@@ -99,8 +98,6 @@
     <dimen name="favorite_card_space_horizontal">@*android:dimen/car_padding_3</dimen>
     <dimen name="favorite_card_space_vertical">@*android:dimen/car_padding_2</dimen>
     <dimen name="favorites_avatar_margin_bottom">@*android:dimen/car_padding_3</dimen>
-    <dimen name="favorite_add_button_and_text_separation">@*android:dimen/car_padding_5</dimen>
-    <dimen name="favorite_add_button_padding">@*android:dimen/car_padding_4</dimen>
 
     <!-- Add faovirte flow dimensions -->
     <dimen name="add_favorite_number_list_height">@dimen/list_item_height</dimen>
@@ -144,15 +141,15 @@
     <dimen name="large_avatar_icon_size">96dp</dimen>
     <dimen name="primary_icon_enclosing_circle_size">64dp</dimen>
     <dimen name="inline_icon_size">24dp</dimen>
-    <dimen name="preference_list_margin">@*android:dimen/car_margin</dimen>
     <dimen name="contact_avatar_corner_radius_percent" format="float">0.5</dimen>
     <dimen name="touch_target_width">156dp</dimen>
     <dimen name="subheader_list_height">76dp</dimen>
     <dimen name="control_bar_height">96dp</dimen>
     <dimen name="phone_number_radio_list_padding">@*android:dimen/car_padding_2</dimen>
 
-    <!-- Toolbar -->
-    <!-- Half of the difference between car_margin and touch_target_size-->
-    <dimen name="menu_item_margin_x">18dp</dimen>
+    <!-- Loading status view dimensions -->
+    <dimen name="loading_info_icon_size">56dp</dimen>
+    <dimen name="loading_info_icon_margin_bottom">@*android:dimen/car_padding_3</dimen>
+    <dimen name="loading_info_button_margin_top">@*android:dimen/car_padding_2</dimen>
 
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 23ecf12..0418d13 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -17,13 +17,16 @@
     <!-- Name of the phone dialer application [CHAR LIMIT=30]-->
     <string name="phone_app_name">Phone</string>
     <!-- Full-screen error text for when the phone can not be used because Bluetooth isn't connected [CHAR LIMIT=NONE]-->
-    <string name="no_hfp">To complete your call, first connect your phone to your car via Bluetooth.</string>
+    <string name="no_hfp">
+        To complete your call, first connect your phone to your car via Bluetooth.
+    </string>
     <!-- Error text shown on the dialer facet when bluetooth is not supported -->
     <string name="bluetooth_unavailable">Bluetooth is not available.</string>
     <!-- Error text shown on the dialer facet for when bluetooth is disabled -->
     <string name="bluetooth_disabled">To make or receive calls, turn Bluetooth on.</string>
     <!-- Error text shown on the dialer facet for when bluetooth is not paired -->
-    <string name="bluetooth_unpaired">To make or receive calls, pair your phone with the car.</string>
+    <string name="bluetooth_unpaired">To make or receive calls, pair your phone with the car.
+    </string>
     <!-- Button text for connecting to Bluetooth [CHAR LIMIT=40] -->
     <string name="connect_bluetooth_button_text">Connect to Bluetooth</string>
     <!-- Button text for making emergency call [CHAR LIMIT=40] -->
@@ -33,7 +36,8 @@
     <!-- Message informing user that the contact has already been deleted [CHAR LIMIT=120] -->
     <string name="error_contact_deleted">This contact might have been deleted.</string>
     <!-- Toast text when user has inputted an invalid phone number [CHAR LIMIT=NONE] -->
-    <string name="error_invalid_phone_number">Can\'t dial this number. Check it and try again.</string>
+    <string name="error_invalid_phone_number">Can\'t dial this number. Check it and try again.
+    </string>
     <!-- Toast text when telephony service is not ready [CHAR LIMIT=NONE] -->
     <string name="error_telephony_not_available">
         Phone call is not available. Please try again later.
@@ -47,12 +51,12 @@
     <string name="call_back">Call back</string>
 
     <!-- Audio route -->
-    <!-- Label for routing phone audio to the vehicle [CHAR LIMIT=30] -->
-    <string name="audio_route_vehicle">Vehicle bluetooth</string>
+    <!-- Label for routing phone audio to the vehicle using car speakers [CHAR LIMIT=30] -->
+    <string name="audio_route_vehicle">Car speakers</string>
     <!-- Label for routing phone audio to the phone speaker [CHAR LIMIT=30] -->
-    <string name="audio_route_phone_speaker">Speaker phone</string>
+    <string name="audio_route_phone_speaker">Phone speaker</string>
     <!-- Label for routing phone audio to the phone earpiece. [CHAR LIMIT=30] -->
-    <string name="audio_route_handset">Handset</string>
+    <string name="audio_route_handset">Phone</string>
 
     <!-- Button label to dial a manually entered phone number -->
     <string name="dial_a_number">Dial a number</string>
@@ -61,28 +65,35 @@
     <!-- Title for the favorites [CHAR LIMIT=30] -->
     <string name="favorites_title">Favorites</string>
     <!-- Title for the call history [CHAR LIMIT=30] -->
-    <string name="call_history_title">Call History</string>
+    <string name="call_history_title">Recents</string>
     <!-- Title for the contacts [CHAR LIMIT=30] -->
     <string name="contacts_title">Contacts</string>
     <!-- Title for the dialpad [CHAR LIMIT=30] -->
     <string name="dialpad_title">Dialpad</string>
-    <!-- Toolbar title for tabbed pages -->
-    <string name="default_toolbar_title" translatable="false"></string>
 
     <!-- Headers for call history -->
     <!-- Header in call log to group calls from the current day. [CHAR LIMIT=30] -->
     <string name="call_log_header_today">Today</string>
-
     <!-- Header in call log to group calls from the previous day. [CHAR LIMIT=30] -->
     <string name="call_log_header_yesterday">Yesterday</string>
-
     <!-- Header in call log to group calls from before yesterday. [CHAR LIMIT=30] -->
     <string name="call_log_header_older">Older</string>
 
+    <!-- Message shown when on the call history page without any call logs available [CHAR_LIMIT=50] -->
+    <string name="call_logs_empty">No recents</string>
+
+    <!-- Message shown when on the contact list page without any contacts available [CHAR_LIMIT=50] -->
+    <string name="contact_list_empty">No contacts</string>
+
+    <!-- Secondary message shown when the contact list page or call history page do not have any contents but will be available after syncing from phone [CHAR_LIMIT=200] -->
+    <string name="available_after_sync">Available after syncing. Make sure you have allowed sharing contacts on your phone.</string>
+
+    <!-- Error message shown when on the favorites page without any favorites added [CHAR_LIMIT=50] -->
+    <string name="favorites_empty">No favorites</string>
+    <!-- Secondary error message shown when on the favorites page without any favorites added [CHAR_LIMIT=80] -->
+    <string name="no_favorites_added">You haven\'t added any favorites yet</string>
     <!-- Button to add start choosing a contact to add as a new favorite [CHAR_LIMIT=50] -->
     <string name="add_favorite_button">Add a favorite</string>
-    <!-- Error message shown when on the favorites page without any favorites added [CHAR_LIMIT=80] -->
-    <string name="favorites_empty">You haven\'t added any favorites yet</string>
     <!-- Button to cancel the dialog where you pick a phone number to add as a favorite -->
     <string name="cancel_add_favorites_dialog" translatable="false">@android:string/cancel</string>
     <!-- Button to confirm the dialog where you pick a phone number to add as a favorite -->
@@ -147,7 +158,11 @@
     <!-- Name of missed call notification channel in app info [CHAR LIMIT=50] -->
     <string name="missed_call_notification_channel_name">Missed call notification</string>
     <!-- Title for missed call notification [CHAR LIMIT=40]-->
-    <string name="notification_missed_call">Missed call</string>
+    <plurals name="notification_missed_call">
+        <item quantity="one">Missed call</item>
+        <item quantity="other">Missed calls(<xliff:g id="number" example="2">%1$d</xliff:g>)
+        </item>
+    </plurals>
 
     <!-- Onhold User Profile Info -->
     <!-- Text to show the call is onhold [CHAR LIMIT=40]-->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 9a3a945..af01627 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -16,22 +16,32 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Dialpad -->
     <!-- The size won't matter here, as the autosizing will override it -->
-    <style name="TextAppearance.DialNumber" parent="@style/TextAppearance.Display3"/>
-    <style name="TextAppearance.EmergencyDialNumber" parent="@style/TextAppearance.DialNumber">
+    <style name="TextAppearance.DialNumber" parent="TextAppearance.Display3"/>
+    <style name="TextAppearance.EmergencyDialNumber" parent="TextAppearance.DialNumber">
         <item name="android:textColor">@color/emergency_text_color</item>
     </style>
-    <style name="TextAppearance.DialpadDisplayName" parent="@style/TextAppearance.Body1"/>
+    <style name="TextAppearance.DialpadDisplayName" parent="TextAppearance.Body1"/>
 
     <style name="KeypadNumber">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
         <item name="android:textAppearance">?android:attr/textAppearanceLarge</item>
         <item name="android:textSize">@dimen/car_key1_size</item>
     </style>
 
     <style name="KeypadLetter">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
         <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
         <item name="android:textSize">@dimen/car_key2_size</item>
     </style>
 
+    <style name="KeypadImage">
+        <item name="android:layout_width">32dp</item>
+        <item name="android:layout_height">32dp</item>
+        <item name="android:tint">@color/car_key2</item>
+    </style>
+
     <!-- Phone -->
     <style name="KeypadButtonStyle">
         <item name="android:clickable">true</item>
@@ -62,81 +72,47 @@
         <item name="android:tint">@color/primary_icon_color</item>
     </style>
 
-    <!--TODO: fix it system wide instead of creating override-->
-    <style name="Widget.Dialer.Toolbar" parent="*android:Widget.DeviceDefault.Toolbar">
-        <!-- No padding for navigation button which is car_margin wide -->
-        <item name="android:paddingStart">0dp</item>
-        <!-- Menu item has padding/margin to define the end distance from toolbar edge -->
-        <item name="android:paddingEnd">0dp</item>
-        <item name="android:contentInsetStart">0dp</item>
-        <item name="android:contentInsetEnd">@*android:dimen/car_margin</item>
-        <!-- Override the max height of navigation button and menu button -->
-        <item name="android:maxButtonHeight">?android:attr/actionBarSize</item>
-        <item name="android:navigationIcon">@drawable/ic_arrow_back</item>
-        <item name="android:titleTextAppearance">@style/TextAppearance.Dialer.Widget.Toolbar.Title
-        </item>
-        <!-- Navigation button style -->
-        <item name="*android:navigationButtonStyle">@style/Widget.Dialer.Navigation</item>
-    </style>
-
-    <style name="TextAppearance.Dialer.Widget.Toolbar.Title"
-           parent="*android:TextAppearance.DeviceDefault.Widget.Toolbar.Title">
-        <item name="android:textSize">@*android:dimen/car_body1_size</item>
-    </style>
-
-    <style name="Widget.Dialer.Navigation"
-           parent="android:Widget.Material.Toolbar.Button.Navigation">
-        <item name="android:minWidth">@*android:dimen/car_margin</item>
-        <item name="android:background">?android:attr/actionBarItemBackground</item>
-    </style>
-
-    <style name="Widget.Dialer.ActionButton" parent="android:Widget.DeviceDefault.ActionButton">
-        <item name="android:minWidth">@dimen/touch_target_size</item>
-        <item name="android:minHeight">@dimen/touch_target_size</item>
-    </style>
-
-    <style name="Widget.Dialer.ActionButton.Overflow"
-           parent="android:Widget.DeviceDefault.ActionButton.Overflow">
-        <item name="android:src">@drawable/ic_overflow</item>
-        <item name="android:minWidth">@dimen/touch_target_size</item>
-        <item name="android:minHeight">@dimen/touch_target_size</item>
-        <item name="android:paddingStart">0dp</item>
-        <item name="android:paddingEnd">@dimen/menu_item_margin_x</item>
-        <item name="android:background">@android:color/transparent</item>
-    </style>
-
     <!-- In-call styling for everything except short landscape screens -->
-    <style name="TextAppearance.InCallUserTitle" parent="@style/TextAppearance.Display2"/>
-    <style name="TextAppearance.InCallUserPhoneNumber" parent="@style/TextAppearance.Body1">
+    <style name="TextAppearance.InCallUserTitle" parent="TextAppearance.Display2"/>
+    <style name="TextAppearance.InCallUserPhoneNumber" parent="TextAppearance.Body1">
         <item name="android:textColor">#B8FFFFFF</item>
     </style>
-    <style name="TextAppearance.InCallState" parent="@style/TextAppearance.Body1">
+    <style name="TextAppearance.InCallState" parent="TextAppearance.Body1">
         <item name="android:textColor">#B8FFFFFF</item>
     </style>
 
     <!-- Call history -->
-    <style name="TextAppearance.CallLogTitleDefault" parent="@style/TextAppearance.Body1"/>
+    <style name="TextAppearance.CallLogTitleDefault" parent="TextAppearance.Body1"/>
     <!-- Customized text color for missed calls can be added here -->
-    <style name="TextAppearance.CallLogTitleMissedCall" parent="@style/TextAppearance.Body1"/>
-
-    <!-- Contact details -->
-    <style name="TextAppearance.ContactDetailsTitle" parent="@style/TextAppearance.Display2"/>
-    <style name="TextAppearance.ContactDetailsListTitle" parent="@style/TextAppearance.Body1"/>
-    <style name="TextAppearance.ContactDetailsListSubtitle" parent="@style/TextAppearance.Body3">
+    <style name="TextAppearance.CallLogTitleMissedCall" parent="TextAppearance.Body1"/>
+    <style name="TextAppearance.CallLogSubtitle" parent="TextAppearance.Body3">
         <item name="android:textColor">@color/secondary_text_color</item>
     </style>
-    <style name="TextAppearance.DefaultNumberLabel" parent="@style/TextAppearance.Body3">
+    <style name="TextAppearance.CallLogCallCountDefault" parent="TextAppearance.CallLogSubtitle"/>
+    <!-- Customized text color for missed calls can be added here -->
+    <style name="TextAppearance.CallLogCallCountMissedCall" parent="TextAppearance.CallLogSubtitle"/>
+    <style name="TextAppearance.CallLogTimestampDefault" parent="TextAppearance.CallLogSubtitle"/>
+    <!-- Customized text color for missed calls can be added here -->
+    <style name="TextAppearance.CallLogTimestampMissedCall" parent="TextAppearance.CallLogSubtitle"/>
+
+    <!-- Contact details -->
+    <style name="TextAppearance.ContactDetailsTitle" parent="TextAppearance.Display2"/>
+    <style name="TextAppearance.ContactDetailsListTitle" parent="TextAppearance.Body1"/>
+    <style name="TextAppearance.ContactDetailsListSubtitle" parent="TextAppearance.Body3">
+        <item name="android:textColor">@color/secondary_text_color</item>
+    </style>
+    <style name="TextAppearance.DefaultNumberLabel" parent="TextAppearance.Body3">
         <item name="android:textColor">@*android:color/accent_device_default_light</item>
     </style>
 
     <!-- Contact results -->
-    <style name="TextAppearance.ContactResultTitle" parent="@style/TextAppearance.Body1"/>
+    <style name="TextAppearance.ContactResultTitle" parent="TextAppearance.Body1"/>
 
     <!-- Add to favorite flow dialog -->
-    <style name="TextAppearance.AddFavoriteNumberTitle" parent="@style/TextAppearance.Body1">
+    <style name="TextAppearance.AddFavoriteNumberTitle" parent="TextAppearance.Body1">
         <item name="android:textColor">@color/primary_text_selector</item>
     </style>
-    <style name="TextAppearance.AddFavoriteNumberSubtitle" parent="@style/TextAppearance.Body3">
+    <style name="TextAppearance.AddFavoriteNumberSubtitle" parent="TextAppearance.Body3">
         <item name="android:textColor">@color/primary_text_selector</item>
     </style>
 
@@ -147,24 +123,23 @@
         <item name="android:textStyle">normal</item>
     </style>
 
-    <!-- Display options defined for ActionBar-->
-    <style name="RootToolbarDisplayOptions">
-        <item name="android:displayOptions">useLogo|showHome|showTitle|showCustom</item>
-    </style>
-
-    <style name="HomeAsUpDisplayOptions">
-        <item name="android:displayOptions">showTitle|homeAsUp|showCustom</item>
-    </style>
-
     <style name="Widget.Dialer.Button" parent="android:Widget.DeviceDefault.Button">
         <item name="android:ellipsize">none</item>
         <item name="android:requiresFadingEdge">horizontal</item>
         <item name="android:fadingEdgeLength">@*android:dimen/car_textview_fading_edge_length</item>
     </style>
 
-    <style name="Widget.Dialer.SearchView" parent="android:Widget.Material.SearchView">
-        <item name="android:closeIcon">@drawable/ic_close</item>
-        <item name="android:layout">@layout/search_view_layout_override</item>
+    <style name="LoadingInfoMessageStyle" parent="FullScreenErrorMessageStyle">
+        <item name="android:textAppearance">@style/TextAppearance.Display3</item>
+        <item name="android:textFontWeight">500</item>
+        <item name="android:textStyle">normal</item>
     </style>
-
+    <style name="LoadingInfoSecondaryMessageStyle" parent="FullScreenErrorMessageStyle">
+        <item name="android:textAppearance">@style/TextAppearance.Body2</item>
+    </style>
+    <style name="LoadingInfoActionButtonStyle" parent="FullScreenErrorButtonStyle">
+        <item name="android:textAppearance">@style/TextAppearance.Body3</item>
+        <item name="android:textFontWeight">500</item>
+        <item name="android:textStyle">normal</item>
+    </style>
 </resources>
diff --git a/res/values/styles_preference.xml b/res/values/styles_preference.xml
deleted file mode 100644
index d9d0eba..0000000
--- a/res/values/styles_preference.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-
-<resources>
-    <style name="PreferenceFragmentList.Settings">
-        <item name="android:paddingTop">0dp</item>
-        <item name="android:paddingBottom">0dp</item>
-        <item name="android:paddingStart">0dp</item>
-        <item name="android:paddingEnd">0dp</item>
-        <item name="android:paddingLeft">0dp</item>
-        <item name="android:paddingRight">0dp</item>
-    </style>
-
-</resources>
-
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 4a6e633..bae1bc3 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -14,26 +14,18 @@
 limitations under the License.
 -->
 <resources>
-    <!-- The theme for the Dialer app. -->
-    <style name="Theme.Dialer" parent="android:Theme.DeviceDefault.NoActionBar">
-        <item name="android:actionBarSize">@dimen/action_bar_height</item>
-        <item name="android:actionBarItemBackground">@drawable/action_button_background</item>
-        <!-- Menu button style -->
-        <item name="android:actionButtonStyle">@style/Widget.Dialer.ActionButton</item>
-        <item name="android:actionOverflowButtonStyle">@style/Widget.Dialer.ActionButton.Overflow
-        </item>
+    <!-- The base theme for the Dialer app. -->
+    <style name="Theme.Dialer" parent="Theme.CarUi">
         <item name="android:listDivider">@drawable/list_divider</item>
-        <item name="android:toolbarStyle">@style/Widget.Dialer.Toolbar</item>
         <item name="android:buttonStyle">@style/Widget.Dialer.Button</item>
-        <item name="android:searchViewStyle">@style/Widget.Dialer.SearchView</item>
     </style>
 
-    <style name="Theme.Dialer.Setting" parent="Theme.Dialer">
-        <item name="preferenceTheme">@style/PreferenceTheme</item>
+    <style name="Theme.Dialer.Telecom">
+        <item name="toolbarTitleMode">@integer/config_toolbar_title_mode</item>
     </style>
 
-    <style name="PreferenceTheme">
-        <item name="preferenceFragmentListStyle">@style/PreferenceFragmentList.Settings</item>
-    </style>
+    <style name="Theme.Dialer.InCall"/>
+
+    <style name="Theme.Dialer.Setting"/>
 
 </resources>
diff --git a/res/xml/menuitems.xml b/res/xml/menuitems.xml
new file mode 100644
index 0000000..1f5c40f
--- /dev/null
+++ b/res/xml/menuitems.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2019 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.
+  -->
+<MenuItems xmlns:app="http://schemas.android.com/apk/res-auto">
+    <MenuItem
+        app:search="true"
+        app:id="@+id/menu_item_search"
+        app:onClick="onMenuItemClicked"/>
+    <MenuItem
+        app:settings="true"
+        app:id="@+id/menu_item_setting"
+        app:onClick="onMenuItemClicked"/>
+</MenuItems>
diff --git a/src/com/android/car/dialer/Constants.java b/src/com/android/car/dialer/Constants.java
index a3cc08f..fc86af8 100644
--- a/src/com/android/car/dialer/Constants.java
+++ b/src/com/android/car/dialer/Constants.java
@@ -40,4 +40,7 @@
     public static class JobIds {
         public static final int NOTIFICATION_SERVICE = 2019;
     }
+
+    /**See {@link android.content.res.Resources#getIdentifier(String, String, String)}*/
+    public static int INVALID_RES_ID = 0;
 }
diff --git a/src/com/android/car/dialer/livedata/HfpDeviceListLiveData.java b/src/com/android/car/dialer/livedata/HfpDeviceListLiveData.java
new file mode 100644
index 0000000..54794d5
--- /dev/null
+++ b/src/com/android/car/dialer/livedata/HfpDeviceListLiveData.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2019 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.
+ */
+
+package com.android.car.dialer.livedata;
+
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothHeadsetClient;
+import android.bluetooth.BluetoothProfile;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+
+import java.util.List;
+
+/** {@link LiveData} that monitors the hfp connected devices. */
+public class HfpDeviceListLiveData extends MutableLiveData<List<BluetoothDevice>> {
+    private final Context mContext;
+    private final BluetoothAdapter mBluetoothAdapter;
+    private final IntentFilter mIntentFilter;
+
+    private BluetoothHeadsetClient mBluetoothHeadsetClient;
+
+    private BroadcastReceiver mBluetoothStateReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            update();
+        }
+    };
+
+    /** Creates a new {@link HfpDeviceListLiveData}. Call on main thread. */
+    public HfpDeviceListLiveData(Context context) {
+        mContext = context;
+
+        mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+        if (mBluetoothAdapter != null) {
+            mBluetoothAdapter.getProfileProxy(mContext, new BluetoothProfile.ServiceListener() {
+                @Override
+                public void onServiceConnected(int profile, BluetoothProfile proxy) {
+                    if (profile == BluetoothProfile.HEADSET_CLIENT) {
+                        mBluetoothHeadsetClient = (BluetoothHeadsetClient) proxy;
+                        update();
+                    }
+                }
+
+                @Override
+                public void onServiceDisconnected(int profile) {
+                }
+            }, BluetoothProfile.HEADSET_CLIENT);
+        }
+
+        mIntentFilter = new IntentFilter();
+        mIntentFilter.addAction(BluetoothHeadsetClient.ACTION_CONNECTION_STATE_CHANGED);
+    }
+
+    @Override
+    protected void onActive() {
+        if (mBluetoothAdapter != null) {
+            update();
+            mContext.registerReceiver(mBluetoothStateReceiver, mIntentFilter);
+        }
+    }
+
+    @Override
+    protected void onInactive() {
+        if (mBluetoothAdapter != null) {
+            mContext.unregisterReceiver(mBluetoothStateReceiver);
+        }
+    }
+
+    private void update() {
+        if (mBluetoothHeadsetClient != null) {
+            setValue(mBluetoothHeadsetClient.getConnectedDevices());
+        }
+    }
+}
diff --git a/src/com/android/car/dialer/notification/InCallNotificationController.java b/src/com/android/car/dialer/notification/InCallNotificationController.java
index e8a0cf1..e68b35b 100644
--- a/src/com/android/car/dialer/notification/InCallNotificationController.java
+++ b/src/com/android/car/dialer/notification/InCallNotificationController.java
@@ -29,13 +29,12 @@
 
 import androidx.annotation.StringRes;
 
-import com.android.car.dialer.Constants;
 import com.android.car.dialer.R;
 import com.android.car.dialer.log.L;
-import com.android.car.dialer.ui.activecall.InCallActivity;
 import com.android.car.telephony.common.CallDetail;
 
-import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 
 /** Controller that manages the heads up notification for incoming calls. */
@@ -81,6 +80,7 @@
     private final Context mContext;
     private final NotificationManager mNotificationManager;
     private final Notification.Builder mNotificationBuilder;
+    private final Set<String> mActiveInCallNotifications;
     private CompletableFuture<Void> mNotificationFuture;
 
     @TargetApi(26)
@@ -94,19 +94,14 @@
                 NotificationManager.IMPORTANCE_HIGH);
         mNotificationManager.createNotificationChannel(notificationChannel);
 
-        Intent intent = new Intent(mContext, InCallActivity.class);
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        intent.putExtra(Constants.Intents.EXTRA_SHOW_INCOMING_CALL, true);
-        PendingIntent fullscreenIntent = PendingIntent.getActivity(mContext, 0, intent,
-                PendingIntent.FLAG_UPDATE_CURRENT);
-
         mNotificationBuilder = new Notification.Builder(mContext, CHANNEL_ID)
                 .setSmallIcon(R.drawable.ic_phone)
                 .setContentText(mContext.getString(R.string.notification_incoming_call))
-                .setFullScreenIntent(fullscreenIntent, /* highPriority= */true)
                 .setCategory(Notification.CATEGORY_CALL)
                 .setOngoing(true)
                 .setAutoCancel(false);
+
+        mActiveInCallNotifications = new HashSet<>();
     }
 
 
@@ -121,8 +116,10 @@
 
         CallDetail callDetail = CallDetail.fromTelecomCallDetail(call.getDetails());
         String number = callDetail.getNumber();
-        String tag = call.getDetails().getTelecomCallId();
+        String callId = call.getDetails().getTelecomCallId();
+        mActiveInCallNotifications.add(callId);
         mNotificationBuilder
+                .setFullScreenIntent(getFullscreenIntent(call), /* highPriority= */true)
                 .setLargeIcon((Icon) null)
                 .setContentTitle(number)
                 .setActions(
@@ -131,21 +128,20 @@
                         getAction(call, R.string.decline_call,
                                 NotificationService.ACTION_DECLINE_CALL));
         mNotificationManager.notify(
-                tag,
+                callId,
                 NOTIFICATION_ID,
                 mNotificationBuilder.build());
 
         mNotificationFuture = NotificationUtils.getDisplayNameAndRoundedAvatar(mContext, number)
                 .thenAcceptAsync((pair) -> {
                     // Check that the notification hasn't already been dismissed
-                    if (Arrays.stream(mNotificationManager.getActiveNotifications()).anyMatch((n) ->
-                            n.getId() == NOTIFICATION_ID && TextUtils.equals(n.getTag(), tag))) {
+                    if (mActiveInCallNotifications.contains(callId)) {
                         mNotificationBuilder
                                 .setLargeIcon(pair.second)
                                 .setContentTitle(pair.first);
 
                         mNotificationManager.notify(
-                                tag,
+                                callId,
                                 NOTIFICATION_ID,
                                 mNotificationBuilder.build());
                     }
@@ -156,10 +152,28 @@
     public void cancelInCallNotification(Call call) {
         L.d(TAG, "cancelInCallNotification");
         if (call.getDetails() != null) {
-            mNotificationManager.cancel(call.getDetails().getTelecomCallId(), NOTIFICATION_ID);
+            String callId = call.getDetails().getTelecomCallId();
+            cancelInCallNotification(callId);
         }
     }
 
+    /**
+     * Cancel the incoming call notification for the given call id. Any action that dismisses the
+     * notification needs to call this explicitly.
+     */
+    void cancelInCallNotification(String callId) {
+        if (TextUtils.isEmpty(callId)) {
+            return;
+        }
+        mActiveInCallNotifications.remove(callId);
+        mNotificationManager.cancel(callId, NOTIFICATION_ID);
+    }
+
+    private PendingIntent getFullscreenIntent(Call call) {
+        Intent intent = getIntent(NotificationService.ACTION_SHOW_FULLSCREEN_UI, call);
+        return PendingIntent.getBroadcast(mContext, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+    }
+
     private Notification.Action getAction(Call call, @StringRes int actionText,
             String intentAction) {
         CharSequence text = mContext.getString(actionText);
diff --git a/src/com/android/car/dialer/notification/MissedCallNotificationController.java b/src/com/android/car/dialer/notification/MissedCallNotificationController.java
index bcd577d..5b0fd86 100644
--- a/src/com/android/car/dialer/notification/MissedCallNotificationController.java
+++ b/src/com/android/car/dialer/notification/MissedCallNotificationController.java
@@ -40,7 +40,9 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
 /** Controller that manages the missed call notifications. */
@@ -93,7 +95,7 @@
     private final UnreadMissedCallLiveData mUnreadMissedCallLiveData;
     private final Observer<List<PhoneCallLog>> mUnreadMissedCallObserver;
     private final List<PhoneCallLog> mCurrentPhoneCallLogList;
-    private CompletableFuture<Void> mUpdateNotificationFuture;
+    private final Map<String, CompletableFuture<Void>> mUpdateFutures;
 
     @TargetApi(26)
     private MissedCallNotificationController(Context context) {
@@ -109,6 +111,8 @@
         mUnreadMissedCallLiveData = UnreadMissedCallLiveData.newInstance(context);
         mUnreadMissedCallObserver = this::updateNotifications;
         mUnreadMissedCallLiveData.observeForever(mUnreadMissedCallObserver);
+
+        mUpdateFutures = new HashMap<>();
     }
 
     /**
@@ -134,18 +138,21 @@
 
     private void showMissedCallNotification(PhoneCallLog callLog) {
         L.d(TAG, "show missed call notification %s", callLog);
-        if (mUpdateNotificationFuture != null) {
-            mUpdateNotificationFuture.cancel(true);
-        }
         String phoneNumber = callLog.getPhoneNumberString();
-        mUpdateNotificationFuture = NotificationUtils.getDisplayNameAndRoundedAvatar(
+        String tag = getTag(callLog);
+        CompletableFuture<Void> updateFuture = mUpdateFutures.get(tag);
+        if (updateFuture != null) {
+            updateFuture.cancel(true);
+        }
+        updateFuture = NotificationUtils.getDisplayNameAndRoundedAvatar(
                 mContext, phoneNumber)
                 .thenAcceptAsync((pair) -> {
+                    int callLogSize = callLog.getAllCallRecords().size();
                     Notification.Builder builder = new Notification.Builder(mContext, CHANNEL_ID)
                             .setSmallIcon(R.drawable.ic_phone)
                             .setLargeIcon(pair.second)
-                            .setContentTitle(mContext.getString(R.string.notification_missed_call)
-                                    + String.format(" (%d)", callLog.getAllCallRecords().size()))
+                            .setContentTitle(mContext.getResources().getQuantityString(
+                                    R.plurals.notification_missed_call, callLogSize, callLogSize))
                             .setContentText(pair.first)
                             .setContentIntent(getContentPendingIntent())
                             .setDeleteIntent(getDeleteIntent())
@@ -161,15 +168,18 @@
                     }
 
                     mNotificationManager.notify(
-                            getTag(callLog),
+                            tag,
                             NOTIFICATION_ID,
                             builder.build());
                 }, mContext.getMainExecutor());
+        mUpdateFutures.put(tag, updateFuture);
     }
 
     private void cancelMissedCallNotification(PhoneCallLog phoneCallLog) {
         L.d(TAG, "cancel missed call notification %s", phoneCallLog);
-        mNotificationManager.cancel(getTag(phoneCallLog), NOTIFICATION_ID);
+        String tag = getTag(phoneCallLog);
+        mNotificationManager.cancel(tag, NOTIFICATION_ID);
+        mUpdateFutures.remove(tag);
     }
 
     private PendingIntent getContentPendingIntent() {
diff --git a/src/com/android/car/dialer/notification/NotificationService.java b/src/com/android/car/dialer/notification/NotificationService.java
index 2f28290..f7b8a01 100644
--- a/src/com/android/car/dialer/notification/NotificationService.java
+++ b/src/com/android/car/dialer/notification/NotificationService.java
@@ -25,6 +25,7 @@
 
 import com.android.car.dialer.Constants;
 import com.android.car.dialer.telecom.UiCallManager;
+import com.android.car.dialer.ui.activecall.InCallActivity;
 import com.android.car.telephony.common.TelecomUtils;
 
 import java.util.List;
@@ -37,6 +38,7 @@
 public class NotificationService extends JobIntentService {
     static final String ACTION_ANSWER_CALL = "CD.ACTION_ANSWER_CALL";
     static final String ACTION_DECLINE_CALL = "CD.ACTION_DECLINE_CALL";
+    static final String ACTION_SHOW_FULLSCREEN_UI = "CD.ACTION_SHOW_FULLSCREEN_UI";
     static final String ACTION_CALL_BACK_MISSED = "CD.ACTION_CALL_BACK_MISSED";
     static final String ACTION_MESSAGE_MISSED = "CD.ACTION_MESSAGE_MISSED";
     static final String ACTION_READ_ALL_MISSED = "CD.ACTION_READ_ALL_MISSED";
@@ -62,9 +64,19 @@
         switch (action) {
             case ACTION_ANSWER_CALL:
                 answerCall(callId);
+                InCallNotificationController.get().cancelInCallNotification(callId);
                 break;
             case ACTION_DECLINE_CALL:
                 declineCall(callId);
+                InCallNotificationController.get().cancelInCallNotification(callId);
+                break;
+            case ACTION_SHOW_FULLSCREEN_UI:
+                Intent inCallActivityIntent = new Intent(getApplicationContext(),
+                        InCallActivity.class);
+                inCallActivityIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                inCallActivityIntent.putExtra(Constants.Intents.EXTRA_SHOW_INCOMING_CALL, true);
+                startActivity(inCallActivityIntent);
+                InCallNotificationController.get().cancelInCallNotification(callId);
                 break;
             case ACTION_CALL_BACK_MISSED:
                 UiCallManager.get().placeCall(callId);
diff --git a/src/com/android/car/dialer/notification/NotificationUtils.java b/src/com/android/car/dialer/notification/NotificationUtils.java
index 1812c3f..6017933 100644
--- a/src/com/android/car/dialer/notification/NotificationUtils.java
+++ b/src/com/android/car/dialer/notification/NotificationUtils.java
@@ -17,8 +17,6 @@
 package com.android.car.dialer.notification;
 
 import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
 import android.graphics.drawable.Icon;
 import android.net.Uri;
 
@@ -27,7 +25,6 @@
 import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
 import androidx.core.util.Pair;
 
-import com.android.car.apps.common.LetterTileDrawable;
 import com.android.car.dialer.R;
 import com.android.car.telephony.common.TelecomUtils;
 
@@ -48,7 +45,10 @@
                             .getDimensionPixelSize(R.dimen.avatar_icon_size);
                     Icon largeIcon = loadContactAvatar(context, info.getAvatarUri(), size);
                     if (largeIcon == null) {
-                        largeIcon = createLetterTile(context, info.getDisplayName(), size);
+                        float cornerRadiusPercent = context.getResources()
+                                .getFloat(R.dimen.contact_avatar_corner_radius_percent);
+                        largeIcon = TelecomUtils.createLetterTile(context, info.getInitials(),
+                                /* identifier */ info.getDisplayName(), size, cornerRadiusPercent);
                     }
 
                     return new Pair<>(info.getDisplayName(), largeIcon);
@@ -67,32 +67,14 @@
             }
             RoundedBitmapDrawable roundedBitmapDrawable = RoundedBitmapDrawableFactory.create(
                     context.getResources(), input);
-            return createFromRoundedBitmapDrawable(context, roundedBitmapDrawable, avatarSize);
+            float cornerRadiusPercent = context.getResources()
+                    .getFloat(R.dimen.contact_avatar_corner_radius_percent);
+            return TelecomUtils
+                .createFromRoundedBitmapDrawable(roundedBitmapDrawable, avatarSize,
+                    cornerRadiusPercent);
         } catch (FileNotFoundException e) {
             // No-op
         }
         return null;
     }
-
-    private static Icon createLetterTile(Context context, String displayName, int avatarSize) {
-        LetterTileDrawable letterTileDrawable = TelecomUtils.createLetterTile(context, displayName);
-        RoundedBitmapDrawable roundedBitmapDrawable = RoundedBitmapDrawableFactory.create(
-                context.getResources(), letterTileDrawable.toBitmap(avatarSize));
-        return createFromRoundedBitmapDrawable(context, roundedBitmapDrawable, avatarSize);
-    }
-
-    private static Icon createFromRoundedBitmapDrawable(Context context,
-            RoundedBitmapDrawable roundedBitmapDrawable, int avatarSize) {
-        float radiusPercent = context.getResources()
-                .getFloat(R.dimen.contact_avatar_corner_radius_percent);
-        float radius = avatarSize * radiusPercent;
-        roundedBitmapDrawable.setCornerRadius(radius);
-
-        final Bitmap result = Bitmap.createBitmap(avatarSize, avatarSize,
-                Bitmap.Config.ARGB_8888);
-        final Canvas canvas = new Canvas(result);
-        roundedBitmapDrawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
-        roundedBitmapDrawable.draw(canvas);
-        return Icon.createWithBitmap(result);
-    }
 }
diff --git a/src/com/android/car/dialer/storage/FavoriteNumberRepository.java b/src/com/android/car/dialer/storage/FavoriteNumberRepository.java
index 3762ede..4747f7d 100644
--- a/src/com/android/car/dialer/storage/FavoriteNumberRepository.java
+++ b/src/com/android/car/dialer/storage/FavoriteNumberRepository.java
@@ -58,7 +58,9 @@
 
     private static volatile FavoriteNumberRepository sFavoriteNumberRepository;
 
-    /** Returns the single instance of the {@link FavoriteNumberRepository}. */
+    /**
+     * Returns the single instance of the {@link FavoriteNumberRepository}.
+     */
     public static FavoriteNumberRepository getRepository(final Context context) {
         if (sFavoriteNumberRepository == null) {
             synchronized (FavoriteNumberRepository.class) {
@@ -86,17 +88,23 @@
         mFavoriteContacts = new FavoriteContactLiveData(mContext);
     }
 
-    /** Returns the favorite number list. */
+    /**
+     * Returns the favorite number list.
+     */
     public LiveData<List<FavoriteNumberEntity>> getFavoriteNumbers() {
         return mFavoriteNumbers;
     }
 
-    /** Returns the favorite contact list. */
+    /**
+     * Returns the favorite contact list.
+     */
     public LiveData<List<Contact>> getFavoriteContacts() {
         return mFavoriteContacts;
     }
 
-    /** Add a phone number to favorite. */
+    /**
+     * Add a phone number to favorite.
+     */
     public void addToFavorite(Contact contact, PhoneNumber phoneNumber) {
         FavoriteNumberEntity favoriteNumber = new FavoriteNumberEntity();
         favoriteNumber.setContactId(contact.getId());
@@ -108,7 +116,9 @@
         sSerializedExecutor.execute(() -> mFavoriteNumberDao.insert(favoriteNumber));
     }
 
-    /** Remove a phone number from favorite. */
+    /**
+     * Remove a phone number from favorite.
+     */
     public void removeFromFavorite(Contact contact, PhoneNumber phoneNumber) {
         List<FavoriteNumberEntity> favoriteNumbers = mFavoriteNumbers.getValue();
         if (favoriteNumbers == null) {
@@ -121,7 +131,9 @@
         }
     }
 
-    /** Remove favorite entries for devices that has been unpaired. */
+    /**
+     * Remove favorite entries for devices that has been unpaired.
+     */
     public void cleanup(Set<BluetoothDevice> pairedDevices) {
         L.d(TAG, "remove entries for unpaired devices except %s", pairedDevices);
         sSerializedExecutor.execute(() -> {
@@ -143,8 +155,11 @@
         }
 
         mConvertAllRunnableFuture = sSerializedExecutor.submit(() -> {
+            // Don't set null value to trigger unnecessary update when results are null.
             if (mFavoriteNumbers.getValue() == null) {
-                results.postValue(Collections.emptyList());
+                if (results.getValue() != null) {
+                    results.postValue(Collections.emptyList());
+                }
                 return;
             }
 
@@ -194,7 +209,7 @@
                     Contact contact = Contact.fromCursor(mContext, cursor);
                     contact.getNumbers().clear();
                     Contact inMemoryContact = InMemoryPhoneBook.get().lookupContactByKey(
-                            contact.getLookupKey());
+                            contact.getLookupKey(), contact.getAccountName());
                     for (PhoneNumber inMemoryPhoneNumber : inMemoryContact.getNumbers()) {
                         if (numberMatches(favoriteNumber, inMemoryPhoneNumber)) {
                             contact.getNumbers().add(inMemoryPhoneNumber);
diff --git a/src/com/android/car/dialer/telecom/InCallRouter.java b/src/com/android/car/dialer/telecom/InCallRouter.java
index 9447cd4..5e0376d 100644
--- a/src/com/android/car/dialer/telecom/InCallRouter.java
+++ b/src/com/android/car/dialer/telecom/InCallRouter.java
@@ -18,11 +18,11 @@
 
 import android.content.Context;
 import android.content.Intent;
-import android.os.Handler;
 import android.telecom.Call;
 
 import androidx.annotation.MainThread;
 
+import com.android.car.dialer.R;
 import com.android.car.dialer.log.L;
 import com.android.car.dialer.notification.InCallNotificationController;
 import com.android.car.dialer.ui.activecall.InCallActivity;
@@ -41,15 +41,17 @@
     private static final String TAG = "CD.InCallRouter";
 
     private final Context mContext;
-    private final Handler mMainHandler;
     private final InCallNotificationController mInCallNotificationController;
     private final ArrayList<InCallServiceImpl.ActiveCallListChangedCallback>
             mActiveCallListChangedCallbacks = new ArrayList<>();
     private final ProjectionCallHandler mProjectionCallHandler;
 
+    private final boolean mShowFullscreenIncallUi;
+
     InCallRouter(Context context) {
         mContext = context;
-        mMainHandler = Handler.getMain();
+        mShowFullscreenIncallUi = context.getResources().getBoolean(
+                R.bool.config_show_fullscreen_incall_ui);
         mInCallNotificationController = InCallNotificationController.get();
         mProjectionCallHandler = new ProjectionCallHandler(context);
     }
@@ -108,7 +110,9 @@
         mActiveCallListChangedCallbacks.remove(callback);
     }
 
-    /** Dispatches the call to {@link InCallServiceImpl.ActiveCallListChangedCallback}. */
+    /**
+     * Dispatches the call to {@link InCallServiceImpl.ActiveCallListChangedCallback}.
+     */
     private boolean routeToActiveCallListChangedCallback(Call call) {
         boolean isHandled = false;
         for (InCallServiceImpl.ActiveCallListChangedCallback callback :
@@ -121,7 +125,9 @@
         return isHandled;
     }
 
-    /** Presents the ringing call in HUN. */
+    /**
+     * Presents the ringing call in HUN.
+     */
     private void routeToNotification(Call call) {
         mInCallNotificationController.showInCallNotification(call);
         call.registerCallback(new Call.Callback() {
@@ -135,8 +141,14 @@
         });
     }
 
-    /** Launches {@link InCallActivity} and presents the on going call in the in call page. */
+    /**
+     * Launches {@link InCallActivity} and presents the on going call in the in call page.
+     */
     private void routeToInCallPage(Call call) {
+        // It has been configured not to show the fullscreen incall ui.
+        if (!mShowFullscreenIncallUi) {
+            return;
+        }
         // Don't launch the in call page if state is disconnected. Otherwise, the InCallActivity
         // finishes right after onCreate() and flashes.
         if (call.getState() != Call.STATE_DISCONNECTED) {
diff --git a/src/com/android/car/dialer/ui/TelecomActivity.java b/src/com/android/car/dialer/ui/TelecomActivity.java
index 26b5cf9..121aeb2 100644
--- a/src/com/android/car/dialer/ui/TelecomActivity.java
+++ b/src/com/android/car/dialer/ui/TelecomActivity.java
@@ -24,11 +24,7 @@
 import android.provider.CallLog;
 import android.telecom.Call;
 import android.telephony.PhoneNumberUtils;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.view.View;
-import android.widget.Toolbar;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -36,11 +32,11 @@
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModelProviders;
 import androidx.preference.PreferenceManager;
 
 import com.android.car.apps.common.util.Themes;
-import com.android.car.apps.common.widget.CarTabLayout;
 import com.android.car.dialer.Constants;
 import com.android.car.dialer.R;
 import com.android.car.dialer.log.L;
@@ -56,6 +52,8 @@
 import com.android.car.dialer.ui.search.ContactResultsFragment;
 import com.android.car.dialer.ui.settings.DialerSettingsActivity;
 import com.android.car.dialer.ui.warning.NoHfpFragment;
+import com.android.car.ui.toolbar.MenuItem;
+import com.android.car.ui.toolbar.Toolbar;
 
 import java.util.List;
 
@@ -71,30 +69,25 @@
  * <p>Based on call and connectivity status, it will choose the right page to display.
  */
 public class TelecomActivity extends FragmentActivity implements
-        DialerBaseFragment.DialerFragmentParent, FragmentManager.OnBackStackChangedListener {
+        DialerBaseFragment.DialerFragmentParent, FragmentManager.OnBackStackChangedListener,
+        Toolbar.OnHeightChangedListener {
     private static final String TAG = "CD.TelecomActivity";
-
     private LiveData<String> mBluetoothErrorMsgLiveData;
     private LiveData<Integer> mDialerAppStateLiveData;
     private LiveData<List<Call>> mOngoingCallListLiveData;
-
     // View objects for this activity.
-    private CarTabLayout<TelecomPageTab> mTabLayout;
     private TelecomPageTab.Factory mTabFactory;
-    private Toolbar mToolbar;
-    private View mToolbarContainer;
+    private Toolbar mCarUiToolbar;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
         L.d(TAG, "onCreate");
         setContentView(R.layout.telecom_activity);
 
-        mToolbar = findViewById(R.id.car_toolbar);
-        setActionBar(mToolbar);
-        getActionBar().setLogo(R.drawable.sized_logo);
-
-        mToolbarContainer = findViewById(R.id.car_toolbar_container);
+        mCarUiToolbar = findViewById(R.id.car_ui_toolbar);
+        mCarUiToolbar.registerToolbarHeightChangeListener(this);
 
         setupTabLayout();
 
@@ -104,6 +97,8 @@
         mDialerAppStateLiveData = viewModel.getDialerAppState();
         mDialerAppStateLiveData.observe(this,
                 dialerAppState -> updateCurrentFragment(dialerAppState));
+        MutableLiveData<Integer> toolbarTitleMode = viewModel.getToolbarTitleMode();
+        toolbarTitleMode.setValue(Themes.getAttrInteger(this, R.attr.toolbarTitleMode));
 
         InCallViewModel inCallViewModel = ViewModelProviders.of(this).get(InCallViewModel.class);
         mOngoingCallListLiveData = inCallViewModel.getOngoingCallList();
@@ -129,17 +124,18 @@
     }
 
     @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        mCarUiToolbar.unregisterToolbarHeightChangeListener(this);
+    }
+
+    @Override
     protected void onNewIntent(Intent i) {
         super.onNewIntent(i);
         setIntent(i);
         handleIntent();
     }
 
-    @Override
-    public void setBackground(Drawable background) {
-        findViewById(android.R.id.content).setBackground(background);
-    }
-
     private void handleIntent() {
         Intent intent = getIntent();
         String action = intent != null ? intent.getAction() : null;
@@ -262,47 +258,46 @@
                 .commitNow();
     }
 
-    /** Returns the fragment that is currently being displayed as the overlay view on top. */
+    /**
+     * Returns the fragment that is currently being displayed as the overlay view on top.
+     */
     @Nullable
     private Fragment getCurrentOverlayFragment() {
         return getSupportFragmentManager().findFragmentById(R.id.overlay_container);
     }
 
     private void setupTabLayout() {
-        mTabLayout = findViewById(R.id.tab_layout);
-
-        boolean hasContentFragment = false;
-
+        boolean wasContentFragmentRestored = false;
         mTabFactory = new TelecomPageTab.Factory(this, getSupportFragmentManager());
         for (int i = 0; i < mTabFactory.getTabCount(); i++) {
-            TelecomPageTab telecomPageTab = mTabFactory.createTab(getBaseContext(), i);
-            mTabLayout.addCarTab(telecomPageTab);
+            TelecomPageTab tab = mTabFactory.createTab(getBaseContext(), i);
+            mCarUiToolbar.addTab(tab);
 
-            if (telecomPageTab.wasFragmentRestored()) {
-                mTabLayout.selectCarTab(i);
-                hasContentFragment = true;
+            if (tab.wasFragmentRestored()) {
+                mCarUiToolbar.selectTab(i);
+                wasContentFragmentRestored = true;
             }
         }
 
         // Select the starting tab and set up the fragment for it.
-        if (!hasContentFragment) {
+        if (!wasContentFragmentRestored) {
             int startTabIndex = getTabFromSharedPreference();
-            TelecomPageTab startTab = mTabLayout.get(startTabIndex);
-            mTabLayout.selectCarTab(startTabIndex);
+            TelecomPageTab startTab = (TelecomPageTab) mCarUiToolbar.getTab(startTabIndex);
+            mCarUiToolbar.selectTab(startTabIndex);
             setContentFragment(startTab.getFragment(), startTab.getFragmentTag());
         }
 
-        mTabLayout.addOnCarTabSelectedListener(
-                new CarTabLayout.SimpleOnCarTabSelectedListener<TelecomPageTab>() {
-                    @Override
-                    public void onCarTabSelected(TelecomPageTab telecomPageTab) {
-                        Fragment fragment = telecomPageTab.getFragment();
-                        setContentFragment(fragment, telecomPageTab.getFragmentTag());
-                    }
+        mCarUiToolbar.registerOnTabSelectedListener(
+                tab -> {
+                    TelecomPageTab telecomPageTab = (TelecomPageTab) tab;
+                    Fragment fragment = telecomPageTab.getFragment();
+                    setContentFragment(fragment, telecomPageTab.getFragmentTag());
                 });
     }
 
-    /** Switch to {@link DialpadFragment} and set the given number as dialed number. */
+    /**
+     * Switch to {@link DialpadFragment} and set the given number as dialed number.
+     */
     private void showDialPadFragment(String number) {
         int dialpadTabIndex = showTabPage(TelecomPageTab.Page.DIAL_PAD);
 
@@ -310,7 +305,7 @@
             return;
         }
 
-        TelecomPageTab dialpadTab = mTabLayout.get(dialpadTabIndex);
+        TelecomPageTab dialpadTab = (TelecomPageTab) mCarUiToolbar.getTab(dialpadTabIndex);
         Fragment fragment = dialpadTab.getFragment();
         if (fragment instanceof DialpadFragment) {
             ((DialpadFragment) fragment).setDialedNumber(number);
@@ -330,7 +325,7 @@
             getSupportFragmentManager().popBackStackImmediate();
         }
 
-        mTabLayout.selectCarTab(tabIndex);
+        mCarUiToolbar.selectTab(tabIndex);
         return tabIndex;
     }
 
@@ -355,26 +350,27 @@
 
         getSupportFragmentManager()
                 .beginTransaction()
-                .replace(R.id.content_fragment_container, topContentFragment)
+                .replace(R.id.content_fragment_container, topContentFragment, fragmentTag)
                 .addToBackStack(fragmentTag)
                 .commit();
     }
 
     @Override
     public void onBackStackChanged() {
-        boolean isBackNavigationAvailable = isBackNavigationAvailable();
-        mTabLayout.setVisibility(isBackNavigationAvailable ? View.GONE : View.VISIBLE);
-        int displayOptions = Themes.getAttrInteger(
-                this,
-                isBackNavigationAvailable ? R.style.HomeAsUpDisplayOptions
-                        : R.style.RootToolbarDisplayOptions,
-                android.R.attr.displayOptions);
-        getActionBar().setDisplayOptions(displayOptions);
-
+        L.d(TAG, "onBackStackChanged");
         Fragment topFragment = getSupportFragmentManager().findFragmentById(
                 R.id.content_fragment_container);
         if (topFragment instanceof DialerBaseFragment) {
-            ((DialerBaseFragment) topFragment).setupActionBar(getActionBar());
+            ((DialerBaseFragment) topFragment).setupToolbar(mCarUiToolbar);
+        }
+    }
+
+    @Override
+    public void onHeightChanged(int height) {
+        Fragment topFragment = getSupportFragmentManager().findFragmentById(
+                R.id.content_fragment_container);
+        if (topFragment instanceof DialerBaseFragment) {
+            ((DialerBaseFragment) topFragment).setToolbarHeight(height);
         }
     }
 
@@ -399,20 +395,22 @@
         }
     }
 
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        MenuInflater inflater = getMenuInflater();
-        inflater.inflate(R.menu.main_menu, menu);
-
-        MenuItem searchMenu = menu.findItem(R.id.menu_contacts_search);
-        Intent searchIntent = new Intent(getApplicationContext(), TelecomActivity.class);
-        searchIntent.setAction(Intent.ACTION_SEARCH);
-        searchMenu.setIntent(searchIntent);
-
-        MenuItem settingsMenu = menu.findItem(R.id.menu_dialer_setting);
-        Intent settingsIntent = new Intent(getApplicationContext(), DialerSettingsActivity.class);
-        settingsMenu.setIntent(settingsIntent);
-        return true;
+    /**
+     * Handles the click action on the menu items.
+     */
+    public void onMenuItemClicked(MenuItem item) {
+        switch (item.getId()) {
+            case R.id.menu_item_search:
+                Intent searchIntent = new Intent(getApplicationContext(), TelecomActivity.class);
+                searchIntent.setAction(Intent.ACTION_SEARCH);
+                startActivity(searchIntent);
+                break;
+            case R.id.menu_item_setting:
+                Intent settingsIntent = new Intent(getApplicationContext(),
+                        DialerSettingsActivity.class);
+                startActivity(settingsIntent);
+                break;
+        }
     }
 
     private void navigateToContactResultsFragment(String query) {
@@ -439,7 +437,9 @@
         startActivity(launchIntent);
     }
 
-    /** If the back button on action bar is available to navigate up. */
+    /**
+     * If the back button on action bar is available to navigate up.
+     */
     private boolean isBackNavigationAvailable() {
         return getSupportFragmentManager().getBackStackEntryCount() > 1;
     }
@@ -451,12 +451,10 @@
         return mTabFactory.getTabIndex(sharedPreferences.getString(key, defaultValue));
     }
 
-    /** Sets the background of the Activity's action bar to a {@link Drawable} */
-    public void setActionBarBackground(@Nullable Drawable drawable) {
-        if (mToolbarContainer != null) {
-            mToolbarContainer.setBackground(drawable);
-        } else {
-            mToolbar.setBackground(drawable);
-        }
+    /**
+     * Sets the background of the Activity's tool bar to a {@link Drawable}
+     */
+    public void setShowToolbarBackground(boolean showToolbarBackground) {
+        mCarUiToolbar.setBackgroundShown(showToolbarBackground);
     }
 }
diff --git a/src/com/android/car/dialer/ui/TelecomActivityViewModel.java b/src/com/android/car/dialer/ui/TelecomActivityViewModel.java
index c9125c1..e28c4ce 100644
--- a/src/com/android/car/dialer/ui/TelecomActivityViewModel.java
+++ b/src/com/android/car/dialer/ui/TelecomActivityViewModel.java
@@ -44,13 +44,18 @@
  */
 public class TelecomActivityViewModel extends AndroidViewModel {
     private static final String TAG = "CD.TelecomActivityViewModel";
-    /** A constant which indicates that there's no Bluetooth error. */
+    /**
+     * A constant which indicates that there's no Bluetooth error.
+     */
     public static final String NO_BT_ERROR = "NO_ERROR";
 
     private final Context mApplicationContext;
     private final LiveData<String> mErrorStringLiveData;
     private final MutableLiveData<Integer> mDialerAppStateLiveData;
 
+    private final ToolbarTitleLiveData mToolbarTitleLiveData;
+    private final MutableLiveData<Integer> mToolbarTitleMode;
+
     /**
      * App state indicates if bluetooth is connected or it should just show the content fragments.
      */
@@ -67,6 +72,9 @@
         super(application);
         mApplicationContext = application.getApplicationContext();
 
+        mToolbarTitleMode = new MediatorLiveData<>();
+        mToolbarTitleLiveData = new ToolbarTitleLiveData(mApplicationContext, mToolbarTitleMode);
+
         if (BluetoothAdapter.getDefaultAdapter() == null) {
             MutableLiveData<String> bluetoothUnavailableLiveData = new MutableLiveData<>();
             bluetoothUnavailableLiveData.setValue(
@@ -84,6 +92,22 @@
         mDialerAppStateLiveData = new DialerAppStateLiveData(mErrorStringLiveData);
     }
 
+    /**
+     * Returns the {@link LiveData} for the toolbar title, which provides the toolbar title
+     * depending on the {@link R.attr#toolbarTitleMode}.
+     */
+    public LiveData<String> getToolbarTitle() {
+        return mToolbarTitleLiveData;
+    }
+
+    /**
+     * Returns the {@link MutableLiveData} of the toolbar title mode. The value should be set by the
+     * {@link TelecomActivity}.
+     */
+    public MutableLiveData<Integer> getToolbarTitleMode() {
+        return mToolbarTitleMode;
+    }
+
     public MutableLiveData<Integer> getDialerAppState() {
         return mDialerAppStateLiveData;
     }
diff --git a/src/com/android/car/dialer/ui/TelecomPageTab.java b/src/com/android/car/dialer/ui/TelecomPageTab.java
index 2c6bf33..eaf5e74 100644
--- a/src/com/android/car/dialer/ui/TelecomPageTab.java
+++ b/src/com/android/car/dialer/ui/TelecomPageTab.java
@@ -24,22 +24,26 @@
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 
-import com.android.car.apps.common.widget.CarTabLayout;
 import com.android.car.dialer.R;
 import com.android.car.dialer.ui.calllog.CallHistoryFragment;
 import com.android.car.dialer.ui.contact.ContactListFragment;
 import com.android.car.dialer.ui.dialpad.DialpadFragment;
 import com.android.car.dialer.ui.favorite.FavoriteFragment;
+import com.android.car.ui.toolbar.TabLayout;
 
 import com.google.common.collect.ImmutableMap;
 
 import java.util.HashMap;
 import java.util.Map;
 
-/** Tab presenting fragments. */
-public class TelecomPageTab extends CarTabLayout.CarTab {
+/**
+ * Tab presenting fragments.
+ */
+public class TelecomPageTab extends TabLayout.Tab {
 
-    /** Note: the strings must be consist with the items in string array tabs_config */
+    /**
+     * Note: the strings must be consist with the items in string array tabs_config
+     */
     @StringDef({
             TelecomPageTab.Page.FAVORITES,
             TelecomPageTab.Page.CALL_HISTORY,
@@ -77,17 +81,23 @@
         mWasFragmentRestored = true;
     }
 
-    /** Returns true if the fragment for this tab is restored from a saved state. */
+    /**
+     * Returns true if the fragment for this tab is restored from a saved state.
+     */
     public boolean wasFragmentRestored() {
         return mWasFragmentRestored;
     }
 
-    /** Returns the fragment for this tab. */
+    /**
+     * Returns the fragment for this tab.
+     */
     public Fragment getFragment() {
         return mFragment;
     }
 
-    /** Returns the fragment tag for this tab. */
+    /**
+     * Returns the fragment tag for this tab.
+     */
     public String getFragmentTag() {
         return mFragmentTag;
     }
@@ -96,7 +106,9 @@
         return String.format("%s:%s", getClass().getSimpleName(), page);
     }
 
-    /** Responsible for creating the top tab items and their fragments. */
+    /**
+     * Responsible for creating the top tab items and their fragments.
+     */
     public static class Factory {
 
         private static final ImmutableMap<String, Integer> TAB_LABELS =
@@ -145,6 +157,9 @@
             }
         }
 
+        /**
+         * Create the tab for the given {@param tabIndex}
+         */
         public TelecomPageTab createTab(Context context, int tabIndex) {
             String page = mTabs[tabIndex];
             TelecomPageTab telecomPageTab = new TelecomPageTab(
@@ -158,6 +173,9 @@
             return mTabs.length;
         }
 
+        /**
+         * Returns the index for the given {@param page}
+         */
         public int getTabIndex(@Page String page) {
             return mTabPageIndexMap.containsKey(page) ? mTabPageIndexMap.get(page) : -1;
         }
diff --git a/src/com/android/car/dialer/ui/ToolbarTitleLiveData.java b/src/com/android/car/dialer/ui/ToolbarTitleLiveData.java
new file mode 100644
index 0000000..11863dd
--- /dev/null
+++ b/src/com/android/car/dialer/ui/ToolbarTitleLiveData.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2019 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.
+ */
+
+package com.android.car.dialer.ui;
+
+import android.bluetooth.BluetoothDevice;
+import android.content.Context;
+
+import androidx.annotation.IntDef;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MediatorLiveData;
+
+import com.android.car.dialer.R;
+import com.android.car.dialer.livedata.HfpDeviceListLiveData;
+
+import java.util.List;
+
+/**
+ * LiveData for the toolbar title of the  {@link com.android.car.dialer.ui.TelecomActivity}. The
+ * attribute {@link R.attr#toolbarTitleMode} is activity scope attribute. Supported values are:
+ * <ul>
+ *     <li> app_name: 0
+ *     <li> none: 1
+ *     <li> device_name: 2
+ */
+class ToolbarTitleLiveData extends MediatorLiveData<String> {
+
+    @IntDef({
+            ToolbarTitleMode.APP_NAME,
+            ToolbarTitleMode.NONE,
+            ToolbarTitleMode.DEVICE_NAME
+    })
+    private @interface ToolbarTitleMode {
+        int APP_NAME = 0;
+        int NONE = 1;
+        int DEVICE_NAME = 2;
+    }
+
+    private final HfpDeviceListLiveData mHfpDeviceListLiveData;
+    private final LiveData<Integer> mToolbarTitleModeLiveData;
+    private final Context mContext;
+
+    ToolbarTitleLiveData(Context context, LiveData<Integer> toolbarTitleModeLiveData) {
+        mContext = context;
+        mToolbarTitleModeLiveData = toolbarTitleModeLiveData;
+        mHfpDeviceListLiveData = new HfpDeviceListLiveData(context);
+
+        addSource(mToolbarTitleModeLiveData, this::updateToolbarTitle);
+    }
+
+    private void updateToolbarTitle(int toolbarTitleMode) {
+        switch (toolbarTitleMode) {
+            case ToolbarTitleMode.NONE:
+                removeSource(mHfpDeviceListLiveData);
+                setValue(null);
+                return;
+            case ToolbarTitleMode.DEVICE_NAME:
+                addSource(mHfpDeviceListLiveData, this::updateDeviceName);
+                return;
+            case ToolbarTitleMode.APP_NAME:
+            default:
+                removeSource(mHfpDeviceListLiveData);
+                setValue(mContext.getString(R.string.phone_app_name));
+                return;
+        }
+    }
+
+    private void updateDeviceName(List<BluetoothDevice> hfpDeviceList) {
+        // When there is no hfp device connected, use the app name as title.
+        if (hfpDeviceList == null || hfpDeviceList.isEmpty()) {
+            setValue(mContext.getString(R.string.phone_app_name));
+            return;
+        }
+
+        // TODO: handle multi-HFP cases. Right now return the first connected device in list.
+        BluetoothDevice bluetoothDevice = hfpDeviceList.get(0);
+        setValue(bluetoothDevice.getName());
+    }
+}
diff --git a/src/com/android/car/dialer/ui/activecall/InCallActivity.java b/src/com/android/car/dialer/ui/activecall/InCallActivity.java
index 7b8215c..015dc08 100644
--- a/src/com/android/car/dialer/ui/activecall/InCallActivity.java
+++ b/src/com/android/car/dialer/ui/activecall/InCallActivity.java
@@ -1,11 +1,11 @@
-/**
+/*
  * Copyright (C) 2019 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
+ *      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,
@@ -60,9 +60,8 @@
         InCallViewModel inCallViewModel = ViewModelProviders.of(this).get(InCallViewModel.class);
         mIncomingCallLiveData = LiveDataFunctions.iff(mShowIncomingCall,
                 inCallViewModel.getIncomingCall());
-        mIncomingCallLiveData.observe(this, this::updateIncomingCallVisibility);
         LiveDataFunctions.pair(inCallViewModel.getOngoingCallList(), mIncomingCallLiveData).observe(
-                this, this::maybeFinishActivity);
+                this, this::updateVisibility);
 
         handleIntent();
     }
@@ -71,7 +70,7 @@
     protected void onStop() {
         super.onStop();
         L.d(TAG, "onStop");
-        if (mShowIncomingCall.getValue()) {
+        if (mIncomingCallLiveData.getValue() != null) {
             InCallNotificationController.get()
                     .showInCallNotification(mIncomingCallLiveData.getValue());
         }
@@ -85,11 +84,14 @@
         handleIntent();
     }
 
-    private void maybeFinishActivity(Pair<List<Call>, Call> callList) {
+    private void updateVisibility(Pair<List<Call>, Call> callList) {
         if ((callList.first == null || callList.first.isEmpty()) && callList.second == null) {
             L.d(TAG, "No call to show. Finish InCallActivity");
             finish();
+            return;
         }
+
+        updateIncomingCallVisibility(callList.second);
     }
 
     private void handleIntent() {
@@ -105,13 +107,21 @@
 
     private void updateIncomingCallVisibility(Call incomingCall) {
         if (incomingCall == null) {
-            getSupportFragmentManager().beginTransaction().show(mOngoingCallFragment).hide(
-                    mIncomingCallFragment).commit();
+            getSupportFragmentManager()
+                    .beginTransaction()
+                    .show(mOngoingCallFragment)
+                    .hide(mIncomingCallFragment)
+                    .setCustomAnimations(android.R.anim.fade_in, android.R.anim.fade_out)
+                    .commit();
             mShowIncomingCall.setValue(false);
             setIntent(null);
         } else {
-            getSupportFragmentManager().beginTransaction().show(mIncomingCallFragment).hide(
-                    mOngoingCallFragment).commit();
+            getSupportFragmentManager()
+                    .beginTransaction()
+                    .show(mIncomingCallFragment)
+                    .hide(mOngoingCallFragment)
+                    .setCustomAnimations(android.R.anim.fade_in, android.R.anim.fade_out)
+                    .commit();
         }
     }
 }
diff --git a/src/com/android/car/dialer/ui/activecall/InCallFragment.java b/src/com/android/car/dialer/ui/activecall/InCallFragment.java
index 81e2b68..0f74255 100644
--- a/src/com/android/car/dialer/ui/activecall/InCallFragment.java
+++ b/src/com/android/car/dialer/ui/activecall/InCallFragment.java
@@ -63,7 +63,7 @@
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mDefaultAvatar = TelecomUtils.createLetterTile(getContext(), null);
+        mDefaultAvatar = TelecomUtils.createLetterTile(getContext(), null, null);
     }
 
     /**
@@ -125,7 +125,7 @@
                 }
 
                 LetterTileDrawable letterTile = TelecomUtils.createLetterTile(
-                        getContext(), info.getDisplayName());
+                        getContext(), info.getInitials(), info.getDisplayName());
 
                 Glide.with(this)
                         .load(info.getAvatarUri())
@@ -136,7 +136,7 @@
                                     Transition<? super Drawable> glideAnimation) {
                                 mBackgroundImage.setAlpha(getResources().getFloat(
                                         R.dimen.config_background_image_alpha));
-                                mBackgroundImage.setBackgroundDrawable(resource);
+                                mBackgroundImage.setBackgroundDrawable(resource, false);
                                 mAvatarView.setImageDrawable(resource);
                             }
 
diff --git a/src/com/android/car/dialer/ui/activecall/InCallViewModel.java b/src/com/android/car/dialer/ui/activecall/InCallViewModel.java
index 9d3781c..328695b 100644
--- a/src/com/android/car/dialer/ui/activecall/InCallViewModel.java
+++ b/src/com/android/car/dialer/ui/activecall/InCallViewModel.java
@@ -57,10 +57,10 @@
     private static final String TAG = "CD.InCallViewModel";
 
     private final MutableLiveData<List<Call>> mCallListLiveData;
-    private final LiveData<List<Call>> mOngoingCallListLiveData;
+    private final MutableLiveData<List<Call>> mOngoingCallListLiveData;
     private final Comparator<Call> mCallComparator;
 
-    private final LiveData<Call> mIncomingCallLiveData;
+    private final MutableLiveData<Call> mIncomingCallLiveData;
 
     private final LiveData<CallDetail> mCallDetailLiveData;
     private final LiveData<Integer> mCallStateLiveData;
@@ -99,7 +99,11 @@
     private final Call.Callback mCallStateChangedCallback = new Call.Callback() {
         @Override
         public void onStateChanged(Call call, int state) {
-            // Sets value to trigger the live data for incoming call and active call list to update.
+            // Don't show in call activity by declining a ringing call to avoid UI flashing.
+            if (call.equals(mIncomingCallLiveData.getValue()) && state == Call.STATE_DISCONNECTED) {
+                return;
+            }
+            // Sets value to trigger incoming call and active call list to update.
             mCallListLiveData.setValue(mCallListLiveData.getValue());
         }
     };
@@ -108,20 +112,21 @@
         super(application);
         mContext = application.getApplicationContext();
 
-        mCallListLiveData = new MutableLiveData<>();
+        mIncomingCallLiveData = new MutableLiveData<>();
+        mOngoingCallListLiveData = new MutableLiveData<>();
         mCallComparator = new CallComparator();
-
-        mIncomingCallLiveData = Transformations.map(mCallListLiveData,
-                callList -> firstMatch(callList,
+        mCallListLiveData = new MutableLiveData<List<Call>>() {
+            @Override
+            public void setValue(List<Call> callList) {
+                super.setValue(callList);
+                List<Call> activeCallList = filter(callList,
+                        call -> call != null && call.getState() != Call.STATE_RINGING);
+                activeCallList.sort(mCallComparator);
+                mOngoingCallListLiveData.setValue(activeCallList);
+                mIncomingCallLiveData.setValue(firstMatch(callList,
                         call -> call != null && call.getState() == Call.STATE_RINGING));
-
-        mOngoingCallListLiveData = Transformations.map(mCallListLiveData,
-                callList -> {
-                    List<Call> activeCallList = filter(callList,
-                            call -> call != null && call.getState() != Call.STATE_RINGING);
-                    activeCallList.sort(mCallComparator);
-                    return activeCallList;
-                });
+            }
+        };
 
         mPrimaryCallLiveData = Transformations.map(mOngoingCallListLiveData,
                 input -> input.isEmpty() ? null : input.get(0));
diff --git a/src/com/android/car/dialer/ui/activecall/OnHoldCallUserProfileFragment.java b/src/com/android/car/dialer/ui/activecall/OnHoldCallUserProfileFragment.java
index 1ffebe2..d86f804 100644
--- a/src/com/android/car/dialer/ui/activecall/OnHoldCallUserProfileFragment.java
+++ b/src/com/android/car/dialer/ui/activecall/OnHoldCallUserProfileFragment.java
@@ -54,7 +54,7 @@
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mDefaultAvatar = TelecomUtils.createLetterTile(getContext(), null);
+        mDefaultAvatar = TelecomUtils.createLetterTile(getContext(), null, null);
     }
 
     @Nullable
@@ -91,21 +91,17 @@
         String number = callDetail.getNumber();
         mTitle.setText(TelecomUtils.getFormattedNumber(getContext(), number));
         mAvatarView.setImageDrawable(mDefaultAvatar);
+
         mPhoneNumberInfoFuture = TelecomUtils.getPhoneNumberInfo(getContext(), number)
                 .thenAcceptAsync((info) -> {
                     mTitle.setText(info.getDisplayName());
                     TelecomUtils.setContactBitmapAsync(getContext(), mAvatarView,
-                            info.getAvatarUri(), info.getDisplayName());
+                            info.getAvatarUri(), info.getInitials(), info.getDisplayName());
                 }, getContext().getMainExecutor());
     }
 
     private void swapCalls() {
-        // Unholds onhold call
-        if (mSecondaryCallLiveData.getValue() != null) {
-            mSecondaryCallLiveData.getValue().unhold();
-        }
-
-        // hold primary call
+        // Hold primary call and the secondary call will automatically come to the foreground.
         if (mPrimaryCallLiveData.getValue().getState() != Call.STATE_HOLDING) {
             mPrimaryCallLiveData.getValue().hold();
         }
diff --git a/src/com/android/car/dialer/ui/calllog/CallHistoryFragment.java b/src/com/android/car/dialer/ui/calllog/CallHistoryFragment.java
index 4cbf82f..2658885 100644
--- a/src/com/android/car/dialer/ui/calllog/CallHistoryFragment.java
+++ b/src/com/android/car/dialer/ui/calllog/CallHistoryFragment.java
@@ -23,6 +23,8 @@
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProviders;
 
+import com.android.car.dialer.Constants;
+import com.android.car.dialer.R;
 import com.android.car.dialer.ui.common.DialerListBaseFragment;
 import com.android.car.dialer.ui.contact.ContactDetailsFragment;
 import com.android.car.telephony.common.Contact;
@@ -52,7 +54,17 @@
         CallHistoryViewModel viewModel = ViewModelProviders.of(this).get(
                 CallHistoryViewModel.class);
 
-        viewModel.getCallHistory().observe(this, mCallLogAdapter::setUiCallLogs);
+        viewModel.getCallHistory().observe(this, uiCallLogs -> {
+            if (uiCallLogs.isLoading()) {
+                showLoading();
+            } else if (uiCallLogs.getData().isEmpty()) {
+                showEmpty(Constants.INVALID_RES_ID, R.string.call_logs_empty,
+                        R.string.available_after_sync);
+            } else {
+                mCallLogAdapter.setUiCallLogs(uiCallLogs.getData());
+                showContent();
+            }
+        });
     }
 
     @Override
diff --git a/src/com/android/car/dialer/ui/calllog/CallHistoryViewModel.java b/src/com/android/car/dialer/ui/calllog/CallHistoryViewModel.java
index bef716b..d92da88 100644
--- a/src/com/android/car/dialer/ui/calllog/CallHistoryViewModel.java
+++ b/src/com/android/car/dialer/ui/calllog/CallHistoryViewModel.java
@@ -23,6 +23,8 @@
 import androidx.lifecycle.AndroidViewModel;
 import androidx.lifecycle.LiveData;
 
+import com.android.car.arch.common.FutureData;
+import com.android.car.arch.common.LiveDataFunctions;
 import com.android.car.dialer.livedata.CallHistoryLiveData;
 import com.android.car.dialer.livedata.HeartBeatLiveData;
 import com.android.car.dialer.ui.common.UiCallLogLiveData;
@@ -30,11 +32,10 @@
 
 import java.util.List;
 
-/**
- * View model for CallHistoryFragment which provides call history live data.
- */
+/** View model for CallHistoryFragment which provides call history live data. */
 public class CallHistoryViewModel extends AndroidViewModel {
     private UiCallLogLiveData mUiCallLogLiveData;
+    private LiveData<FutureData<List<Object>>> mUiCallLogFutureData;
 
     public CallHistoryViewModel(@NonNull Application application) {
         super(application);
@@ -42,12 +43,13 @@
                 new HeartBeatLiveData(DateUtils.MINUTE_IN_MILLIS),
                 CallHistoryLiveData.newInstance(application.getApplicationContext()),
                 InMemoryPhoneBook.get().getContactsLiveData());
+
+        mUiCallLogFutureData = LiveDataFunctions.loadingSwitchMap(mUiCallLogLiveData,
+                input -> LiveDataFunctions.dataOf(input));
     }
 
-    /**
-     * Returns the live data for call history list.
-     */
-    public LiveData<List<Object>> getCallHistory() {
-        return mUiCallLogLiveData;
+    /** Returns the {@link LiveData} for call history list {@link FutureData}. */
+    public LiveData<FutureData<List<Object>>> getCallHistory() {
+        return mUiCallLogFutureData;
     }
 }
diff --git a/src/com/android/car/dialer/ui/calllog/CallLogAdapter.java b/src/com/android/car/dialer/ui/calllog/CallLogAdapter.java
index 71427c5..c0e4369 100644
--- a/src/com/android/car/dialer/ui/calllog/CallLogAdapter.java
+++ b/src/com/android/car/dialer/ui/calllog/CallLogAdapter.java
@@ -91,8 +91,8 @@
 
     @Override
     public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-        if (holder instanceof  CallLogViewHolder) {
-            ((CallLogViewHolder) holder).onBind((UiCallLog) mUiCallLogs.get(position));
+        if (holder instanceof CallLogViewHolder) {
+            ((CallLogViewHolder) holder).bind((UiCallLog) mUiCallLogs.get(position));
         } else {
             ((HeaderViewHolder) holder).setHeaderTitle((String) mUiCallLogs.get(position));
         }
@@ -111,7 +111,7 @@
     @Override
     public void onViewRecycled(@NonNull RecyclerView.ViewHolder holder) {
         if (holder instanceof CallLogViewHolder) {
-            ((CallLogViewHolder) holder).onRecycle();
+            ((CallLogViewHolder) holder).recycle();
         }
     }
 
diff --git a/src/com/android/car/dialer/ui/calllog/CallLogViewHolder.java b/src/com/android/car/dialer/ui/calllog/CallLogViewHolder.java
index fd0a734..bef477b 100644
--- a/src/com/android/car/dialer/ui/calllog/CallLogViewHolder.java
+++ b/src/com/android/car/dialer/ui/calllog/CallLogViewHolder.java
@@ -23,6 +23,7 @@
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.android.car.apps.common.util.ViewUtils;
 import com.android.car.dialer.R;
 import com.android.car.dialer.livedata.CallHistoryLiveData;
 import com.android.car.dialer.telecom.UiCallManager;
@@ -65,36 +66,48 @@
         mDivider = itemView.findViewById(R.id.divider);
     }
 
-    public void onBind(UiCallLog uiCallLog) {
+    /**
+     * Binds the view holder with relevant data.
+     */
+    public void bind(UiCallLog uiCallLog) {
         TelecomUtils.setContactBitmapAsync(
                 mAvatarView.getContext(),
                 mAvatarView,
                 uiCallLog.getAvatarUri(),
+                uiCallLog.getInitials(),
                 uiCallLog.getTitle());
-        mTitleView.setText(uiCallLog.getTitle());
-        if (uiCallLog.getMostRecentCallType() == CallHistoryLiveData.CallType.MISSED_TYPE) {
-            mTitleView.setTextAppearance(R.style.TextAppearance_CallLogTitleMissedCall);
-        } else {
-            mTitleView.setTextAppearance(R.style.TextAppearance_CallLogTitleDefault);
-        }
 
+        mTitleView.setText(uiCallLog.getTitle());
         for (PhoneCallLog.Record record : uiCallLog.getCallRecords()) {
             mCallTypeIconsView.add(record.getCallType());
         }
-
         mCallCountTextView.setText(mCallTypeIconsView.getCallCountText());
         mCallCountTextView.setVisibility(
                 mCallTypeIconsView.getCallCountText() == null ? View.GONE : View.VISIBLE);
         mTextView.setText(uiCallLog.getText());
 
-        mPlaceCallView.setOnClickListener(
+        if (uiCallLog.getMostRecentCallType() == CallHistoryLiveData.CallType.MISSED_TYPE) {
+            mTitleView.setTextAppearance(R.style.TextAppearance_CallLogTitleMissedCall);
+            mCallCountTextView.setTextAppearance(R.style.TextAppearance_CallLogCallCountMissedCall);
+            mTextView.setTextAppearance(R.style.TextAppearance_CallLogTimestampMissedCall);
+        } else {
+            mTitleView.setTextAppearance(R.style.TextAppearance_CallLogTitleDefault);
+            mCallCountTextView.setTextAppearance(R.style.TextAppearance_CallLogCallCountDefault);
+            mTextView.setTextAppearance(R.style.TextAppearance_CallLogTimestampDefault);
+        }
+
+        ViewUtils.setOnClickListener(mPlaceCallView,
                 view -> UiCallManager.get().placeCall(uiCallLog.getNumber()));
 
         setUpActionButton(uiCallLog);
     }
 
-    public void onRecycle() {
+    /**
+     * Recycles views.
+     */
+    public void recycle() {
         mCallTypeIconsView.clear();
+        ViewUtils.setOnClickListener(mPlaceCallView, null);
     }
 
     private void setUpActionButton(UiCallLog uiCallLog) {
@@ -103,15 +116,18 @@
         }
 
         Contact contact = InMemoryPhoneBook.get().lookupContactEntry(uiCallLog.getNumber());
+        boolean forceShowActionButton = itemView.getResources().getBoolean(
+                R.bool.config_show_calllog_action_button_for_non_contact);
 
-        if (contact == null) {
-            mActionButton.setVisibility(View.GONE);
-            mDivider.setVisibility(View.GONE);
-            return;
+        ViewUtils.setVisible(mDivider, contact != null || forceShowActionButton);
+        ViewUtils.setVisible(mActionButton, contact != null || forceShowActionButton);
+        ViewUtils.setEnabled(mActionButton, contact != null);
+
+        if (contact != null) {
+            ViewUtils.setOnClickListener(mActionButton,
+                    view -> mOnShowContactDetailListener.onShowContactDetail(contact));
+        } else {
+            ViewUtils.setOnClickListener(mActionButton, null);
         }
-        mDivider.setVisibility(View.VISIBLE);
-        mActionButton.setVisibility(View.VISIBLE);
-        mActionButton.setOnClickListener(
-                view -> mOnShowContactDetailListener.onShowContactDetail(contact));
     }
 }
diff --git a/src/com/android/car/dialer/ui/common/DialerBaseFragment.java b/src/com/android/car/dialer/ui/common/DialerBaseFragment.java
index d4a0ee9..9e7aa7a 100644
--- a/src/com/android/car/dialer/ui/common/DialerBaseFragment.java
+++ b/src/com/android/car/dialer/ui/common/DialerBaseFragment.java
@@ -16,42 +16,75 @@
 
 package com.android.car.dialer.ui.common;
 
-import android.app.ActionBar;
 import android.app.Activity;
-import android.graphics.drawable.Drawable;
-import android.view.View;
+import android.os.Bundle;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.ViewModelProviders;
 
-import com.android.car.apps.common.util.Themes;
 import com.android.car.dialer.R;
 import com.android.car.dialer.ui.TelecomActivity;
+import com.android.car.dialer.ui.TelecomActivityViewModel;
+import com.android.car.ui.toolbar.Toolbar;
 
-/** The base class for top level dialer content {@link Fragment}s. */
+/**
+ * The base class for top level dialer content {@link Fragment}s.
+ */
 public abstract class DialerBaseFragment extends Fragment {
 
+    private MutableLiveData<Integer> mToolbarHeight;
+
     /**
      * Interface for Dialer top level fragment's parent to implement.
      */
     public interface DialerFragmentParent {
 
-        /** Sets the background drawable. */
-        void setBackground(Drawable background);
-
-        /** Push a fragment to the back stack. Update action bar accordingly. */
+        /**
+         * Push a fragment to the back stack. Update action bar accordingly.
+         */
         void pushContentFragment(Fragment fragment, String fragmentTag);
     }
 
-    /** Customizes the action bar. Can be overridden in subclasses. */
-    public void setupActionBar(@NonNull ActionBar actionBar) {
-        actionBar.setTitle(getActionBarTitle());
-        actionBar.setCustomView(null);
-        setActionBarBackground(getContext().getDrawable(R.color.app_bar_background_color));
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mToolbarHeight = new MutableLiveData<>();
     }
 
-    /** Push a fragment to the back stack. Update action bar accordingly. */
+    @Override
+    public void onStart() {
+        super.onStart();
+        mToolbarHeight.observe(this, this::onToolbarHeightChange);
+    }
+
+    /**
+     * Customizes the tool bar. Can be overridden in subclasses.
+     */
+    public void setupToolbar(@NonNull Toolbar toolbar) {
+        TelecomActivityViewModel viewModel = ViewModelProviders.of(getActivity()).get(
+                TelecomActivityViewModel.class);
+        LiveData<String> toolbarTitleLiveData = viewModel.getToolbarTitle();
+        toolbarTitleLiveData.observe(this,
+                toolbarTitle -> toolbar.setTitle(toolbarTitle));
+
+        toolbar.setState(getToolbarState());
+        toolbar.setLogo(getToolbarState() == Toolbar.State.HOME ? getActivity().getDrawable(
+                R.drawable.ic_app_icon) : null);
+
+        toolbar.setMenuItems(R.xml.menuitems);
+
+        setShowToolbarBackground(true);
+
+        setToolbarHeight(toolbar.getHeight());
+    }
+
+    /**
+     * Push a fragment to the back stack. Update action bar accordingly.
+     */
     protected void pushContentFragment(@NonNull Fragment fragment, String fragmentTag) {
         Activity parentActivity = getActivity();
         if (parentActivity instanceof DialerFragmentParent) {
@@ -59,29 +92,26 @@
         }
     }
 
-    /** Return the action bar title. */
-    protected CharSequence getActionBarTitle() {
-        return getString(R.string.default_toolbar_title);
+    protected Toolbar.State getToolbarState() {
+        return Toolbar.State.HOME;
     }
 
-    protected int getTopBarHeight() {
-        View toolbar = getActivity().findViewById(R.id.car_toolbar);
-
-        int backStackEntryCount =
-                getActivity().getSupportFragmentManager().getBackStackEntryCount();
-        int topBarHeight = Themes.getAttrDimensionPixelSize(getContext(),
-                android.R.attr.actionBarSize);
-        // Tabs are not child of the toolbar and tabs are visible.
-        if (toolbar.findViewById(R.id.tab_layout) == null && backStackEntryCount == 1) {
-            topBarHeight += topBarHeight;
-        }
-        return topBarHeight;
-    }
-
-    protected final void setActionBarBackground(@Nullable Drawable drawable) {
+    protected final void setShowToolbarBackground(boolean showBackground) {
         Activity activity = getActivity();
         if (activity instanceof TelecomActivity) {
-            ((TelecomActivity) activity).setActionBarBackground(drawable);
+            ((TelecomActivity) activity).setShowToolbarBackground(showBackground);
         }
     }
+
+    /**
+     * Sets the toolbar height.
+     */
+    public final void setToolbarHeight(int toolbarHeight) {
+        mToolbarHeight.setValue(toolbarHeight);
+    }
+
+    /**
+     * Handles the toolbar height.
+     */
+    public abstract void onToolbarHeightChange(int toolbarHeight);
 }
diff --git a/src/com/android/car/dialer/ui/common/DialerListBaseFragment.java b/src/com/android/car/dialer/ui/common/DialerListBaseFragment.java
index 49c3782..a5c2213 100644
--- a/src/com/android/car/dialer/ui/common/DialerListBaseFragment.java
+++ b/src/com/android/car/dialer/ui/common/DialerListBaseFragment.java
@@ -16,18 +16,21 @@
 
 package com.android.car.dialer.ui.common;
 
+import android.annotation.StringRes;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.DrawableRes;
 import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.android.car.apps.common.widget.PagedRecyclerView;
 import com.android.car.dialer.R;
+import com.android.car.dialer.widget.LoadingFrameLayout;
+import com.android.car.ui.recyclerview.CarUiRecyclerView;
 
 /**
  * Base fragment that inflates a {@link RecyclerView}. It handles the top offset for first row item
@@ -35,23 +38,25 @@
  */
 public class DialerListBaseFragment extends DialerBaseFragment {
 
-    private PagedRecyclerView mListView;
+    private LoadingFrameLayout mLoadingFrameLayout;
+    private CarUiRecyclerView mRecyclerView;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
         View view = inflater.inflate(getLayoutResource(), container, false);
-        mListView = view.findViewById(R.id.list_view);
-        mListView.setLayoutManager(createLayoutManager());
-        mListView.setPaddingRelative(mListView.getPaddingStart(), getTopOffset(),
-                mListView.getPaddingEnd(), mListView.getPaddingBottom());
+        mLoadingFrameLayout = view.findViewById(R.id.loading_frame_layout);
+        mRecyclerView = view.findViewById(R.id.list_view);
+        mRecyclerView.setLayoutManager(createLayoutManager());
         return view;
     }
 
-    /** Layout resource for this fragment. It must contains a RecyclerView with id list_view. */
+    /**
+     * Layout resource for this fragment. It must contains a RecyclerView with id list_view.
+     */
     @LayoutRes
     protected int getLayoutResource() {
-        return R.layout.list_fragment;
+        return R.layout.loading_list_fragment;
     }
 
     /**
@@ -63,16 +68,55 @@
         return new LinearLayoutManager(getContext());
     }
 
-    /** Returns the {@link RecyclerView} instance. */
+    /**
+     * Returns the {@link RecyclerView} instance.
+     */
     @NonNull
-    protected PagedRecyclerView getRecyclerView() {
-        return mListView;
+    protected CarUiRecyclerView getRecyclerView() {
+        return mRecyclerView;
     }
 
-    /** Gets the top padding for the list. By default it includes the action bar's height */
-    protected int getTopOffset() {
+    /**
+     * Shows loading spinner when the data is still loading.
+     */
+    protected void showLoading() {
+        mLoadingFrameLayout.showLoading();
+    }
+
+    /**
+     * Shows content when data is loaded and the content is not empty.
+     */
+    protected void showContent() {
+        mLoadingFrameLayout.showContent();
+    }
+
+    /**
+     * Shows the empty view with icon, message and secondary message.
+     */
+    protected void showEmpty(@DrawableRes int iconResId, @StringRes int messageResId,
+            @StringRes int secondaryMessageResId) {
+        mLoadingFrameLayout.showEmpty(iconResId, messageResId, secondaryMessageResId);
+    }
+
+    /**
+     * Shows the empty view with icon, message, secondary message and action button.
+     */
+    protected void showEmpty(@DrawableRes int iconResId, @StringRes int messageResId,
+            @StringRes int secondaryMessageResId,
+            @StringRes int actionButtonTextResId, View.OnClickListener actionButtonOnClickListener,
+            boolean showActionButton) {
+        mLoadingFrameLayout.showEmpty(iconResId, messageResId, secondaryMessageResId,
+                actionButtonTextResId, actionButtonOnClickListener, showActionButton);
+    }
+
+    @Override
+    public void onToolbarHeightChange(int toolbarHeight) {
         int listTopPadding = getContext().getResources().getDimensionPixelSize(
                 R.dimen.list_top_padding);
-        return getTopBarHeight() + listTopPadding;
+        mRecyclerView.setPaddingRelative(
+                mRecyclerView.getPaddingStart(),
+                toolbarHeight + listTopPadding,
+                mRecyclerView.getPaddingEnd(),
+                mRecyclerView.getPaddingBottom());
     }
 }
diff --git a/src/com/android/car/dialer/ui/common/DialerUtils.java b/src/com/android/car/dialer/ui/common/DialerUtils.java
index c4c191e..3bcca38 100644
--- a/src/com/android/car/dialer/ui/common/DialerUtils.java
+++ b/src/com/android/car/dialer/ui/common/DialerUtils.java
@@ -16,15 +16,14 @@
 
 package com.android.car.dialer.ui.common;
 
-import android.app.AlertDialog;
 import android.content.Context;
-import android.content.res.Resources;
 
 import com.android.car.dialer.R;
 import com.android.car.dialer.log.L;
 import com.android.car.telephony.common.Contact;
 import com.android.car.telephony.common.PhoneNumber;
 import com.android.car.telephony.common.TelecomUtils;
+import com.android.car.ui.AlertDialogBuilder;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -56,7 +55,7 @@
             List<PhoneNumber> numbers,
             PhoneNumberSelectionCallback callback) {
         final List<PhoneNumber> selectedPhoneNumber = new ArrayList<>();
-        new AlertDialog.Builder(context)
+        new AlertDialogBuilder(context)
                 .setTitle(R.string.select_number_dialog_title)
                 .setSingleChoiceItems(
                         new PhoneNumberListAdapter(context, numbers),
@@ -107,16 +106,4 @@
             L.w(TAG, "contact %s doesn't have any phone number", contact.getDisplayName());
         }
     }
-
-    /** Returns true if this a short height screen */
-    public static boolean isShortScreen(Context context) {
-        Resources resources = context.getResources();
-        return resources.getBoolean(R.bool.screen_size_short);
-    }
-
-    /** Returns true if this a tall height screen */
-    public static boolean isTallScreen(Context context) {
-        Resources resources = context.getResources();
-        return resources.getBoolean(R.bool.screen_size_tall);
-    }
 }
diff --git a/src/com/android/car/dialer/ui/common/FavoritePhoneNumberListAdapter.java b/src/com/android/car/dialer/ui/common/FavoritePhoneNumberListAdapter.java
index 911e6a7..4f93fd0 100644
--- a/src/com/android/car/dialer/ui/common/FavoritePhoneNumberListAdapter.java
+++ b/src/com/android/car/dialer/ui/common/FavoritePhoneNumberListAdapter.java
@@ -20,10 +20,9 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.BaseAdapter;
 import android.widget.TextView;
 
-import androidx.recyclerview.widget.RecyclerView;
-
 import com.android.car.dialer.R;
 import com.android.car.telephony.common.Contact;
 import com.android.car.telephony.common.PhoneNumber;
@@ -32,13 +31,12 @@
 import java.util.List;
 
 /**
- * {@link RecyclerView.Adapter} that presents the {@link PhoneNumber} and its type as two line list
+ * {@link BaseAdapter} that presents the {@link PhoneNumber} and its type as two line list
  * item with stars to indicate favorite state or user selection to add to favorite. Currently
  * favorite phone number is set to disabled so user can not take any action for an existing favorite
  * phone number.
  */
-public class FavoritePhoneNumberListAdapter extends
-        RecyclerView.Adapter<FavoritePhoneNumberListAdapter.PhoneNumberViewHolder> {
+public class FavoritePhoneNumberListAdapter extends BaseAdapter {
     private final Context mContext;
     private final FavoritePhoneNumberPresenter mFavoritePhoneNumberPresenter;
     private final List<PhoneNumber> mPhoneNumbers;
@@ -49,7 +47,9 @@
      * listener.
      */
     public interface FavoritePhoneNumberPresenter {
-        /** Provides the click listener for the given phone number and its present view. */
+        /**
+         * Provides the click listener for the given phone number and its present view.
+         */
         void onItemClicked(PhoneNumber phoneNumber, View itemView);
     }
 
@@ -60,7 +60,9 @@
         mPhoneNumbers = new ArrayList<>();
     }
 
-    /** Sets the phone numbers to display */
+    /**
+     * Sets the phone numbers to display
+     */
     public void setPhoneNumbers(Contact contact, List<PhoneNumber> phoneNumbers) {
         mPhoneNumbers.clear();
         mContact = contact;
@@ -69,58 +71,57 @@
         notifyDataSetChanged();
     }
 
-    @Override
-    public PhoneNumberViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View itemView = LayoutInflater.from(mContext).inflate(
-                R.layout.add_favorite_number_list_item, parent, false);
-        return new PhoneNumberViewHolder(itemView, mFavoritePhoneNumberPresenter);
-    }
-
-    @Override
-    public void onBindViewHolder(PhoneNumberViewHolder holder, int position) {
-        holder.bind(mPhoneNumbers.get(position));
-    }
-
-    @Override
-    public int getItemCount() {
-        return mPhoneNumbers.size();
-    }
-
     public Contact getContact() {
         return mContact;
     }
 
-    static class PhoneNumberViewHolder extends RecyclerView.ViewHolder {
+    @Override
+    public int getCount() {
+        return mPhoneNumbers.size();
+    }
 
-        private final FavoritePhoneNumberPresenter mFavoritePhoneNumberPresenter;
-        private final TextView mPhoneNumberView;
-        private final TextView mPhoneNumberDescriptionView;
+    @Override
+    public PhoneNumber getItem(int position) {
+        return mPhoneNumbers.get(position);
+    }
 
-        PhoneNumberViewHolder(View itemView,
-                FavoritePhoneNumberPresenter favoritePhoneNumberPresenter) {
-            super(itemView);
-            mFavoritePhoneNumberPresenter = favoritePhoneNumberPresenter;
-            mPhoneNumberView = itemView.findViewById(R.id.phone_number);
-            mPhoneNumberDescriptionView = itemView.findViewById(R.id.phone_number_description);
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        View itemView;
+        if (convertView == null) {
+            itemView = LayoutInflater.from(mContext).inflate(
+                    R.layout.add_favorite_number_list_item, parent, false);
+        } else {
+            itemView = convertView;
         }
+        PhoneNumber phoneNumber = getItem(position);
+        bind(phoneNumber, itemView);
+        return itemView;
+    }
 
-        void bind(PhoneNumber phoneNumber) {
-            mPhoneNumberView.setText(phoneNumber.getRawNumber());
-            CharSequence readableLabel = phoneNumber.getReadableLabel(itemView.getResources());
+    void bind(PhoneNumber phoneNumber, View itemView) {
+        TextView phoneNumberView = itemView.findViewById(R.id.phone_number);
+        TextView phoneNumberDescriptionView = itemView.findViewById(R.id.phone_number_description);
+        phoneNumberView.setText(phoneNumber.getRawNumber());
+        CharSequence readableLabel = phoneNumber.getReadableLabel(itemView.getResources());
 
-            if (phoneNumber.isFavorite()) {
-                mPhoneNumberDescriptionView.setText(
-                        itemView.getResources().getString(R.string.favorite_number_description,
-                                readableLabel));
-                itemView.setActivated(true);
-                itemView.setEnabled(false);
-            } else {
-                mPhoneNumberDescriptionView.setText(readableLabel);
-                itemView.setActivated(false);
-                itemView.setEnabled(true);
-                itemView.setOnClickListener(
-                        view -> mFavoritePhoneNumberPresenter.onItemClicked(phoneNumber, itemView));
-            }
+        if (phoneNumber.isFavorite()) {
+            phoneNumberDescriptionView.setText(
+                    itemView.getResources().getString(R.string.favorite_number_description,
+                            readableLabel));
+            itemView.setActivated(true);
+            itemView.setEnabled(false);
+        } else {
+            phoneNumberDescriptionView.setText(readableLabel);
+            itemView.setActivated(false);
+            itemView.setEnabled(true);
+            itemView.setOnClickListener(
+                    view -> mFavoritePhoneNumberPresenter.onItemClicked(phoneNumber, itemView));
         }
     }
 }
diff --git a/src/com/android/car/dialer/ui/common/UiCallLogLiveData.java b/src/com/android/car/dialer/ui/common/UiCallLogLiveData.java
index d200b60..5b6d06a 100644
--- a/src/com/android/car/dialer/ui/common/UiCallLogLiveData.java
+++ b/src/com/android/car/dialer/ui/common/UiCallLogLiveData.java
@@ -20,6 +20,7 @@
 import android.text.TextUtils;
 import android.text.format.DateUtils;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MediatorLiveData;
@@ -60,19 +61,16 @@
             LiveData<List<Contact>> contactListLiveData) {
         mContext = context;
         addSource(callHistoryLiveData, this::onCallHistoryChanged);
-        addSource(contactListLiveData, (contacts) -> {
-            // Don't call onCallHistoryChanged() before the call history is loaded.
-            // Otherwise, we'll set our value to an empty list instead of just being
-            // uninitialized while loading. This will cause us to lose our scroll position.
-            List<PhoneCallLog> callLogs = callHistoryLiveData.getValue();
-            if (callLogs != null) {
-                onCallHistoryChanged(callLogs);
-            }
-        });
+        addSource(contactListLiveData,
+                (contacts) -> onCallHistoryChanged(callHistoryLiveData.getValue()));
         addSource(heartBeatLiveData, (trigger) -> updateRelativeTime());
     }
 
     private void onCallHistoryChanged(List<PhoneCallLog> callLogs) {
+        // If there is no value set, don't set null value to trigger an update.
+        if (callLogs == null && getValue() == null) {
+            return;
+        }
         setValue(convert(callLogs));
     }
 
@@ -115,6 +113,7 @@
         }
     }
 
+    @NonNull
     private List<Object> convert(List<PhoneCallLog> phoneCallLogs) {
         if (phoneCallLogs == null) {
             return Collections.emptyList();
@@ -134,8 +133,8 @@
             String relativeTime = getRelativeTime(phoneCallLog.getLastCallEndTimestamp());
             if (TelecomUtils.isVoicemailNumber(mContext, number)) {
                 String title = mContext.getString(R.string.voicemail);
-                UiCallLog uiCallLog = new UiCallLog(title,
-                        relativeTime, number, null, phoneCallLog.getAllCallRecords());
+                UiCallLog uiCallLog = new UiCallLog(title, relativeTime, number, null, null,
+                        phoneCallLog.getAllCallRecords());
                 uiCallLogs.add(uiCallLog);
                 continue;
             }
@@ -156,6 +155,7 @@
                     title,
                     getSecondaryText(getType(phoneNumber), relativeTime),
                     number,
+                    contact != null ? contact.getInitials() : null,
                     contact != null ? contact.getAvatarUri() : null,
                     phoneCallLog.getAllCallRecords());
 
diff --git a/src/com/android/car/dialer/ui/common/entity/ContactSortingInfo.java b/src/com/android/car/dialer/ui/common/entity/ContactSortingInfo.java
index f59e9f7..f580a75 100644
--- a/src/com/android/car/dialer/ui/common/entity/ContactSortingInfo.java
+++ b/src/com/android/car/dialer/ui/common/entity/ContactSortingInfo.java
@@ -39,7 +39,7 @@
      * @see android.provider.ContactsContract.Contacts#DISPLAY_NAME_PRIMARY
      */
     private static final Comparator<Contact> sFirstNameComparator =
-            (o1, o2) -> o1.compareByDisplayName(o2);
+            (o1, o2) -> o1.compareBySortKeyPrimary(o2);
 
     /**
      * Sort by the alternative display order of a name. For western names it will be "Family,
@@ -50,7 +50,7 @@
      * @see android.provider.ContactsContract.Contacts#DISPLAY_NAME_ALTERNATIVE
      */
     private static final Comparator<Contact> sLastNameComparator =
-            (o1, o2) -> o1.compareByAltDisplayName(o2);
+            (o1, o2) -> o1.compareBySortKeyAlt(o2);
 
     /**
      * A static method that return how Contacts are sorted
diff --git a/src/com/android/car/dialer/ui/common/entity/UiCallLog.java b/src/com/android/car/dialer/ui/common/entity/UiCallLog.java
index 999d66e..9de9730 100644
--- a/src/com/android/car/dialer/ui/common/entity/UiCallLog.java
+++ b/src/com/android/car/dialer/ui/common/entity/UiCallLog.java
@@ -18,6 +18,8 @@
 
 import android.net.Uri;
 
+import androidx.annotation.Nullable;
+
 import com.android.car.dialer.livedata.CallHistoryLiveData;
 import com.android.car.telephony.common.PhoneCallLog;
 
@@ -31,20 +33,31 @@
 public class UiCallLog {
     private final String mTitle;
     private final String mNumber;
+    @Nullable
+    private final String mInitials;
     private final Uri mAvatarUri;
     private final List<PhoneCallLog.Record> mCallRecords;
     private String mText;
 
-    public UiCallLog(String title, String text, String number, Uri avatarUri,
-            List<PhoneCallLog.Record> callRecords) {
+    public UiCallLog(String title, String text, String number, @Nullable String initials,
+            Uri avatarUri, List<PhoneCallLog.Record> callRecords) {
         mTitle = title;
         mText = text;
         mNumber = number;
+        mInitials = initials;
         mAvatarUri = avatarUri;
         mCallRecords = new ArrayList<>(callRecords);
     }
 
     /**
+     * Returns the initials of a call log item. Returns null if this item is not a contact.
+     */
+    @Nullable
+    public String getInitials() {
+        return mInitials;
+    }
+
+    /**
      * Returns the title of a call log item.
      */
     public String getTitle() {
@@ -73,6 +86,7 @@
     }
 
     /** Returns the avatar of the contact associated with the number. */
+    @Nullable
     public Uri getAvatarUri() {
         return mAvatarUri;
     }
diff --git a/src/com/android/car/dialer/ui/contact/ContactDetailsAdapter.java b/src/com/android/car/dialer/ui/contact/ContactDetailsAdapter.java
index 4bb9c39..bd3fe20 100644
--- a/src/com/android/car/dialer/ui/contact/ContactDetailsAdapter.java
+++ b/src/com/android/car/dialer/ui/contact/ContactDetailsAdapter.java
@@ -29,6 +29,7 @@
 import com.android.car.dialer.log.L;
 import com.android.car.telephony.common.Contact;
 import com.android.car.telephony.common.PhoneNumber;
+import com.android.car.telephony.common.PostalAddress;
 
 import java.util.ArrayList;
 
@@ -37,7 +38,8 @@
     private static final String TAG = "CD.ContactDetailsAdapter";
 
     private static final int ID_HEADER = 1;
-    private static final int ID_CONTENT = 2;
+    private static final int ID_NUMBER = 2;
+    private static final int ID_ADDRESS = 3;
 
     interface PhoneNumberPresenter {
         void onClick(Contact contact, PhoneNumber phoneNumber);
@@ -65,6 +67,9 @@
         mItems.add(contact);
         if (contact != null) {
             mItems.addAll(contact.getNumbers());
+            if (mContext.getResources().getBoolean(R.bool.config_show_postal_address)) {
+                mItems.addAll(contact.getPostalAddresses());
+            }
         }
         notifyDataSetChanged();
     }
@@ -74,8 +79,13 @@
         Object obj = mItems.get(position);
         if (obj == null || obj instanceof Contact) {
             return ID_HEADER;
+        } else if (obj instanceof PhoneNumber) {
+            return ID_NUMBER;
+        } else if (obj instanceof PostalAddress) {
+            return ID_ADDRESS;
         } else {
-            return ID_CONTENT;
+            L.w(TAG, "Unknown view type");
+            return -1;
         }
     }
 
@@ -91,11 +101,14 @@
             case ID_HEADER:
                 layoutResId = R.layout.contact_details_name_image;
                 break;
-            case ID_CONTENT:
+            case ID_NUMBER:
                 layoutResId = R.layout.contact_details_number;
                 break;
+            case ID_ADDRESS:
+                layoutResId = R.layout.contact_details_address;
+                break;
             default:
-                L.e(TAG, "Unknown view type: %d", viewType);
+                L.w(TAG, "Unknown view type: %d", viewType);
                 return null;
         }
 
@@ -110,11 +123,14 @@
             case ID_HEADER:
                 viewHolder.bind(mContext, (Contact) mItems.get(position));
                 break;
-            case ID_CONTENT:
+            case ID_NUMBER:
                 viewHolder.bind(mContext, mContact, (PhoneNumber) mItems.get(position));
                 break;
+            case ID_ADDRESS:
+                viewHolder.bind(mContext, (PostalAddress) mItems.get(position));
+                break;
             default:
-                L.e(TAG, "Unknown view type %d ", viewHolder.getItemViewType());
+                L.w(TAG, "Unknown view type %d ", viewHolder.getItemViewType());
                 return;
         }
     }
diff --git a/src/com/android/car/dialer/ui/contact/ContactDetailsFragment.java b/src/com/android/car/dialer/ui/contact/ContactDetailsFragment.java
index 9d0c63b..a301393 100644
--- a/src/com/android/car/dialer/ui/contact/ContactDetailsFragment.java
+++ b/src/com/android/car/dialer/ui/contact/ContactDetailsFragment.java
@@ -16,25 +16,32 @@
 
 package com.android.car.dialer.ui.contact;
 
-import android.app.ActionBar;
+import android.graphics.Bitmap;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
 import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.Menu;
 import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.graphics.drawable.RoundedBitmapDrawable;
+import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.ViewModelProviders;
 
+import com.android.car.apps.common.LetterTileDrawable;
+import com.android.car.arch.common.FutureData;
 import com.android.car.dialer.R;
 import com.android.car.dialer.ui.common.DialerListBaseFragment;
-import com.android.car.dialer.ui.common.DialerUtils;
-import com.android.car.dialer.ui.view.ContactAvatarOutputlineProvider;
 import com.android.car.telephony.common.Contact;
 import com.android.car.telephony.common.PhoneNumber;
 import com.android.car.telephony.common.TelecomUtils;
+import com.android.car.ui.toolbar.Toolbar;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
+import com.bumptech.glide.request.target.SimpleTarget;
+import com.bumptech.glide.request.transition.Transition;
 
 /**
  * A fragment that shows the name of the contact, the photo and all listed phone numbers. It is
@@ -50,13 +57,15 @@
     private static final String KEY_CONTACT_ENTITY = "ContactEntity";
 
     private Contact mContact;
-    private LiveData<Contact> mContactDetailsLiveData;
-    private View mActionBarView;
-    private ImageView mAvatarView;
-    private TextView mNameView;
+    private LiveData<FutureData<Contact>> mContactDetailsLiveData;
     private ContactDetailsViewModel mContactDetailsViewModel;
 
-    /** Creates a new ContactDetailsFragment using a {@link Contact}. */
+    private boolean mShowActionBarView;
+    private boolean mShowActionBarAvatar;
+
+    /**
+     * Creates a new ContactDetailsFragment using a {@link Contact}.
+     */
     public static ContactDetailsFragment newInstance(Contact contact) {
         ContactDetailsFragment fragment = new ContactDetailsFragment();
         Bundle args = new Bundle();
@@ -68,7 +77,6 @@
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setHasOptionsMenu(true);
 
         mContact = getArguments().getParcelable(KEY_CONTACT_ENTITY);
         if (mContact == null && savedInstanceState != null) {
@@ -78,16 +86,10 @@
                 ContactDetailsViewModel.class);
         mContactDetailsLiveData = mContactDetailsViewModel.getContactDetails(mContact);
 
-        mActionBarView = LayoutInflater.from(getContext()).inflate(
-                R.layout.contact_details_action_bar, null);
-        mAvatarView = mActionBarView.findViewById(R.id.contact_details_action_bar_avatar);
-        mNameView = mActionBarView.findViewById(R.id.contact_details_action_bar_name);
-    }
-
-    @Override
-    public void onPrepareOptionsMenu(Menu menu) {
-        menu.findItem(R.id.menu_contacts_search).setVisible(false);
-        menu.findItem(R.id.menu_dialer_setting).setVisible(false);
+        mShowActionBarView = getResources().getBoolean(
+                R.bool.config_show_contact_details_action_bar_view);
+        mShowActionBarAvatar = getResources().getBoolean(
+                R.bool.config_show_contact_details_action_bar_avatar);
     }
 
     @Override
@@ -95,57 +97,85 @@
         ContactDetailsAdapter contactDetailsAdapter = new ContactDetailsAdapter(getContext(),
                 mContact, this);
         getRecyclerView().setAdapter(contactDetailsAdapter);
-        if (!DialerUtils.isShortScreen(getContext())) {
-            getRecyclerView().setScrollBarPadding(getTopBarHeight(), 0);
-        }
         mContactDetailsLiveData.observe(this, contact -> {
-            mContact = contact;
-            onContactChanged(contact);
-            contactDetailsAdapter.setContact(contact);
+            if (contact.isLoading()) {
+                showLoading();
+            } else {
+                onContactChanged(contact.getData());
+                contactDetailsAdapter.setContact(contact.getData());
+                showContent();
+            }
         });
     }
 
     private void onContactChanged(Contact contact) {
         getArguments().clear();
-        if (mAvatarView != null) {
-            mAvatarView.setOutlineProvider(ContactAvatarOutputlineProvider.get());
-            TelecomUtils.setContactBitmapAsync(getContext(), mAvatarView, contact, null);
-        }
+        Toolbar toolbar = getActivity().findViewById(R.id.car_ui_toolbar);
+        toolbar.setTitle(null);
+        toolbar.setLogo(null);
+        if (mShowActionBarView) {
+            toolbar.setTitle(contact == null ? getString(R.string.error_contact_deleted)
+                    : contact.getDisplayName());
+            if (mShowActionBarAvatar) {
+                int avatarSize = getResources().getDimensionPixelSize(
+                        R.dimen.contact_details_action_bar_avatar_size);
+                LetterTileDrawable letterTile = TelecomUtils.createLetterTile(getContext(),
+                        contact == null ? null : contact.getInitials(),
+                        contact == null ? null : contact.getDisplayName());
+                Uri avatarUri = contact == null ? null : contact.getAvatarUri();
+                Glide.with(this)
+                        .asBitmap()
+                        .load(avatarUri)
+                        .apply(new RequestOptions().override(avatarSize).error(letterTile))
+                        .into(new SimpleTarget<Bitmap>() {
+                            @Override
+                            public void onResourceReady(Bitmap bitmap,
+                                    Transition<? super Bitmap> transition) {
+                                RoundedBitmapDrawable roundedBitmapDrawable = createFromBitmap(
+                                        bitmap, avatarSize);
+                                toolbar.setLogo(roundedBitmapDrawable);
+                            }
 
-        if (mNameView != null) {
-            if (contact != null) {
-                mNameView.setText(contact.getDisplayName());
-            } else {
-                mNameView.setText(R.string.error_contact_deleted);
+                            @Override
+                            public void onLoadFailed(@Nullable Drawable errorDrawable) {
+                                RoundedBitmapDrawable roundedBitmapDrawable = createFromLetterTile(
+                                        letterTile, avatarSize);
+                                toolbar.setLogo(roundedBitmapDrawable);
+                            }
+                        });
             }
         }
     }
 
     @Override
-    public void setupActionBar(@NonNull ActionBar actionBar) {
-        actionBar.setCustomView(mActionBarView);
-        actionBar.setTitle(null);
+    public void setupToolbar(@NonNull Toolbar toolbar) {
+        toolbar.setState(getToolbarState());
+        toolbar.setMenuItems(null);
 
-        // Remove the action bar background on non-short screens
-        // On short screens the avatar and name is in the action bar so we keep it
-        if (mAvatarView == null) {
-            setActionBarBackground(null);
+        // Remove the tool bar background if we don't show the action bar view.
+        if (!mShowActionBarView) {
+            setShowToolbarBackground(false);
         }
     }
 
     @Override
-    protected int getTopOffset() {
-        if (DialerUtils.isShortScreen(getContext())) {
-            return super.getTopOffset();
+    public void onToolbarHeightChange(int toolbarHeight) {
+        if (mShowActionBarView) {
+            super.onToolbarHeightChange(toolbarHeight);
         } else {
-            return 0;
+            getRecyclerView().setScrollBarPadding(toolbarHeight, 0);
         }
     }
 
     @Override
+    protected Toolbar.State getToolbarState() {
+        return Toolbar.State.SUBPAGE;
+    }
+
+    @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
-        outState.putParcelable(KEY_CONTACT_ENTITY, mContactDetailsLiveData.getValue());
+        outState.putParcelable(KEY_CONTACT_ENTITY, mContact);
     }
 
     @Override
@@ -157,4 +187,19 @@
             mContactDetailsViewModel.addToFavorite(contact, phoneNumber);
         }
     }
+
+    private RoundedBitmapDrawable createFromLetterTile(LetterTileDrawable letterTileDrawable,
+            int avatarSize) {
+        return createFromBitmap(letterTileDrawable.toBitmap(avatarSize), avatarSize);
+    }
+
+    private RoundedBitmapDrawable createFromBitmap(Bitmap bitmap, int avatarSize) {
+        RoundedBitmapDrawable roundedBitmapDrawable = RoundedBitmapDrawableFactory.create(
+                getResources(), bitmap);
+        float radiusPercent = getResources()
+                .getFloat(R.dimen.contact_avatar_corner_radius_percent);
+        float radius = avatarSize * radiusPercent;
+        roundedBitmapDrawable.setCornerRadius(radius);
+        return roundedBitmapDrawable;
+    }
 }
diff --git a/src/com/android/car/dialer/ui/contact/ContactDetailsViewHolder.java b/src/com/android/car/dialer/ui/contact/ContactDetailsViewHolder.java
index 44e6405..0ffe3f9 100644
--- a/src/com/android/car/dialer/ui/contact/ContactDetailsViewHolder.java
+++ b/src/com/android/car/dialer/ui/contact/ContactDetailsViewHolder.java
@@ -17,7 +17,10 @@
 package com.android.car.dialer.ui.contact;
 
 import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
+import android.net.Uri;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -34,6 +37,7 @@
 import com.android.car.dialer.ui.view.ContactAvatarOutputlineProvider;
 import com.android.car.telephony.common.Contact;
 import com.android.car.telephony.common.PhoneNumber;
+import com.android.car.telephony.common.PostalAddress;
 import com.android.car.telephony.common.TelecomUtils;
 
 import com.bumptech.glide.Glide;
@@ -41,7 +45,9 @@
 import com.bumptech.glide.request.target.SimpleTarget;
 import com.bumptech.glide.request.transition.Transition;
 
-/** ViewHolder for {@link ContactDetailsFragment}. */
+/**
+ * ViewHolder for {@link ContactDetailsFragment}.
+ */
 class ContactDetailsViewHolder extends RecyclerView.ViewHolder {
     // Applies to all
     @NonNull
@@ -53,14 +59,22 @@
     @Nullable
     private final BackgroundImageView mBackgroundImageView;
 
-    // Applies to phone number items
+    // Applies to phone number items and address items
     @Nullable
     private final TextView mText;
+
+    // Applies to phone number items
     @Nullable
     private final View mCallActionView;
     @Nullable
     private final View mFavoriteActionView;
 
+    // Applies to address items
+    @Nullable
+    private final View mAddressView;
+    @Nullable
+    private final View mNavigationButton;
+
     @NonNull
     private final ContactDetailsAdapter.PhoneNumberPresenter mPhoneNumberPresenter;
 
@@ -70,6 +84,8 @@
         super(v);
         mCallActionView = v.findViewById(R.id.call_action_id);
         mFavoriteActionView = v.findViewById(R.id.contact_details_favorite_button);
+        mAddressView = v.findViewById(R.id.address_button);
+        mNavigationButton = v.findViewById(R.id.navigation_button);
         mTitle = v.findViewById(R.id.title);
         mText = v.findViewById(R.id.text);
         mAvatarView = v.findViewById(R.id.avatar);
@@ -84,7 +100,7 @@
     public void bind(Context context, Contact contact) {
         if (contact == null) {
             ViewUtils.setText(mTitle, R.string.error_contact_deleted);
-            LetterTileDrawable letterTile = TelecomUtils.createLetterTile(context, null);
+            LetterTileDrawable letterTile = TelecomUtils.createLetterTile(context, null, null);
             if (mAvatarView != null) {
                 mAvatarView.setImageDrawable(letterTile);
             }
@@ -103,7 +119,7 @@
         }
 
         LetterTileDrawable letterTile = TelecomUtils.createLetterTile(context,
-                contact.getDisplayName());
+                contact.getInitials(), contact.getDisplayName());
         Glide.with(context)
                 .load(contact.getAvatarUri())
                 .apply(new RequestOptions().centerCrop().error(letterTile))
@@ -117,7 +133,7 @@
                         if (mBackgroundImageView != null) {
                             mBackgroundImageView.setAlpha(context.getResources().getFloat(
                                     R.dimen.config_background_image_alpha));
-                            mBackgroundImageView.setBackgroundDrawable(resource);
+                            mBackgroundImageView.setBackgroundDrawable(resource, false);
                         }
                     }
 
@@ -157,4 +173,22 @@
             mFavoriteActionView.setActivated(!mFavoriteActionView.isActivated());
         });
     }
+
+    public void bind(Context context, @NonNull PostalAddress postalAddress) {
+        String address = postalAddress.getFormattedAddress();
+        Resources resources = context.getResources();
+
+        mTitle.setText(address);
+        ViewUtils.setText(mText, postalAddress.getReadableLabel(resources));
+
+        mAddressView.setOnClickListener(
+                v -> openMapWithAddressUri(context, postalAddress.getAddressUri(resources)));
+        mNavigationButton.setOnClickListener(
+                v -> openMapWithAddressUri(context, postalAddress.getNavigationUri(resources)));
+    }
+
+    private void openMapWithAddressUri(Context context, Uri addressUri) {
+        Intent mapIntent = new Intent(Intent.ACTION_VIEW, addressUri);
+        context.startActivity(mapIntent);
+    }
 }
diff --git a/src/com/android/car/dialer/ui/contact/ContactDetailsViewModel.java b/src/com/android/car/dialer/ui/contact/ContactDetailsViewModel.java
index 8cbf6b5..cbac338 100644
--- a/src/com/android/car/dialer/ui/contact/ContactDetailsViewModel.java
+++ b/src/com/android/car/dialer/ui/contact/ContactDetailsViewModel.java
@@ -17,9 +17,7 @@
 package com.android.car.dialer.ui.contact;
 
 import android.app.Application;
-import android.content.ContentUris;
 import android.content.Context;
-import android.database.Cursor;
 import android.net.Uri;
 import android.provider.ContactsContract;
 
@@ -28,18 +26,21 @@
 import androidx.lifecycle.AndroidViewModel;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MediatorLiveData;
-import androidx.lifecycle.MutableLiveData;
 
+import com.android.car.arch.common.FutureData;
+import com.android.car.arch.common.LiveDataFunctions;
 import com.android.car.dialer.storage.FavoriteNumberRepository;
-import com.android.car.dialer.widget.WorkerExecutor;
 import com.android.car.telephony.common.Contact;
 import com.android.car.telephony.common.InMemoryPhoneBook;
 import com.android.car.telephony.common.PhoneNumber;
+import com.android.car.telephony.common.WorkerExecutor;
 
 import java.util.List;
 import java.util.concurrent.Future;
 
-/** View model for the contact details page. */
+/**
+ * View model for the contact details page.
+ */
 public class ContactDetailsViewModel extends AndroidViewModel {
     private final FavoriteNumberRepository mFavoriteNumberRepository;
 
@@ -56,14 +57,14 @@
      *                InMemoryPhoneBook} changes. It always uses the in memory instance to get the
      *                favorite state for phone numbers.
      */
-    public LiveData<Contact> getContactDetails(@Nullable Contact contact) {
+    public LiveData<FutureData<Contact>> getContactDetails(@Nullable Contact contact) {
         if (contact == null) {
-            MutableLiveData<Contact> deletedContactDetailsLiveData = new MutableLiveData<>();
-            deletedContactDetailsLiveData.setValue(null);
-            return deletedContactDetailsLiveData;
+            return LiveDataFunctions.dataOf(new FutureData<>(false, null));
         }
 
-        return new ContactDetailsLiveData(getApplication(), contact);
+        LiveData<Contact> contactLiveData = new ContactDetailsLiveData(getApplication(), contact);
+        return LiveDataFunctions.loadingSwitchMap(contactLiveData,
+                input -> LiveDataFunctions.dataOf(input));
     }
 
     /**
@@ -87,30 +88,32 @@
     }
 
     private class ContactDetailsLiveData extends MediatorLiveData<Contact> {
+        private final Uri mContactLookupUri;
+        private final String mAccountName;
         private final WorkerExecutor mWorkerExecutor;
         private final Context mContext;
         private Contact mContact;
         private Future<?> mRunnableFuture;
 
-        private ContactDetailsLiveData(Context context, Contact contact) {
+        private ContactDetailsLiveData(Context context, @NonNull Contact contact) {
             mContext = context;
             mWorkerExecutor = WorkerExecutor.getInstance();
             mContact = contact;
+            mContactLookupUri = mContact.getLookupUri();
+            mAccountName = mContact.getAccountName();
             addSource(InMemoryPhoneBook.get().getContactsLiveData(), this::onContactListChanged);
             addSource(mFavoriteNumberRepository.getFavoriteContacts(),
                     this::onFavoriteContactsChanged);
         }
 
         private void onContactListChanged(List<Contact> contacts) {
-            if (mContact == null) {
-                return;
-            }
-
-            Contact inMemoryContact = InMemoryPhoneBook.get().lookupContactByKey(
-                    mContact.getLookupKey());
-            if (inMemoryContact != null) {
-                setValue(inMemoryContact);
-                return;
+            if (mContact != null) {
+                Contact inMemoryContact = InMemoryPhoneBook.get().lookupContactByKey(
+                        mContact.getLookupKey(), mContact.getAccountName());
+                if (inMemoryContact != null) {
+                    setValue(inMemoryContact);
+                    return;
+                }
             }
 
             if (mRunnableFuture != null) {
@@ -119,32 +122,18 @@
             mRunnableFuture = mWorkerExecutor.getSingleThreadExecutor().submit(
                     () -> {
                         Uri refreshedContactLookupUri = ContactsContract.Contacts.getLookupUri(
-                                mContext.getContentResolver(), mContact.getLookupUri());
+                                mContext.getContentResolver(),
+                                mContact == null ? mContactLookupUri : mContact.getLookupUri());
                         if (refreshedContactLookupUri == null) {
                             postValue(null);
                             return;
                         }
-                        long contactId = ContentUris.parseId(refreshedContactLookupUri);
-                        try (Cursor cursor = mContext.getContentResolver().query(
-                                ContactsContract.CommonDataKinds.Phone.CONTENT_URI,
-                                /* projection= */null,
-                                /* selection= */
-                                ContactsContract.CommonDataKinds.Phone.CONTACT_ID + " = ? ",
-                                new String[]{String.valueOf(contactId)},
-                                /* orderBy= */null)) {
-                            if (cursor == null) {
-                                postValue(null);
-                                return;
-                            }
 
-                            if (cursor.moveToFirst()) {
-                                String lookupKey = cursor.getString(cursor.getColumnIndex(
-                                        ContactsContract.CommonDataKinds.Phone.LOOKUP_KEY));
-                                Contact contact = InMemoryPhoneBook.get().lookupContactByKey(
-                                        lookupKey);
-                                postValue(contact);
-                            }
-                        }
+                        List<String> pathSegments = refreshedContactLookupUri.getPathSegments();
+                        String lookupKey = pathSegments.get(pathSegments.size() - 2);
+                        Contact contact = InMemoryPhoneBook.get().lookupContactByKey(lookupKey,
+                                mContact == null ? mAccountName : mContact.getAccountName());
+                        postValue(contact);
                     }
             );
         }
@@ -154,7 +143,7 @@
                 return;
             }
             Contact inMemoryContact = InMemoryPhoneBook.get().lookupContactByKey(
-                    mContact.getLookupKey());
+                    mContact.getLookupKey(), mContact.getAccountName());
             setValue(inMemoryContact);
         }
 
diff --git a/src/com/android/car/dialer/ui/contact/ContactListAdapter.java b/src/com/android/car/dialer/ui/contact/ContactListAdapter.java
index 67b7242..17a9076 100644
--- a/src/com/android/car/dialer/ui/contact/ContactListAdapter.java
+++ b/src/com/android/car/dialer/ui/contact/ContactListAdapter.java
@@ -32,7 +32,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/** Adapter for contact list. */
+/**
+ * Adapter for contact list.
+ */
 public class ContactListAdapter extends RecyclerView.Adapter<ContactListViewHolder> {
     private static final String TAG = "CD.ContactListAdapter";
 
@@ -79,7 +81,7 @@
 
         boolean showHeader = position == 0
                 || (!header.equals(getHeader(mContactList.get(position - 1))));
-        holder.onBind(contact, showHeader, header);
+        holder.bind(contact, showHeader, header);
     }
 
     @Override
@@ -87,6 +89,12 @@
         return mContactList.size();
     }
 
+    @Override
+    public void onViewRecycled(@NonNull ContactListViewHolder holder) {
+        super.onViewRecycled(holder);
+        holder.recycle();
+    }
+
     private String getHeader(Contact contact) {
         String label;
         if (mSortMethod.equals(ContactSortingInfo.SORT_BY_LAST_NAME)) {
diff --git a/src/com/android/car/dialer/ui/contact/ContactListFragment.java b/src/com/android/car/dialer/ui/contact/ContactListFragment.java
index bf752c9..d638b6c 100644
--- a/src/com/android/car/dialer/ui/contact/ContactListFragment.java
+++ b/src/com/android/car/dialer/ui/contact/ContactListFragment.java
@@ -24,6 +24,8 @@
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProviders;
 
+import com.android.car.dialer.Constants;
+import com.android.car.dialer.R;
 import com.android.car.dialer.ui.common.DialerListBaseFragment;
 import com.android.car.telephony.common.Contact;
 
@@ -51,7 +53,17 @@
 
         ContactListViewModel contactListViewModel = ViewModelProviders.of(this).get(
                 ContactListViewModel.class);
-        contactListViewModel.getAllContacts().observe(this, mContactListAdapter::setContactList);
+        contactListViewModel.getAllContacts().observe(this, contacts -> {
+            if (contacts.isLoading()) {
+                showLoading();
+            } else if (contacts.getData() == null) {
+                showEmpty(Constants.INVALID_RES_ID, R.string.contact_list_empty,
+                        R.string.available_after_sync);
+            } else {
+                mContactListAdapter.setContactList(contacts.getData());
+                showContent();
+            }
+        });
     }
 
     @Override
diff --git a/src/com/android/car/dialer/ui/contact/ContactListViewHolder.java b/src/com/android/car/dialer/ui/contact/ContactListViewHolder.java
index 0596b76..8a35f87 100644
--- a/src/com/android/car/dialer/ui/contact/ContactListViewHolder.java
+++ b/src/com/android/car/dialer/ui/contact/ContactListViewHolder.java
@@ -64,21 +64,19 @@
     /**
      * Binds the view holder with relevant data.
      */
-    public void onBind(Contact contact, boolean showHeader, String header) {
-        TelecomUtils.setContactBitmapAsync(mAvatarView.getContext(), mAvatarView, contact, null);
+    public void bind(Contact contact, boolean showHeader, String header) {
+        TelecomUtils.setContactBitmapAsync(mAvatarView.getContext(), mAvatarView, contact);
         ViewUtils.setVisible(mHeaderView, showHeader);
         if (showHeader) {
             ViewUtils.setText(mHeaderView, header);
         }
         mTitleView.setText(contact.getDisplayName());
         setLabelText(contact);
-        mShowContactDetailView.setOnClickListener(
-                view -> mOnShowContactDetailListener.onShowContactDetail(contact));
-        mCallActionView.setOnClickListener(view -> {
-            DialerUtils.promptForPrimaryNumber(itemView.getContext(), contact,
-                    (phoneNumber, always) -> UiCallManager.get().placeCall(
-                            phoneNumber.getRawNumber()));
-        });
+
+        boolean forceShowButton = itemView.getResources().getBoolean(
+                R.bool.config_show_contact_detail_button_for_empty_contact);
+        setCallActionView(contact, forceShowButton);
+        setShowContactDetailView(contact, forceShowButton);
     }
 
     private void setLabelText(Contact contact) {
@@ -101,4 +99,58 @@
 
         mTextView.setText(readableLabel);
     }
+
+    private void setCallActionView(Contact contact, boolean forceShowButton) {
+        if (mCallActionView == null) {
+            return;
+        }
+
+        boolean hasPhoneNumbers = contact != null && !contact.getNumbers().isEmpty();
+
+        ViewUtils.setEnabled(mCallActionView, hasPhoneNumbers);
+        ViewUtils.setVisible(mCallActionView, hasPhoneNumbers || forceShowButton);
+
+        if (hasPhoneNumbers) {
+            ViewUtils.setOnClickListener(mCallActionView, view -> {
+                DialerUtils.promptForPrimaryNumber(itemView.getContext(), contact,
+                        (phoneNumber, always) -> UiCallManager.get().placeCall(
+                                phoneNumber.getRawNumber()));
+            });
+        }  else {
+            ViewUtils.setOnClickListener(mCallActionView, null);
+        }
+    }
+
+    private void setShowContactDetailView(Contact contact, boolean forceShowButton) {
+        if (mShowContactDetailView == null) {
+            return;
+        }
+
+        boolean hasContactDetail = contact != null
+                && (!contact.getNumbers().isEmpty() || hasPostalAddress(contact));
+
+        ViewUtils.setEnabled(mShowContactDetailView, hasContactDetail);
+        ViewUtils.setVisible(mShowContactDetailView, hasContactDetail || forceShowButton);
+
+        if (hasContactDetail) {
+            ViewUtils.setOnClickListener(mShowContactDetailView,
+                    view -> mOnShowContactDetailListener.onShowContactDetail(contact));
+        } else {
+            ViewUtils.setOnClickListener(mShowContactDetailView, null);
+        }
+    }
+
+    private boolean hasPostalAddress(@NonNull Contact contact) {
+        boolean showPostalAddress = itemView.getResources().getBoolean(
+                R.bool.config_show_postal_address);
+        return showPostalAddress && (!contact.getPostalAddresses().isEmpty());
+    }
+
+    /**
+     * Recycles views.
+     */
+    public void recycle() {
+        ViewUtils.setOnClickListener(mCallActionView, null);
+        ViewUtils.setOnClickListener(mShowContactDetailView, null);
+    }
 }
diff --git a/src/com/android/car/dialer/ui/contact/ContactListViewModel.java b/src/com/android/car/dialer/ui/contact/ContactListViewModel.java
index b8df331..9ff50ef 100644
--- a/src/com/android/car/dialer/ui/contact/ContactListViewModel.java
+++ b/src/com/android/car/dialer/ui/contact/ContactListViewModel.java
@@ -25,16 +25,19 @@
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MediatorLiveData;
 
+import com.android.car.arch.common.FutureData;
+import com.android.car.arch.common.LiveDataFunctions;
 import com.android.car.dialer.R;
 import com.android.car.dialer.livedata.SharedPreferencesLiveData;
 import com.android.car.dialer.ui.common.entity.ContactSortingInfo;
-import com.android.car.dialer.widget.WorkerExecutor;
 import com.android.car.telephony.common.Contact;
 import com.android.car.telephony.common.InMemoryPhoneBook;
 
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
 /**
@@ -43,6 +46,7 @@
 public class ContactListViewModel extends AndroidViewModel {
     private final Context mContext;
     private final LiveData<Pair<Integer, List<Contact>>> mSortedContactListLiveData;
+    private final LiveData<FutureData<Pair<Integer, List<Contact>>>> mContactList;
 
     public ContactListViewModel(@NonNull Application application) {
         super(application);
@@ -53,13 +57,15 @@
         LiveData<List<Contact>> contactListLiveData = InMemoryPhoneBook.get().getContactsLiveData();
         mSortedContactListLiveData = new SortedContactListLiveData(
                 mContext, contactListLiveData, preferencesLiveData);
+        mContactList = LiveDataFunctions.loadingSwitchMap(mSortedContactListLiveData,
+                input -> LiveDataFunctions.dataOf(input));
     }
 
     /**
      * Returns a live data which represents a list of all contacts.
      */
-    public LiveData<Pair<Integer, List<Contact>>> getAllContacts() {
-        return mSortedContactListLiveData;
+    public LiveData<FutureData<Pair<Integer, List<Contact>>>> getAllContacts() {
+        return mContactList;
     }
 
     private static class SortedContactListLiveData
@@ -69,6 +75,7 @@
         private final SharedPreferencesLiveData mPreferencesLiveData;
         private final Context mContext;
 
+        private final ExecutorService mExecutorService;
         private Future<?> mRunnableFuture;
 
         private SortedContactListLiveData(Context context,
@@ -77,13 +84,20 @@
             mContext = context;
             mContactListLiveData = contactListLiveData;
             mPreferencesLiveData = sharedPreferencesLiveData;
+            mExecutorService = Executors.newSingleThreadExecutor();
 
             addSource(mPreferencesLiveData, (trigger) -> updateSortedContactList());
             addSource(mContactListLiveData, (trigger) -> updateSortedContactList());
         }
 
         private void updateSortedContactList() {
-            if (mContactListLiveData.getValue() == null) {
+            // Don't set null value to trigger an update when there is no value set.
+            if (mContactListLiveData.getValue() == null && getValue() == null) {
+                return;
+            }
+
+            if (mContactListLiveData.getValue() == null
+                    || mContactListLiveData.getValue().isEmpty()) {
                 setValue(null);
                 return;
             }
@@ -104,8 +118,7 @@
                 Collections.sort(contactList, comparator);
                 postValue(new Pair<>(sortMethod, contactList));
             };
-            mRunnableFuture = WorkerExecutor.getInstance().getSingleThreadExecutor().submit(
-                    runnable);
+            mRunnableFuture = mExecutorService.submit(runnable);
         }
 
         @Override
diff --git a/src/com/android/car/dialer/ui/dialpad/DialpadFragment.java b/src/com/android/car/dialer/ui/dialpad/DialpadFragment.java
index aa22ba2..4438980 100644
--- a/src/com/android/car/dialer/ui/dialpad/DialpadFragment.java
+++ b/src/com/android/car/dialer/ui/dialpad/DialpadFragment.java
@@ -16,7 +16,6 @@
 
 package com.android.car.dialer.ui.dialpad;
 
-import android.app.ActionBar;
 import android.media.AudioManager;
 import android.media.ToneGenerator;
 import android.os.Bundle;
@@ -43,11 +42,14 @@
 import com.android.car.telephony.common.InMemoryPhoneBook;
 import com.android.car.telephony.common.PhoneNumber;
 import com.android.car.telephony.common.TelecomUtils;
+import com.android.car.ui.toolbar.Toolbar;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableMap;
 
-/** Fragment that controls the dialpad. */
+/**
+ * Fragment that controls the dialpad.
+ */
 public class DialpadFragment extends AbstractDialpadFragment {
     private static final String TAG = "CD.DialpadFragment";
 
@@ -96,7 +98,9 @@
         return fragment;
     }
 
-    /** Creates a new instance used for emergency dialing. */
+    /**
+     * Creates a new instance used for emergency dialing.
+     */
     public static DialpadFragment newEmergencyDialpad() {
         return newDialpad(MODE_EMERGENCY);
     }
@@ -122,8 +126,6 @@
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
         View rootView = inflater.inflate(R.layout.dialpad_fragment, container, false);
-        // Offset the dialpad to under the tabs in normal dial mode.
-        rootView.setPadding(0, getTopOffset(), 0, 0);
 
         mTitleView = rootView.findViewById(R.id.title);
         mTitleView.setTextAppearance(
@@ -172,12 +174,12 @@
     }
 
     @Override
-    public void setupActionBar(ActionBar actionBar) {
+    public void setupToolbar(Toolbar toolbar) {
         // Only setup the actionbar if we're in dial mode.
         // In all the other modes, there will be another fragment in the activity
         // at the same time, and we don't want to mess up it's action bar.
         if (mMode == MODE_DIAL) {
-            super.setupActionBar(actionBar);
+            super.setupToolbar(toolbar);
         }
     }
 
@@ -214,7 +216,7 @@
 
     @Override
     void presentDialedNumber(@NonNull StringBuffer number) {
-        if (getActivity() == null) {
+        if (getView() == null) {
             return;
         }
 
@@ -239,6 +241,12 @@
         presentContactInfo(number.toString());
     }
 
+    @Override
+    public void onToolbarHeightChange(int toolbarHeight) {
+        // Offset the dialpad to under the tabs in normal dial mode.
+        getView().setPadding(0, mMode == MODE_DIAL ? toolbarHeight : 0, 0, 0);
+    }
+
     private void presentContactInfo(@NonNull String number) {
         Contact contact = InMemoryPhoneBook.get().lookupContactEntry(number);
         ViewUtils.setText(mDisplayName, contact == null ? "" : contact.getDisplayName());
@@ -258,9 +266,7 @@
                 R.string.primary_number_description, readableLabel) : readableLabel);
         ViewUtils.setVisible(mLabel, true);
 
-        if (mAvatar != null) {
-            TelecomUtils.setContactBitmapAsync(getContext(), mAvatar, contact, null);
-        }
+        TelecomUtils.setContactBitmapAsync(getContext(), mAvatar, contact);
         ViewUtils.setVisible(mAvatar, true);
     }
 
@@ -268,11 +274,4 @@
         ViewUtils.setVisible(mLabel, false);
         ViewUtils.setVisible(mAvatar, false);
     }
-
-    private int getTopOffset() {
-        if (mMode == MODE_DIAL) {
-            return getTopBarHeight();
-        }
-        return 0;
-    }
 }
diff --git a/src/com/android/car/dialer/ui/dialpad/InCallDialpadFragment.java b/src/com/android/car/dialer/ui/dialpad/InCallDialpadFragment.java
index 55af3a1..22079c9 100644
--- a/src/com/android/car/dialer/ui/dialpad/InCallDialpadFragment.java
+++ b/src/com/android/car/dialer/ui/dialpad/InCallDialpadFragment.java
@@ -16,7 +16,6 @@
 
 package com.android.car.dialer.ui.dialpad;
 
-import android.app.ActionBar;
 import android.os.Bundle;
 import android.os.SystemClock;
 import android.telecom.Call;
@@ -35,6 +34,7 @@
 import com.android.car.dialer.log.L;
 import com.android.car.dialer.ui.activecall.InCallViewModel;
 import com.android.car.telephony.common.TelecomUtils;
+import com.android.car.ui.toolbar.Toolbar;
 
 /** Dialpad fragment used in the ongoing call page. */
 public class InCallDialpadFragment extends AbstractDialpadFragment {
@@ -114,7 +114,7 @@
     }
 
     @Override
-    public void setupActionBar(ActionBar actionBar) {
+    public void setupToolbar(Toolbar toolbar) {
         // No-op
     }
 
@@ -122,4 +122,9 @@
     public void onKeypadKeyLongPressed(int keycode) {
         // No-op
     }
+
+    @Override
+    public void onToolbarHeightChange(int toolbarHeight) {
+        // No-op
+    }
 }
diff --git a/src/com/android/car/dialer/ui/favorite/AddFavoriteFragment.java b/src/com/android/car/dialer/ui/favorite/AddFavoriteFragment.java
index 1ae42bc..574cee0 100644
--- a/src/com/android/car/dialer/ui/favorite/AddFavoriteFragment.java
+++ b/src/com/android/car/dialer/ui/favorite/AddFavoriteFragment.java
@@ -18,25 +18,27 @@
 
 import android.app.AlertDialog;
 import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
 
 import androidx.lifecycle.ViewModelProviders;
-import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.car.dialer.R;
 import com.android.car.dialer.ui.common.FavoritePhoneNumberListAdapter;
 import com.android.car.dialer.ui.search.ContactResultsFragment;
 import com.android.car.telephony.common.Contact;
 import com.android.car.telephony.common.PhoneNumber;
+import com.android.car.ui.AlertDialogBuilder;
 
 import java.util.HashSet;
 import java.util.Set;
 
-/** A fragment that allows the user to search for and select favorite phone numbers */
+/**
+ * A fragment that allows the user to search for and select favorite phone numbers
+ */
 public class AddFavoriteFragment extends ContactResultsFragment {
 
-    /** Creates a new instance of AddFavoriteFragment */
+    /**
+     * Creates a new instance of AddFavoriteFragment
+     */
     public static AddFavoriteFragment newInstance() {
         return new AddFavoriteFragment();
     }
@@ -64,14 +66,9 @@
                 }
         );
 
-        View dialogView = LayoutInflater.from(getContext()).inflate(
-                R.layout.add_to_favorite_dialog, null, false);
-        RecyclerView recyclerView = dialogView.findViewById(R.id.list);
-        recyclerView.setAdapter(mDialogAdapter);
-
-        mCurrentDialog = new AlertDialog.Builder(getContext())
+        mCurrentDialog = new AlertDialogBuilder(getContext())
                 .setTitle(R.string.select_number_dialog_title)
-                .setView(dialogView)
+                .setAdapter(mDialogAdapter, null)
                 .setNegativeButton(R.string.cancel_add_favorites_dialog, null)
                 .setPositiveButton(R.string.confirm_add_favorites_dialog,
                         (d, which) -> {
diff --git a/src/com/android/car/dialer/ui/favorite/FavoriteContactViewHolder.java b/src/com/android/car/dialer/ui/favorite/FavoriteContactViewHolder.java
index 93d36e2..137a150 100644
--- a/src/com/android/car/dialer/ui/favorite/FavoriteContactViewHolder.java
+++ b/src/com/android/car/dialer/ui/favorite/FavoriteContactViewHolder.java
@@ -83,6 +83,6 @@
         }
         mText.setText(secondaryText);
 
-        TelecomUtils.setContactBitmapAsync(context, mIcon, contact, null);
+        TelecomUtils.setContactBitmapAsync(context, mIcon, contact);
     }
 }
diff --git a/src/com/android/car/dialer/ui/favorite/FavoriteFragment.java b/src/com/android/car/dialer/ui/favorite/FavoriteFragment.java
index 61b3ff4..7e76f32 100644
--- a/src/com/android/car/dialer/ui/favorite/FavoriteFragment.java
+++ b/src/com/android/car/dialer/ui/favorite/FavoriteFragment.java
@@ -16,51 +16,98 @@
 
 package com.android.car.dialer.ui.favorite;
 
+import android.content.res.Resources;
+import android.graphics.Rect;
 import android.os.Bundle;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 
-import androidx.fragment.app.Fragment;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.lifecycle.ViewModelProviders;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
+import com.android.car.dialer.Constants;
 import com.android.car.dialer.R;
-import com.android.car.dialer.ui.common.DialerBaseFragment;
+import com.android.car.dialer.telecom.UiCallManager;
+import com.android.car.dialer.ui.common.DialerListBaseFragment;
+import com.android.car.dialer.ui.common.DialerUtils;
+import com.android.car.telephony.common.Contact;
 
-/** Contains either the "You haven't added any favorites yet" screen, or FavoriteListFragment */
-public class FavoriteFragment extends DialerBaseFragment {
+/**
+ * Contains a list of favorite contacts.
+ */
+public class FavoriteFragment extends DialerListBaseFragment {
 
+    /**
+     * Constructs a new {@link FavoriteFragment}
+     */
     public static FavoriteFragment newInstance() {
         return new FavoriteFragment();
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.favorite_fragment, container, false);
-        View emptyPage = view.findViewById(R.id.empty_page_container);
-        Fragment listFragment =
-                getChildFragmentManager().findFragmentById(R.id.favorite_list_fragment);
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        getRecyclerView().addItemDecoration(new ItemSpacingDecoration());
+        getRecyclerView().setItemAnimator(null);
+
+        FavoriteAdapter adapter = new FavoriteAdapter();
+        adapter.setOnAddFavoriteClickedListener(this::onAddFavoriteClicked);
 
         FavoriteViewModel favoriteViewModel = ViewModelProviders.of(getActivity()).get(
                 FavoriteViewModel.class);
+        adapter.setOnListItemClickedListener(this::onItemClicked);
         favoriteViewModel.getFavoriteContacts().observe(this, contacts -> {
-            if (contacts == null || contacts.isEmpty()) {
-                emptyPage.setVisibility(View.VISIBLE);
-                getChildFragmentManager().beginTransaction()
-                        .hide(listFragment)
-                        .commit();
+            if (contacts.isLoading()) {
+                showLoading();
+            } else if (contacts.getData() == null) {
+                showEmpty(Constants.INVALID_RES_ID, R.string.favorites_empty,
+                        R.string.no_favorites_added, R.string.add_favorite_button,
+                        v -> onAddFavoriteClicked(), true);
             } else {
-                emptyPage.setVisibility(View.GONE);
-                getChildFragmentManager().beginTransaction()
-                        .show(listFragment)
-                        .commit();
+                adapter.setFavoriteContacts(contacts.getData());
+                showContent();
             }
         });
 
-        emptyPage.findViewById(R.id.add_favorite_button).setOnClickListener(v ->
-                pushContentFragment(AddFavoriteFragment.newInstance(), null));
+        getRecyclerView().setAdapter(adapter);
+    }
 
-        return view;
+    @NonNull
+    @Override
+    protected RecyclerView.LayoutManager createLayoutManager() {
+        int numOfColumn = getContext().getResources().getInteger(
+                R.integer.favorite_fragment_grid_column);
+        return new GridLayoutManager(getContext(), numOfColumn);
+    }
+
+    private void onItemClicked(Contact contact) {
+        DialerUtils.promptForPrimaryNumber(getContext(), contact, (phoneNumber, always) ->
+                UiCallManager.get().placeCall(phoneNumber.getRawNumber()));
+    }
+
+    private void onAddFavoriteClicked() {
+        pushContentFragment(AddFavoriteFragment.newInstance(), null);
+    }
+
+    private class ItemSpacingDecoration extends RecyclerView.ItemDecoration {
+
+        @Override
+        public void getItemOffsets(@NonNull Rect outRect, @NonNull View view,
+                @NonNull RecyclerView parent, @NonNull RecyclerView.State state) {
+            super.getItemOffsets(outRect, view, parent, state);
+            Resources resources = FavoriteFragment.this.getContext().getResources();
+            int numColumns = resources.getInteger(R.integer.favorite_fragment_grid_column);
+            int leftPadding =
+                    resources.getDimensionPixelOffset(R.dimen.favorite_card_space_horizontal);
+            int verticalPadding =
+                    resources.getDimensionPixelOffset(R.dimen.favorite_card_space_vertical);
+
+            if (parent.getChildAdapterPosition(view) % numColumns == 0) {
+                leftPadding = 0;
+            }
+
+            outRect.set(leftPadding, verticalPadding, 0, verticalPadding);
+        }
     }
 }
diff --git a/src/com/android/car/dialer/ui/favorite/FavoriteListFragment.java b/src/com/android/car/dialer/ui/favorite/FavoriteListFragment.java
deleted file mode 100644
index 80e5e2c..0000000
--- a/src/com/android/car/dialer/ui/favorite/FavoriteListFragment.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-
-package com.android.car.dialer.ui.favorite;
-
-import android.content.res.Resources;
-import android.graphics.Rect;
-import android.os.Bundle;
-import android.view.View;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.ViewModelProviders;
-import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.android.car.dialer.R;
-import com.android.car.dialer.telecom.UiCallManager;
-import com.android.car.dialer.ui.common.DialerListBaseFragment;
-import com.android.car.dialer.ui.common.DialerUtils;
-import com.android.car.telephony.common.Contact;
-
-import java.util.List;
-
-/** Contains a list of favorite contacts. */
-public class FavoriteListFragment extends DialerListBaseFragment {
-
-    /** Constructs a new FavoriteListFragment */
-    public static FavoriteListFragment newInstance() {
-        return new FavoriteListFragment();
-    }
-
-    @Override
-    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        getRecyclerView().addItemDecoration(new ItemSpacingDecoration());
-        getRecyclerView().setItemAnimator(null);
-
-        FavoriteAdapter adapter = new FavoriteAdapter();
-        adapter.setOnAddFavoriteClickedListener(this::onAddFavoriteClicked);
-
-        FavoriteViewModel favoriteViewModel = ViewModelProviders.of(getActivity()).get(
-                FavoriteViewModel.class);
-        LiveData<List<Contact>> favoriteContacts = favoriteViewModel.getFavoriteContacts();
-        adapter.setOnListItemClickedListener(this::onItemClicked);
-        favoriteContacts.observe(this, adapter::setFavoriteContacts);
-
-        getRecyclerView().setAdapter(adapter);
-    }
-
-    @NonNull
-    @Override
-    protected RecyclerView.LayoutManager createLayoutManager() {
-        int numOfColumn = getContext().getResources().getInteger(
-                R.integer.favorite_fragment_grid_column);
-        return new GridLayoutManager(getContext(), numOfColumn);
-    }
-
-    private void onItemClicked(Contact contact) {
-        DialerUtils.promptForPrimaryNumber(getContext(), contact, (phoneNumber, always) ->
-                UiCallManager.get().placeCall(phoneNumber.getRawNumber()));
-    }
-
-    private void onAddFavoriteClicked() {
-        pushContentFragment(AddFavoriteFragment.newInstance(), null);
-    }
-
-    private class ItemSpacingDecoration extends RecyclerView.ItemDecoration {
-
-        @Override
-        public void getItemOffsets(@NonNull Rect outRect, @NonNull View view,
-                @NonNull RecyclerView parent, @NonNull RecyclerView.State state) {
-            super.getItemOffsets(outRect, view, parent, state);
-            Resources resources = FavoriteListFragment.this.getContext().getResources();
-            int numColumns = resources.getInteger(R.integer.favorite_fragment_grid_column);
-            int leftPadding =
-                    resources.getDimensionPixelOffset(R.dimen.favorite_card_space_horizontal);
-            int verticalPadding =
-                    resources.getDimensionPixelOffset(R.dimen.favorite_card_space_vertical);
-
-            if (parent.getChildAdapterPosition(view) % numColumns == 0) {
-                leftPadding = 0;
-            }
-
-            outRect.set(leftPadding, verticalPadding, 0, verticalPadding);
-        }
-    }
-}
diff --git a/src/com/android/car/dialer/ui/favorite/FavoriteViewModel.java b/src/com/android/car/dialer/ui/favorite/FavoriteViewModel.java
index 84f4bb3..3f55d42 100644
--- a/src/com/android/car/dialer/ui/favorite/FavoriteViewModel.java
+++ b/src/com/android/car/dialer/ui/favorite/FavoriteViewModel.java
@@ -21,6 +21,8 @@
 import androidx.lifecycle.AndroidViewModel;
 import androidx.lifecycle.LiveData;
 
+import com.android.car.arch.common.FutureData;
+import com.android.car.arch.common.LiveDataFunctions;
 import com.android.car.dialer.storage.FavoriteNumberRepository;
 import com.android.car.telephony.common.Contact;
 import com.android.car.telephony.common.PhoneNumber;
@@ -31,16 +33,20 @@
  * View model for {@link FavoriteFragment}.
  */
 public class FavoriteViewModel extends AndroidViewModel {
-    private FavoriteNumberRepository mFavoriteNumberRepository;
+    private final FavoriteNumberRepository mFavoriteNumberRepository;
+    private final LiveData<FutureData<List<Contact>>> mFavoriteContacts;
 
     public FavoriteViewModel(Application application) {
         super(application);
         mFavoriteNumberRepository = FavoriteNumberRepository.getRepository(application);
+        mFavoriteContacts = LiveDataFunctions.loadingSwitchMap(
+                mFavoriteNumberRepository.getFavoriteContacts(),
+                input -> LiveDataFunctions.dataOf(input == null || input.isEmpty() ? null : input));
     }
 
     /** Returns favorite contact list live data. */
-    public LiveData<List<Contact>> getFavoriteContacts() {
-        return mFavoriteNumberRepository.getFavoriteContacts();
+    public LiveData<FutureData<List<Contact>>> getFavoriteContacts() {
+        return mFavoriteContacts;
     }
 
     /**
diff --git a/src/com/android/car/dialer/ui/menu/MenuActionProvider.java b/src/com/android/car/dialer/ui/menu/MenuActionProvider.java
deleted file mode 100644
index 1038661..0000000
--- a/src/com/android/car/dialer/ui/menu/MenuActionProvider.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-
-package com.android.car.dialer.ui.menu;
-
-import android.content.Context;
-import android.view.ActionProvider;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.ImageView;
-
-import com.android.car.dialer.R;
-
-/**
- * Dialer's {@link ActionProvider} which provides a custom action view. Right now, it requires an
- * intent set in {@link com.android.car.dialer.ui.TelecomActivity#onCreateOptionsMenu(Menu)} and on
- * click will launch the intent.
- */
-public class MenuActionProvider extends ActionProvider {
-    private final Context mContext;
-
-    public MenuActionProvider(Context context) {
-        super(context);
-        mContext = context;
-    }
-
-    /** @deprecated in parent, see {@link ActionProvider#onCreateActionView()} */
-    @Deprecated
-    @Override
-    public View onCreateActionView() {
-        return null;
-    }
-
-    @Override
-    public View onCreateActionView(MenuItem forItem) {
-        View actionView = LayoutInflater.from(mContext).inflate(R.layout.menu_action_view, null);
-        actionView.setContentDescription(forItem.getTitle());
-        ImageView icon = actionView.findViewById(R.id.menu_icon);
-        icon.setImageDrawable(forItem.getIcon());
-        if (forItem.getIconTintMode() != null) {
-            icon.setImageTintMode(forItem.getIconTintMode());
-        }
-        if (forItem.getIconTintList() != null) {
-            icon.setImageTintList(forItem.getIconTintList());
-        }
-
-        actionView.setOnClickListener(v -> {
-            if (forItem.getIntent() != null) {
-                mContext.startActivity(forItem.getIntent());
-            }
-        });
-        return actionView;
-    }
-}
diff --git a/src/com/android/car/dialer/ui/search/ContactResultViewHolder.java b/src/com/android/car/dialer/ui/search/ContactResultViewHolder.java
index 121be99..ad1d139 100644
--- a/src/com/android/car/dialer/ui/search/ContactResultViewHolder.java
+++ b/src/com/android/car/dialer/ui/search/ContactResultViewHolder.java
@@ -59,7 +59,6 @@
                 v -> mOnShowContactDetailListener.onShowContactDetail(contact));
 
         mContactName.setText(contact.getDisplayName());
-        TelecomUtils.setContactBitmapAsync(mContext, mContactPicture, contact.getAvatarUri(),
-                contact.getDisplayName());
+        TelecomUtils.setContactBitmapAsync(mContext, mContactPicture, contact);
     }
 }
diff --git a/src/com/android/car/dialer/ui/search/ContactResultsFragment.java b/src/com/android/car/dialer/ui/search/ContactResultsFragment.java
index ae7f3a4..b35378e 100644
--- a/src/com/android/car/dialer/ui/search/ContactResultsFragment.java
+++ b/src/com/android/car/dialer/ui/search/ContactResultsFragment.java
@@ -16,15 +16,9 @@
 
 package com.android.car.dialer.ui.search;
 
-import android.app.ActionBar;
-import android.app.SearchManager;
-import android.content.Context;
 import android.os.Bundle;
 import android.text.TextUtils;
-import android.view.Menu;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.SearchView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -37,13 +31,14 @@
 import com.android.car.dialer.ui.common.DialerListBaseFragment;
 import com.android.car.dialer.ui.contact.ContactDetailsFragment;
 import com.android.car.telephony.common.Contact;
+import com.android.car.ui.toolbar.Toolbar;
 
 /**
  * A fragment that will take a search query, look up contacts that match and display those
  * results as a list.
  */
 public class ContactResultsFragment extends DialerListBaseFragment implements
-        ContactResultsAdapter.OnShowContactDetailListener {
+        ContactResultsAdapter.OnShowContactDetailListener, Toolbar.OnSearchListener {
 
     /**
      * Creates a new instance of the {@link ContactResultsFragment}.
@@ -63,23 +58,24 @@
 
     private static final String TAG = "CD.ContactResultsFragment";
     private static final String SEARCH_QUERY = "SearchQuery";
-    private static final String KEY_KEYBOARD_SHOWN = "KeyboardShown";
 
     private ContactResultsViewModel mContactResultsViewModel;
     private final ContactResultsAdapter mAdapter = new ContactResultsAdapter(this);
 
     private RecyclerView.OnScrollListener mOnScrollChangeListener;
-    private SearchView mSearchView;
+    private Toolbar mToolbar;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setHasOptionsMenu(true);
 
         mContactResultsViewModel = ViewModelProviders.of(this).get(
                 ContactResultsViewModel.class);
         mContactResultsViewModel.getContactSearchResults().observe(this,
-                contactResults -> mAdapter.setData(contactResults));
+                contactResults -> {
+                    mAdapter.setData(contactResults);
+                    showContent();
+                });
 
         // Set the initial search query, if one was provided from a Intent.ACTION_SEARCH
         if (getArguments() != null) {
@@ -103,7 +99,8 @@
             @Override
             public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
                 if (dy != 0) {
-                    mSearchView.clearFocus();
+                    // Clear the focus to dismiss the keyboard.
+                    mToolbar.clearFocus();
                 }
             }
         };
@@ -117,80 +114,34 @@
     }
 
     @Override
-    public void onPrepareOptionsMenu(Menu menu) {
-        menu.findItem(R.id.menu_contacts_search).setVisible(false);
-        menu.findItem(R.id.menu_dialer_setting).setVisible(false);
-    }
-
-    @Override
-    public void setupActionBar(@NonNull ActionBar actionBar) {
-        super.setupActionBar(actionBar);
-
-        // We have to use the setCustomView that accepts a LayoutParams to get the SearchView
-        // to take up the full height and width of the action bar.
-        View v = getLayoutInflater().inflate(R.layout.search_view, null);
-        actionBar.setCustomView(v, new ActionBar.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.MATCH_PARENT));
-
-        SearchView searchView = actionBar.getCustomView().findViewById(R.id.search_view);
-        SearchManager searchManager =
-                (SearchManager) getContext().getSystemService(Context.SEARCH_SERVICE);
-        searchView.setSearchableInfo(
-                searchManager.getSearchableInfo(getActivity().getComponentName()));
-
-        // We need to call setIconified(false) so the SearchView is a text box instead of just
-        // an icon, but doing so also focuses on it and shows the keyboard.
-        searchView.setIconified(false);
-        searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
-            @Override
-            public boolean onQueryTextSubmit(String query) {
-                L.d(TAG, "onQueryTextSubmit: %s", query);
-                return false;
-            }
-
-            @Override
-            public boolean onQueryTextChange(String newText) {
-                L.d(TAG, "onQueryTextChange: %s", newText);
-                onNewQuery(newText);
-                return false;
-            }
-        });
-
-        // Don't collapse the search view by clicking the clear button on an empty input
-        searchView.setOnCloseListener(() -> true);
-
-        mSearchView = searchView;
+    public void setupToolbar(@NonNull Toolbar toolbar) {
+        super.setupToolbar(toolbar);
+        mToolbar = toolbar;
+        mToolbar.registerOnSearchListener(this);
+        mToolbar.setSearchIcon(R.drawable.ic_app_icon);
         setSearchQuery(mContactResultsViewModel.getSearchQuery());
     }
 
     @Override
     public void onStop() {
         super.onStop();
-        mSearchView.clearFocus();
+        mToolbar.unregisterOnSearchListener(this);
     }
 
-    /**
-     * Sets the search query that should be used to filter contacts.
-     */
+    /** Sets the search query that should be used to filter contacts. */
     public void setSearchQuery(String query) {
-        if (mSearchView != null) {
-            // This will update the search field and trigger the onNewQuery.
-            // "submit" flag is false so it won't send search intent and ending in infinite loop.
-            mSearchView.setQuery(query, /* submit= */false);
+        if (mToolbar != null) {
+            mToolbar.setSearchQuery(query);
         } else {
-            onNewQuery(query);
+            onSearch(query);
         }
     }
 
     /** Triggered by search view text change. */
-    private void onNewQuery(String newQuery) {
-        mContactResultsViewModel.setSearchQuery(newQuery);
-    }
-
     @Override
-    protected CharSequence getActionBarTitle() {
-        return null;
+    public void onSearch(String newQuery) {
+        L.d(TAG, "onSearch: %s", newQuery);
+        mContactResultsViewModel.setSearchQuery(newQuery);
     }
 
     @Override
@@ -198,4 +149,9 @@
         Fragment contactDetailsFragment = ContactDetailsFragment.newInstance(contact);
         pushContentFragment(contactDetailsFragment, ContactDetailsFragment.FRAGMENT_TAG);
     }
+
+    @Override
+    protected Toolbar.State getToolbarState() {
+        return Toolbar.State.SEARCH;
+    }
 }
diff --git a/src/com/android/car/dialer/ui/search/ContactResultsViewModel.java b/src/com/android/car/dialer/ui/search/ContactResultsViewModel.java
index b852ffb..43969af 100644
--- a/src/com/android/car/dialer/ui/search/ContactResultsViewModel.java
+++ b/src/com/android/car/dialer/ui/search/ContactResultsViewModel.java
@@ -43,7 +43,9 @@
 import java.util.Collections;
 import java.util.List;
 
-/** {link AndroidViewModel} used for search functionality. */
+/**
+ * {link AndroidViewModel} used for search functionality.
+ */
 public class ContactResultsViewModel extends AndroidViewModel {
     private static final String[] CONTACT_DETAILS_PROJECTION = {
             ContactsContract.Contacts._ID,
@@ -124,15 +126,7 @@
         }
 
         private void onSortOrderChanged(SharedPreferences unusedSharedPreferences) {
-            if (getValue() == null) {
-                return;
-            }
-
-            List<Contact> contacts = new ArrayList<>();
-            contacts.addAll(getValue());
-            Collections.sort(contacts,
-                    ContactSortingInfo.getSortingInfo(mContext, mSharedPreferencesLiveData).first);
-            setValue(contacts);
+            setValue(getValue());
         }
 
         private void onQueryFinished(@Nullable Cursor cursor) {
@@ -143,18 +137,24 @@
 
             List<Contact> contacts = new ArrayList<>();
             while (cursor.moveToNext()) {
-                int lookupColIdx = cursor.getColumnIndex(ContactsContract.Contacts.LOOKUP_KEY);
-                Contact contact = InMemoryPhoneBook.get().lookupContactByKey(
-                        cursor.getString(lookupColIdx));
-                if (contact != null) {
-                    contacts.add(contact);
-                }
+                int lookupKeyColIdx = cursor.getColumnIndex(ContactsContract.Contacts.LOOKUP_KEY);
+                List<Contact> lookupResults = InMemoryPhoneBook.get().lookupContactByKey(
+                        cursor.getString(lookupKeyColIdx));
+                contacts.addAll(lookupResults);
             }
-            Collections.sort(contacts,
-                    ContactSortingInfo.getSortingInfo(mContext, mSharedPreferencesLiveData).first);
             setValue(contacts);
             cursor.close();
         }
+
+        @Override
+        public void setValue(List<Contact> contacts) {
+            if (contacts != null && !contacts.isEmpty()) {
+                Collections.sort(contacts,
+                        ContactSortingInfo.getSortingInfo(mContext,
+                                mSharedPreferencesLiveData).first);
+            }
+            super.setValue(contacts);
+        }
     }
 
     private static class SearchQueryParamProvider implements QueryParam.Provider {
diff --git a/src/com/android/car/dialer/ui/settings/DialerSettingsActivity.java b/src/com/android/car/dialer/ui/settings/DialerSettingsActivity.java
index c90f9a9..eb9f24f 100644
--- a/src/com/android/car/dialer/ui/settings/DialerSettingsActivity.java
+++ b/src/com/android/car/dialer/ui/settings/DialerSettingsActivity.java
@@ -17,11 +17,9 @@
 package com.android.car.dialer.ui.settings;
 
 import android.os.Bundle;
-import android.widget.Toolbar;
 
 import androidx.fragment.app.FragmentActivity;
 
-import com.android.car.dialer.R;
 import com.android.car.dialer.log.L;
 
 /**
@@ -30,21 +28,15 @@
 public class DialerSettingsActivity extends FragmentActivity {
     private static final String TAG = "CD.SettingsActivity";
 
-    private Toolbar mToolbar;
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         L.d(TAG, "onCreate");
 
-        setContentView(R.layout.dialer_settings_activity);
-        mToolbar = findViewById(R.id.settings_toolbar);
-        setActionBar(mToolbar);
-
-        getSupportFragmentManager().beginTransaction()
-                .replace(R.id.settings_fragment_container, new DialerSettingsFragment())
-                .commit();
-
-        getActionBar().setDisplayHomeAsUpEnabled(true);
+        if (savedInstanceState == null) {
+            getSupportFragmentManager().beginTransaction()
+                    .replace(android.R.id.content, new DialerSettingsFragment())
+                    .commit();
+        }
     }
 }
diff --git a/src/com/android/car/dialer/ui/settings/DialerSettingsFragment.java b/src/com/android/car/dialer/ui/settings/DialerSettingsFragment.java
index 8615629..18c1219 100644
--- a/src/com/android/car/dialer/ui/settings/DialerSettingsFragment.java
+++ b/src/com/android/car/dialer/ui/settings/DialerSettingsFragment.java
@@ -18,63 +18,15 @@
 
 import android.os.Bundle;
 
-import androidx.annotation.Nullable;
-import androidx.fragment.app.DialogFragment;
-import androidx.fragment.app.Fragment;
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceFragmentCompat;
-
 import com.android.car.dialer.R;
-import com.android.car.dialer.ui.settings.common.SettingsListPreferenceDialogFragment;
+import com.android.car.ui.preference.PreferenceFragment;
 
 /**
  * A fragment that displays the settings page
  */
-public class DialerSettingsFragment extends PreferenceFragmentCompat {
-    private static final String TAG = "CD.SettingsFragment";
-    private static final String DIALOG_FRAGMENT_TAG = "DIALOG";
-
+public class DialerSettingsFragment extends PreferenceFragment {
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         setPreferencesFromResource(R.xml.settings_page, rootKey);
     }
-
-    /**
-     * Settings needs to launch custom dialog types in order to extend the Device Default theme.
-     *
-     * @param preference The Preference object requesting the dialog.
-     */
-    @Override
-    public void onDisplayPreferenceDialog(Preference preference) {
-        // check if dialog is already showing
-        if (findDialogByTag(DIALOG_FRAGMENT_TAG) != null) {
-            return;
-        }
-
-        DialogFragment dialogFragment;
-        if (preference instanceof ListPreference) {
-            dialogFragment = SettingsListPreferenceDialogFragment.newInstance(preference.getKey());
-        } else {
-            throw new IllegalArgumentException(
-                    "Tried to display dialog for unknown preference type. Did you forget to "
-                            + "override onDisplayPreferenceDialog()?");
-        }
-
-        dialogFragment.setTargetFragment(/* fragment= */ this, /* requestCode= */ 0);
-        showDialog(dialogFragment, DIALOG_FRAGMENT_TAG);
-    }
-
-    @Nullable
-    private DialogFragment findDialogByTag(String tag) {
-        Fragment fragment = getFragmentManager().findFragmentByTag(tag);
-        if (fragment instanceof DialogFragment) {
-            return (DialogFragment) fragment;
-        }
-        return null;
-    }
-
-    private void showDialog(DialogFragment dialogFragment, @Nullable String tag) {
-        dialogFragment.show(getFragmentManager(), tag);
-    }
 }
diff --git a/src/com/android/car/dialer/ui/settings/common/SettingsListPreferenceDialogFragment.java b/src/com/android/car/dialer/ui/settings/common/SettingsListPreferenceDialogFragment.java
deleted file mode 100644
index f544704..0000000
--- a/src/com/android/car/dialer/ui/settings/common/SettingsListPreferenceDialogFragment.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright 2019 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.
- */
-
-package com.android.car.dialer.ui.settings.common;
-
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.preference.ListPreference;
-
-/**
- * Presents a dialog with a list of options associated with a {@link ListPreference}.
- *
- * <p>Note: this is borrowed as-is from androidx.preference.EditTextPreferenceDialogFragmentCompat
- * with updates to formatting to match the project style. DialerSettings needs to use custom dialog
- * implementations in order to launch the platform {@link AlertDialog} instead of the one in the
- * support library.
- */
-public class SettingsListPreferenceDialogFragment extends SettingsPreferenceDialogFragment {
-
-    private static final String SAVE_STATE_INDEX = "SettingsListPreferenceDialogFragment.index";
-    private static final String SAVE_STATE_ENTRIES = "SettingsListPreferenceDialogFragment.entries";
-    private static final String SAVE_STATE_ENTRY_VALUES =
-            "SettingsListPreferenceDialogFragment.entryValues";
-
-    private int mClickedDialogEntryIndex;
-    private CharSequence[] mEntries;
-    private CharSequence[] mEntryValues;
-
-    /**
-     * Returns a new instance of {@link SettingsListPreferenceDialogFragment} for the {@link
-     * ListPreference} with the given {@code key}.
-     */
-    public static SettingsListPreferenceDialogFragment newInstance(String key) {
-        SettingsListPreferenceDialogFragment fragment = new SettingsListPreferenceDialogFragment();
-        Bundle b = new Bundle(/* capacity= */ 1);
-        b.putString(ARG_KEY, key);
-        fragment.setArguments(b);
-        return fragment;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (savedInstanceState == null) {
-            ListPreference preference = getListPreference();
-
-            if (preference.getEntries() == null || preference.getEntryValues() == null) {
-                throw new IllegalStateException(
-                        "ListPreference requires an entries array and an entryValues array.");
-            }
-
-            mClickedDialogEntryIndex = preference.findIndexOfValue(preference.getValue());
-            mEntries = preference.getEntries();
-            mEntryValues = preference.getEntryValues();
-        } else {
-            mClickedDialogEntryIndex = savedInstanceState.getInt(SAVE_STATE_INDEX, 0);
-            mEntries = savedInstanceState.getCharSequenceArray(SAVE_STATE_ENTRIES);
-            mEntryValues = savedInstanceState.getCharSequenceArray(SAVE_STATE_ENTRY_VALUES);
-        }
-    }
-
-    @Override
-    public void onSaveInstanceState(@NonNull Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putInt(SAVE_STATE_INDEX, mClickedDialogEntryIndex);
-        outState.putCharSequenceArray(SAVE_STATE_ENTRIES, mEntries);
-        outState.putCharSequenceArray(SAVE_STATE_ENTRY_VALUES, mEntryValues);
-    }
-
-    private ListPreference getListPreference() {
-        return (ListPreference) getPreference();
-    }
-
-    @Override
-    protected void onPrepareDialogBuilder(AlertDialog.Builder builder) {
-        super.onPrepareDialogBuilder(builder);
-
-        builder.setSingleChoiceItems(mEntries, mClickedDialogEntryIndex,
-                (dialog, which) -> {
-                    mClickedDialogEntryIndex = which;
-
-                    // Clicking on an item simulates the positive button click, and dismisses the
-                    // dialog.
-                    SettingsListPreferenceDialogFragment.this.onClick(dialog,
-                            DialogInterface.BUTTON_POSITIVE);
-                    dialog.dismiss();
-                });
-
-        // The typical interaction for list-based dialogs is to have click-on-an-item dismiss the
-        // dialog instead of the user having to press 'Ok'.
-        builder.setPositiveButton(null, null);
-    }
-
-    @Override
-    public void onDialogClosed(boolean positiveResult) {
-        if (positiveResult && mClickedDialogEntryIndex >= 0) {
-            String value = mEntryValues[mClickedDialogEntryIndex].toString();
-            ListPreference preference = getListPreference();
-            if (preference.callChangeListener(value)) {
-                preference.setValue(value);
-            }
-        }
-    }
-
-}
diff --git a/src/com/android/car/dialer/ui/settings/common/SettingsPreferenceDialogFragment.java b/src/com/android/car/dialer/ui/settings/common/SettingsPreferenceDialogFragment.java
deleted file mode 100644
index c885f6a..0000000
--- a/src/com/android/car/dialer/ui/settings/common/SettingsPreferenceDialogFragment.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * Copyright 2019 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.
- */
-
-package com.android.car.dialer.ui.settings.common;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.TextView;
-
-import androidx.annotation.CallSuper;
-import androidx.annotation.LayoutRes;
-import androidx.annotation.NonNull;
-import androidx.fragment.app.DialogFragment;
-import androidx.fragment.app.Fragment;
-import androidx.preference.DialogPreference;
-import androidx.preference.PreferenceFragmentCompat;
-
-/**
- * Abstract base class which presents a dialog associated with a {@link DialogPreference}.
- * Since the preference object may not be available during fragment re-creation, the
- * necessary information for displaying the dialog is read once during the initial call
- * to {@link #onCreate(Bundle)} and saved/restored in the saved instance state.
- * Custom subclasses should also follow this pattern.
- *
- * <p>Note: this is borrowed as-is from androidx.preference.PreferenceDialogFragmentCompat with
- * updates to formatting to match the project style. Settings needs to use custom dialog
- * implementations in order to launch the platform {@link AlertDialog} instead of the one in the
- * support library.
- */
-public abstract class SettingsPreferenceDialogFragment extends DialogFragment implements
-        DialogInterface.OnClickListener {
-
-    protected static final String ARG_KEY = "key";
-
-    private static final String SAVE_STATE_TITLE = "SettingsPreferenceDialogFragment.title";
-    private static final String SAVE_STATE_POSITIVE_TEXT =
-            "SettingsPreferenceDialogFragment.positiveText";
-    private static final String SAVE_STATE_NEGATIVE_TEXT =
-            "SettingsPreferenceDialogFragment.negativeText";
-    private static final String SAVE_STATE_MESSAGE = "SettingsPreferenceDialogFragment.message";
-    private static final String SAVE_STATE_LAYOUT = "SettingsPreferenceDialogFragment.layout";
-    private static final String SAVE_STATE_ICON = "SettingsPreferenceDialogFragment.icon";
-
-    private DialogPreference mPreference;
-
-    private CharSequence mDialogTitle;
-    private CharSequence mPositiveButtonText;
-    private CharSequence mNegativeButtonText;
-    private CharSequence mDialogMessage;
-    @LayoutRes
-    private int mDialogLayoutRes;
-
-    private BitmapDrawable mDialogIcon;
-
-    /** Which button was clicked. */
-    private int mWhichButtonClicked;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        Fragment rawFragment = getTargetFragment();
-        if (!(rawFragment instanceof DialogPreference.TargetFragment)) {
-            throw new IllegalStateException(
-                    "Target fragment must implement TargetFragment interface");
-        }
-
-        DialogPreference.TargetFragment fragment =
-                (DialogPreference.TargetFragment) rawFragment;
-
-        String key = getArguments().getString(ARG_KEY);
-        if (savedInstanceState == null) {
-            mPreference = (DialogPreference) fragment.findPreference(key);
-            mDialogTitle = mPreference.getDialogTitle();
-            mPositiveButtonText = mPreference.getPositiveButtonText();
-            mNegativeButtonText = mPreference.getNegativeButtonText();
-            mDialogMessage = mPreference.getDialogMessage();
-            mDialogLayoutRes = mPreference.getDialogLayoutResource();
-
-            Drawable icon = mPreference.getDialogIcon();
-            if (icon == null || icon instanceof BitmapDrawable) {
-                mDialogIcon = (BitmapDrawable) icon;
-            } else {
-                Bitmap bitmap = Bitmap.createBitmap(icon.getIntrinsicWidth(),
-                        icon.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
-                Canvas canvas = new Canvas(bitmap);
-                icon.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
-                icon.draw(canvas);
-                mDialogIcon = new BitmapDrawable(getResources(), bitmap);
-            }
-        } else {
-            mDialogTitle = savedInstanceState.getCharSequence(SAVE_STATE_TITLE);
-            mPositiveButtonText = savedInstanceState.getCharSequence(SAVE_STATE_POSITIVE_TEXT);
-            mNegativeButtonText = savedInstanceState.getCharSequence(SAVE_STATE_NEGATIVE_TEXT);
-            mDialogMessage = savedInstanceState.getCharSequence(SAVE_STATE_MESSAGE);
-            mDialogLayoutRes = savedInstanceState.getInt(SAVE_STATE_LAYOUT, 0);
-            Bitmap bitmap = savedInstanceState.getParcelable(SAVE_STATE_ICON);
-            if (bitmap != null) {
-                mDialogIcon = new BitmapDrawable(getResources(), bitmap);
-            }
-        }
-    }
-
-    @Override
-    public void onSaveInstanceState(@NonNull Bundle outState) {
-        super.onSaveInstanceState(outState);
-
-        outState.putCharSequence(SAVE_STATE_TITLE, mDialogTitle);
-        outState.putCharSequence(SAVE_STATE_POSITIVE_TEXT, mPositiveButtonText);
-        outState.putCharSequence(SAVE_STATE_NEGATIVE_TEXT, mNegativeButtonText);
-        outState.putCharSequence(SAVE_STATE_MESSAGE, mDialogMessage);
-        outState.putInt(SAVE_STATE_LAYOUT, mDialogLayoutRes);
-        if (mDialogIcon != null) {
-            outState.putParcelable(SAVE_STATE_ICON, mDialogIcon.getBitmap());
-        }
-    }
-
-    @Override
-    @NonNull
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        Context context = getActivity();
-        mWhichButtonClicked = DialogInterface.BUTTON_NEGATIVE;
-
-        AlertDialog.Builder builder = new AlertDialog.Builder(context)
-                .setTitle(mDialogTitle)
-                .setIcon(mDialogIcon)
-                .setPositiveButton(mPositiveButtonText, this)
-                .setNegativeButton(mNegativeButtonText, this);
-
-        View contentView = onCreateDialogView(context);
-        if (contentView != null) {
-            onBindDialogView(contentView);
-            builder.setView(contentView);
-        } else {
-            builder.setMessage(mDialogMessage);
-        }
-
-        onPrepareDialogBuilder(builder);
-
-        // Create the dialog
-        Dialog dialog = builder.create();
-        if (needInputMethod()) {
-            // Request input only after the dialog is shown. This is to prevent an issue where the
-            // dialog view collapsed the content on small displays.
-            dialog.setOnShowListener(d -> requestInputMethod(dialog));
-        }
-
-        return dialog;
-    }
-
-    /**
-     * Get the preference that requested this dialog. Available after {@link #onCreate(Bundle)} has
-     * been called on the {@link PreferenceFragmentCompat} which launched this dialog.
-     *
-     * @return the {@link DialogPreference} associated with this dialog.
-     */
-    public DialogPreference getPreference() {
-        if (mPreference == null) {
-            String key = getArguments().getString(ARG_KEY);
-            DialogPreference.TargetFragment fragment =
-                    (DialogPreference.TargetFragment) getTargetFragment();
-            mPreference = (DialogPreference) fragment.findPreference(key);
-        }
-        return mPreference;
-    }
-
-    /**
-     * Prepares the dialog builder to be shown when the preference is clicked. Use this to set
-     * custom properties on the dialog.
-     *
-     * <p>Do not {@link AlertDialog.Builder#create()} or {@link AlertDialog.Builder#show()}.
-     */
-    protected void onPrepareDialogBuilder(AlertDialog.Builder builder) {
-    }
-
-    /**
-     * Returns whether the preference needs to display a soft input method when the dialog is
-     * displayed. Default is false. Subclasses should override this method if they need the soft
-     * input method brought up automatically.
-     *
-     * <p>Note: Ensure your subclass manually requests focus (ideally in {@link
-     * #onBindDialogView(View)}) for the input field in order to
-     * correctly attach the input method to the field.
-     */
-    protected boolean needInputMethod() {
-        return false;
-    }
-
-    /**
-     * Sets the required flags on the dialog window to enable input method window to show up.
-     */
-    private void requestInputMethod(Dialog dialog) {
-        Window window = dialog.getWindow();
-        window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
-    }
-
-    /**
-     * Creates the content view for the dialog (if a custom content view is required). By default,
-     * it inflates the dialog layout resource if it is set.
-     *
-     * @return the content View for the dialog.
-     * @see DialogPreference#setLayoutResource(int)
-     */
-    protected View onCreateDialogView(Context context) {
-        int resId = mDialogLayoutRes;
-        if (resId == 0) {
-            return null;
-        }
-
-        LayoutInflater inflater = LayoutInflater.from(context);
-        return inflater.inflate(resId, null);
-    }
-
-    /**
-     * Binds views in the content View of the dialog to data.
-     *
-     * <p>Make sure to call through to the superclass implementation.
-     *
-     * @param view the content View of the dialog, if it is custom.
-     */
-    @CallSuper
-    protected void onBindDialogView(View view) {
-        View dialogMessageView = view.findViewById(android.R.id.message);
-
-        if (dialogMessageView != null) {
-            CharSequence message = mDialogMessage;
-            int newVisibility = View.GONE;
-
-            if (!TextUtils.isEmpty(message)) {
-                if (dialogMessageView instanceof TextView) {
-                    ((TextView) dialogMessageView).setText(message);
-                }
-
-                newVisibility = View.VISIBLE;
-            }
-
-            if (dialogMessageView.getVisibility() != newVisibility) {
-                dialogMessageView.setVisibility(newVisibility);
-            }
-        }
-    }
-
-    @Override
-    public void onClick(DialogInterface dialog, int which) {
-        mWhichButtonClicked = which;
-    }
-
-    @Override
-    public void onDismiss(DialogInterface dialog) {
-        super.onDismiss(dialog);
-        onDialogClosed(mWhichButtonClicked == DialogInterface.BUTTON_POSITIVE);
-    }
-
-    /**
-     * Called when the dialog is dismissed.
-     *
-     * @param positiveResult {@code true} if the dialog was dismissed with {@link
-     *                       DialogInterface#BUTTON_POSITIVE}.
-     */
-    protected abstract void onDialogClosed(boolean positiveResult);
-}
diff --git a/src/com/android/car/dialer/ui/warning/NoHfpFragment.java b/src/com/android/car/dialer/ui/warning/NoHfpFragment.java
index 6774ee1..51d353b 100644
--- a/src/com/android/car/dialer/ui/warning/NoHfpFragment.java
+++ b/src/com/android/car/dialer/ui/warning/NoHfpFragment.java
@@ -16,6 +16,7 @@
 
 package com.android.car.dialer.ui.warning;
 
+import android.car.drivingstate.CarUxRestrictions;
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -28,6 +29,8 @@
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModelProviders;
 
+import com.android.car.apps.common.UxrButton;
+import com.android.car.apps.common.util.CarPackageManagerUtils;
 import com.android.car.apps.common.util.ViewUtils;
 import com.android.car.dialer.R;
 import com.android.car.dialer.telecom.UiCallManager;
@@ -100,12 +103,17 @@
         emergencyButton.setOnClickListener(v -> dialerAppStateLiveData.setValue(
                 TelecomActivityViewModel.DialerAppState.EMERGENCY_DIALPAD));
 
-        view.findViewById(R.id.connect_bluetooth_button).setOnClickListener(v -> {
-            Intent launchIntent = new Intent();
-            launchIntent.setAction(Bluetooth_Setting_ACTION);
-            launchIntent.addCategory(Bluetooth_Setting_CATEGORY);
-            startActivity(launchIntent);
-        });
+        Intent launchIntent = new Intent();
+        launchIntent.setAction(Bluetooth_Setting_ACTION);
+        launchIntent.addCategory(Bluetooth_Setting_CATEGORY);
+
+        UxrButton bluetoothButton = view.findViewById(R.id.connect_bluetooth_button);
+        boolean isDistractionOptimized = CarPackageManagerUtils.getInstance(getActivity())
+                .isDistractionOptimized(getActivity().getPackageManager(), launchIntent);
+        bluetoothButton.setUxRestrictions(isDistractionOptimized
+                ? CarUxRestrictions.UX_RESTRICTIONS_BASELINE
+                : CarUxRestrictions.UX_RESTRICTIONS_NO_SETUP);
+        bluetoothButton.setOnClickListener(v -> startActivity(launchIntent));
 
         return view;
     }
diff --git a/src/com/android/car/dialer/widget/LoadingFrameLayout.java b/src/com/android/car/dialer/widget/LoadingFrameLayout.java
new file mode 100644
index 0000000..1011bed
--- /dev/null
+++ b/src/com/android/car/dialer/widget/LoadingFrameLayout.java
@@ -0,0 +1,396 @@
+/*
+ * Copyright (C) 2019 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.
+ */
+
+package com.android.car.dialer.widget;
+
+import android.annotation.StringRes;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.DrawableRes;
+import androidx.annotation.IdRes;
+import androidx.annotation.IntDef;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.MainThread;
+import androidx.annotation.Nullable;
+
+import com.android.car.apps.common.util.ViewUtils;
+import com.android.car.dialer.Constants;
+import com.android.car.dialer.R;
+import com.android.car.dialer.log.L;
+
+/**
+ * A widget that supports different {@link State}s: NEW, LOADING, CONTENT, EMPTY OR ERROR.
+ */
+public class LoadingFrameLayout extends FrameLayout {
+    private static final String TAG = "CD.LoadingFrameLayout";
+
+    /**
+     * Possible states of a service request display.
+     */
+    @IntDef({State.NEW, State.LOADING, State.CONTENT, State.ERROR, State.EMPTY})
+    public @interface State {
+        int NEW = 0;
+        int LOADING = 1;
+        int CONTENT = 2;
+        int ERROR = 3;
+        int EMPTY = 4;
+    }
+
+    private final Context mContext;
+
+    private ViewContainer mEmptyView;
+    private ViewContainer mLoadingView;
+    private ViewContainer mErrorView;
+
+    @State
+    private int mState = State.NEW;
+
+    public LoadingFrameLayout(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public LoadingFrameLayout(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        mContext = context;
+        TypedArray values =
+                context.obtainStyledAttributes(attrs, R.styleable.LoadingFrameLayout, defStyle, 0);
+        setLoadingView(
+                values.getResourceId(
+                        R.styleable.LoadingFrameLayout_progressViewLayout,
+                        R.layout.loading_progress_view));
+        setEmptyView(
+                values.getResourceId(
+                        R.styleable.LoadingFrameLayout_emptyViewLayout,
+                        R.layout.loading_info_view));
+        setErrorView(
+                values.getResourceId(
+                        R.styleable.LoadingFrameLayout_errorViewLayout,
+                        R.layout.loading_info_view));
+        values.recycle();
+    }
+
+    @Override
+    public void onFinishInflate() {
+        super.onFinishInflate();
+        // Start with a loading view when inflated from XML.
+        showLoading();
+    }
+
+    private void setLoadingView(int loadingLayoutId) {
+        mLoadingView = new ViewContainer(State.LOADING, loadingLayoutId, 0, 0, 0, 0);
+    }
+
+    private void setEmptyView(int emptyLayoutId) {
+        mEmptyView = new ViewContainer(State.EMPTY, emptyLayoutId, R.id.loading_info_icon,
+                R.id.loading_info_message, R.id.loading_info_secondary_message,
+                R.id.loading_info_action_button);
+    }
+
+    private void setErrorView(int errorLayoutId) {
+        mErrorView = new ViewContainer(State.ERROR, errorLayoutId, R.id.loading_info_icon,
+                R.id.loading_info_message, R.id.loading_info_secondary_message,
+                R.id.loading_info_action_button);
+    }
+
+    /**
+     * Shows the loading view, hides other views.
+     */
+    @MainThread
+    public void showLoading() {
+        switchTo(State.LOADING);
+    }
+
+    /**
+     * Shows the error view where the action button is not available and hides other views.
+     *
+     * @param iconResId             drawable resource id used for the top icon. When it is invalid,
+     *                              hide the icon view.
+     * @param messageResId          string resource id used for the error message. When it is
+     *                              invalid, hide the message view.
+     * @param secondaryMessageResId string resource id for the secondary error message. When it is
+     *                              invalid, hide the secondary message view.
+     */
+    public void showError(@DrawableRes int iconResId, @StringRes int messageResId,
+            @StringRes int secondaryMessageResId) {
+        showError(iconResId, messageResId, secondaryMessageResId, Constants.INVALID_RES_ID, null,
+                false);
+    }
+
+    /**
+     * Shows the error view, hides other views.
+     *
+     * @param iconResId                   drawable resource id used for the top icon.When it is
+     *                                    invalid, hide the icon view.
+     * @param messageResId                string resource id used for the error message. When it is
+     *                                    invalid, hide the message view.
+     * @param secondaryMessageResId       string resource id for the secondary error message. When
+     *                                    it is invalid, hide the secondary message view.
+     * @param actionButtonTextResId       string resource id for the action button.
+     * @param actionButtonOnClickListener click listener set on the action button.
+     * @param showActionButton            boolean flag if the action button will show.
+     */
+    public void showError(
+            @DrawableRes int iconResId,
+            @StringRes int messageResId,
+            @StringRes int secondaryMessageResId,
+            @StringRes int actionButtonTextResId,
+            View.OnClickListener actionButtonOnClickListener,
+            boolean showActionButton) {
+        mErrorView.setIcon(iconResId);
+        mErrorView.setMessage(messageResId);
+        mErrorView.setSecondaryMessage(secondaryMessageResId);
+        mErrorView.setActionButtonText(actionButtonTextResId);
+        mErrorView.setActionButtonClickListener(actionButtonOnClickListener);
+        mErrorView.setActionButtonVisible(showActionButton);
+        switchTo(State.ERROR);
+    }
+
+    /**
+     * Shows the empty view where the action button is not available and hides other views.
+     *
+     * @param iconResId             drawable resource id used for the top icon. When it is invalid,
+     *                              hide the icon view.
+     * @param messageResId          string resource id used for the empty message. When it is
+     *                              invalid, hide the message view.
+     * @param secondaryMessageResId string resource id for the secondary empty message. When it is
+     *                              invalid, hide the secondary message view.
+     */
+    public void showEmpty(@DrawableRes int iconResId, @StringRes int messageResId,
+            @StringRes int secondaryMessageResId) {
+        showEmpty(iconResId, messageResId, secondaryMessageResId, Constants.INVALID_RES_ID, null,
+                false);
+    }
+
+    /**
+     * Shows the empty view and hides other views.
+     *
+     * @param iconResId                   drawable resource id used for the top icon.When it is
+     *                                    invalid, hide the icon view.
+     * @param messageResId                string resource id used for the empty message. When it is
+     *                                    invalid, hide the message view.
+     * @param secondaryMessageResId       string resource id for the secondary empty message. When
+     *                                    it is invalid, hide the secondary message view.
+     * @param actionButtonTextResId       string resource id for the action button.
+     * @param actionButtonOnClickListener click listener set on the action button.
+     * @param showActionButton            boolean flag if the action button will show.
+     */
+    public void showEmpty(
+            @DrawableRes int iconResId,
+            @StringRes int messageResId,
+            @StringRes int secondaryMessageResId,
+            @StringRes int actionButtonTextResId,
+            @Nullable View.OnClickListener actionButtonOnClickListener,
+            boolean showActionButton) {
+        mEmptyView.setIcon(iconResId);
+        mEmptyView.setMessage(messageResId);
+        mEmptyView.setSecondaryMessage(secondaryMessageResId);
+        mEmptyView.setActionButtonText(actionButtonTextResId);
+        mEmptyView.setActionButtonClickListener(actionButtonOnClickListener);
+        mEmptyView.setActionButtonVisible(showActionButton);
+        switchTo(State.EMPTY);
+    }
+
+    /**
+     * Shows the content view, hides other views.
+     */
+    public void showContent() {
+        switchTo(State.CONTENT);
+    }
+
+    /**
+     * Hide all views.
+     */
+    public void reset() {
+        switchTo(State.NEW);
+    }
+
+    private void switchTo(@State int state) {
+        if (mState != state) {
+            L.d(TAG, "Switch to state: %d", state);
+            // Hides, or shows, all the children, including the loading and error views.
+            setChildVisibility(state == State.CONTENT ? View.VISIBLE : View.GONE);
+
+            // Corrects the visibility setting for error and loading views since they are
+            // shown independently of the views content.
+            mLoadingView.setVisibilityFromState(state);
+            mErrorView.setVisibilityFromState(state);
+            mEmptyView.setVisibilityFromState(state);
+
+            mState = state;
+        }
+    }
+
+    private void setChildVisibility(int visibility) {
+        int childCount = getChildCount();
+        for (int i = 0; i < childCount; i++) {
+            getChildAt(i).setVisibility(visibility);
+        }
+    }
+
+    /**
+     * Container for views held by this LoadingFrameLayout. Used for deferring view inflation until
+     * the view is about to be shown.
+     */
+    private class ViewContainer {
+
+        @State
+        private final int mViewState;
+        private final int mLayoutId;
+        private final int mIconViewId;
+        private final int mMessageViewId;
+        private final int mSecondaryMessageViewId;
+        private final int mActionButtonId;
+
+        private View mView;
+
+        private ImageView mIconView;
+        // Cache image view resource id until imageView is inflated.
+        @DrawableRes
+        private int mIconResId;
+
+        private TextView mActionButton;
+        // Cache action button visibility until action button is inflated.
+        private boolean mIsActionButtonVisible;
+        // Cache action button onClickListener until action button is inflated.
+        private View.OnClickListener mActionButtonOnClickListener;
+        // Cache action button text until action button is inflated.
+        private int mActionButtonTextResId;
+
+        private TextView mMessageView;
+        // Cache message view string until message view is inflated.
+        private int mMessageResId;
+        private TextView mSecondaryMessageView;
+        // Cache the secondary message view string until the secondary message view is inflated.
+        private int mSecondaryMessageResId;
+
+        private ViewContainer(@State int state, @LayoutRes int layoutId, @IdRes int iconViewId,
+                @IdRes int messageViewId, @IdRes int secondaryMessageViewId,
+                @IdRes int actionButtonId) {
+            mViewState = state;
+            mLayoutId = layoutId;
+            mIconViewId = iconViewId;
+            mMessageViewId = messageViewId;
+            mSecondaryMessageViewId = secondaryMessageViewId;
+            mActionButtonId = actionButtonId;
+        }
+
+        private View inflateView() {
+            View view = LayoutInflater.from(mContext).inflate(mLayoutId, LoadingFrameLayout.this,
+                    false);
+
+            if (mMessageViewId > Constants.INVALID_RES_ID) {
+                mMessageView = view.findViewById(mMessageViewId);
+                setMessage(mMessageResId);
+            }
+
+            if (mSecondaryMessageViewId > Constants.INVALID_RES_ID) {
+                mSecondaryMessageView = view.findViewById(mSecondaryMessageViewId);
+                setSecondaryMessage(mSecondaryMessageResId);
+            }
+
+            if (mIconViewId > Constants.INVALID_RES_ID) {
+                mIconView = view.findViewById(mIconViewId);
+                setIcon(mIconResId);
+            }
+
+            if (mActionButtonId > Constants.INVALID_RES_ID) {
+                mActionButton = view.findViewById(mActionButtonId);
+                setActionButtonClickListener(mActionButtonOnClickListener);
+                setActionButtonVisible(mIsActionButtonVisible);
+                setActionButtonText(mActionButtonTextResId);
+            }
+
+            return view;
+        }
+
+        public void setVisibilityFromState(@State int newState) {
+            if (mViewState == newState) {
+                show();
+            } else {
+                hide();
+            }
+        }
+
+        private void show() {
+            if (mView == null) {
+                mView = inflateView();
+                LoadingFrameLayout.this.addView(mView);
+            }
+            mView.setVisibility(View.VISIBLE);
+        }
+
+        private void hide() {
+            if (mView != null) {
+                mView.setVisibility(View.GONE);
+                mView.clearFocus();
+            }
+        }
+
+        private void setMessage(@StringRes int messageResId) {
+            if (messageResId > Constants.INVALID_RES_ID) {
+                ViewUtils.setText(mMessageView, messageResId);
+            } else {
+                ViewUtils.setVisible(mMessageView, false);
+            }
+            mMessageResId = messageResId;
+        }
+
+        private void setSecondaryMessage(@StringRes int secondaryMessageResId) {
+            if (secondaryMessageResId > Constants.INVALID_RES_ID) {
+                ViewUtils.setText(mSecondaryMessageView, secondaryMessageResId);
+            } else {
+                ViewUtils.setVisible(mSecondaryMessageView, false);
+            }
+            mSecondaryMessageResId = secondaryMessageResId;
+        }
+
+        private void setActionButtonClickListener(
+                View.OnClickListener actionButtonOnClickListener) {
+            ViewUtils.setOnClickListener(mActionButton, actionButtonOnClickListener);
+            mActionButtonOnClickListener = actionButtonOnClickListener;
+        }
+
+        private void setActionButtonText(@StringRes int actionButtonTextResId) {
+            if (actionButtonTextResId > Constants.INVALID_RES_ID) {
+                ViewUtils.setText(mActionButton, actionButtonTextResId);
+            }
+            mActionButtonTextResId = actionButtonTextResId;
+        }
+
+        private void setActionButtonVisible(boolean visible) {
+            ViewUtils.setVisible(mActionButton, visible);
+            mIsActionButtonVisible = visible;
+        }
+
+        private void setIcon(@DrawableRes int iconResId) {
+            if (iconResId > Constants.INVALID_RES_ID) {
+                if (mIconView != null) {
+                    mIconView.setImageResource(iconResId);
+                }
+            } else {
+                ViewUtils.setVisible(mIconView, false);
+            }
+            mIconResId = iconResId;
+        }
+    }
+}
diff --git a/src/com/android/car/dialer/widget/WorkerExecutor.java b/src/com/android/car/dialer/widget/WorkerExecutor.java
deleted file mode 100644
index 59b3bf1..0000000
--- a/src/com/android/car/dialer/widget/WorkerExecutor.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-
-package com.android.car.dialer.widget;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-/**
- * WorkerExecutor is a singleton tied to the application to provide {@link ExecutorService} for
- * Dialer to run tasks in background.
- */
-public class WorkerExecutor {
-    private static WorkerExecutor sWorkerExecutor;
-
-    private ExecutorService mSingleThreadExecutor;
-
-    /** Returns the singleton WorkerExecutor for the application. */
-    public static WorkerExecutor getInstance() {
-        if (sWorkerExecutor == null) {
-            sWorkerExecutor = new WorkerExecutor();
-        }
-        return sWorkerExecutor;
-    }
-
-    private WorkerExecutor() {
-        mSingleThreadExecutor = Executors.newSingleThreadExecutor();
-    }
-
-    /** Returns the single thread executor. */
-    public ExecutorService getSingleThreadExecutor() {
-        return mSingleThreadExecutor;
-    }
-
-    /** Tears down the singleton WorkerExecutor for the application */
-    public void tearDown() {
-        mSingleThreadExecutor.shutdown();
-        sWorkerExecutor = null;
-    }
-}
diff --git a/tests/robotests/config/robolectric.properties b/tests/robotests/config/robolectric.properties
index fc4f8ca..41e2945 100644
--- a/tests/robotests/config/robolectric.properties
+++ b/tests/robotests/config/robolectric.properties
@@ -12,3 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 sdk=NEWEST_SDK
+shadows=\
+   com.android.car.dialer.ShadowTypeface
diff --git a/tests/robotests/res/layout/test_activity.xml b/tests/robotests/res/layout/test_activity.xml
index d2cd999..e7e8291 100644
--- a/tests/robotests/res/layout/test_activity.xml
+++ b/tests/robotests/res/layout/test_activity.xml
@@ -18,8 +18,8 @@
     android:id="@+id/test_fragment_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-    <Toolbar
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/car_toolbar"/>
+    <com.android.car.ui.toolbar.Toolbar
+        android:id="@+id/car_ui_toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
 </FrameLayout>
diff --git a/tests/robotests/src/com/android/car/dialer/FragmentTestActivity.java b/tests/robotests/src/com/android/car/dialer/FragmentTestActivity.java
index fd54794..5dfa8b1 100644
--- a/tests/robotests/src/com/android/car/dialer/FragmentTestActivity.java
+++ b/tests/robotests/src/com/android/car/dialer/FragmentTestActivity.java
@@ -15,7 +15,6 @@
  */
 package com.android.car.dialer;
 
-import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 
 import androidx.annotation.Nullable;
@@ -46,11 +45,6 @@
     }
 
     @Override
-    public void setBackground(Drawable background) {
-        // Do nothing
-    }
-
-    @Override
     public void pushContentFragment(Fragment fragment, String fragmentTag) {
         getSupportFragmentManager()
                 .beginTransaction()
diff --git a/tests/robotests/src/com/android/car/dialer/ShadowTypeface.java b/tests/robotests/src/com/android/car/dialer/ShadowTypeface.java
new file mode 100644
index 0000000..42ac984
--- /dev/null
+++ b/tests/robotests/src/com/android/car/dialer/ShadowTypeface.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2019 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.
+ */
+
+package com.android.car.dialer;
+
+import android.graphics.Typeface;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+/**
+ * This is to shadow an extra function that old versions of Robolectric don't cover.
+ */
+@Implements(value = Typeface.class)
+public class ShadowTypeface extends org.robolectric.shadows.ShadowTypeface {
+
+    @Implementation
+    public static Typeface create(Typeface family, int weight, boolean italic) {
+        return create(family, 0);
+    }
+}
diff --git a/tests/robotests/src/com/android/car/dialer/ui/calllog/CallHistoryFragmentTest.java b/tests/robotests/src/com/android/car/dialer/ui/calllog/CallHistoryFragmentTest.java
index d249e4b..fa7a8f1 100644
--- a/tests/robotests/src/com/android/car/dialer/ui/calllog/CallHistoryFragmentTest.java
+++ b/tests/robotests/src/com/android/car/dialer/ui/calllog/CallHistoryFragmentTest.java
@@ -28,7 +28,7 @@
 import androidx.lifecycle.MutableLiveData;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.android.car.apps.common.widget.PagedRecyclerView;
+import com.android.car.arch.common.FutureData;
 import com.android.car.dialer.CarDialerRobolectricTestRunner;
 import com.android.car.dialer.FragmentTestActivity;
 import com.android.car.dialer.R;
@@ -40,6 +40,7 @@
 import com.android.car.dialer.widget.CallTypeIconsView;
 import com.android.car.telephony.common.InMemoryPhoneBook;
 import com.android.car.telephony.common.PhoneCallLog;
+import com.android.car.ui.recyclerview.CarUiRecyclerView;
 
 import org.junit.After;
 import org.junit.Before;
@@ -86,11 +87,11 @@
                 CallHistoryLiveData.CallType.INCOMING_TYPE);
         PhoneCallLog.Record record2 = new PhoneCallLog.Record(TIME_STAMP_2,
                 CallHistoryLiveData.CallType.OUTGOING_TYPE);
-        UiCallLog uiCallLog = new UiCallLog(UI_CALLOG_TITLE, UI_CALLOG_TEXT, PHONE_NUMBER, mMockUri,
-                Arrays.asList(record1, record2));
+        UiCallLog uiCallLog = new UiCallLog(UI_CALLOG_TITLE, UI_CALLOG_TEXT, PHONE_NUMBER, null,
+                mMockUri, Arrays.asList(record1, record2));
 
-        MutableLiveData<List<Object>> callLog = new MutableLiveData<>();
-        callLog.setValue(Arrays.asList(HEADER, uiCallLog));
+        MutableLiveData<FutureData<List<Object>>> callLog = new MutableLiveData<>();
+        callLog.setValue(new FutureData<>(false, Arrays.asList(HEADER, uiCallLog)));
         ShadowAndroidViewModelFactory.add(CallHistoryViewModel.class, mMockCallHistoryViewModel);
         when(mMockCallHistoryViewModel.getCallHistory()).thenReturn(callLog);
 
@@ -99,7 +100,7 @@
                 FragmentTestActivity.class).create().resume().get();
         mFragmentTestActivity.setFragment(mCallHistoryFragment);
 
-        PagedRecyclerView recyclerView = mCallHistoryFragment.getView()
+        CarUiRecyclerView recyclerView = mCallHistoryFragment.getView()
                 .findViewById(R.id.list_view);
         // set up layout for recyclerView
         recyclerView.layoutBothForTesting(0, 0, 100, 1000);
diff --git a/tests/robotests/src/com/android/car/dialer/ui/contact/ContactDetailsFragmentTest.java b/tests/robotests/src/com/android/car/dialer/ui/contact/ContactDetailsFragmentTest.java
index 02598a5..65f00a7 100644
--- a/tests/robotests/src/com/android/car/dialer/ui/contact/ContactDetailsFragmentTest.java
+++ b/tests/robotests/src/com/android/car/dialer/ui/contact/ContactDetailsFragmentTest.java
@@ -27,7 +27,7 @@
 
 import androidx.lifecycle.MutableLiveData;
 
-import com.android.car.apps.common.widget.PagedRecyclerView;
+import com.android.car.arch.common.FutureData;
 import com.android.car.dialer.CarDialerRobolectricTestRunner;
 import com.android.car.dialer.FragmentTestActivity;
 import com.android.car.dialer.R;
@@ -36,6 +36,7 @@
 import com.android.car.telephony.common.Contact;
 import com.android.car.telephony.common.InMemoryPhoneBook;
 import com.android.car.telephony.common.PhoneNumber;
+import com.android.car.ui.recyclerview.CarUiRecyclerView;
 
 import org.junit.After;
 import org.junit.Before;
@@ -58,7 +59,7 @@
 
     private ContactDetailsFragment mContactDetailsFragment;
     private FragmentTestActivity mFragmentTestActivity;
-    private PagedRecyclerView mListView;
+    private CarUiRecyclerView mListView;
     @Mock
     private ContactDetailsViewModel mMockContactDetailsViewModel;
     @Mock
@@ -84,8 +85,8 @@
 
         UiCallManager.set(mMockUiCallManager);
 
-        MutableLiveData<Contact> contactDetails = new MutableLiveData<>();
-        contactDetails.setValue(mMockContact);
+        MutableLiveData<FutureData<Contact>> contactDetails = new MutableLiveData<>();
+        contactDetails.setValue(new FutureData<>(false, mMockContact));
         ShadowAndroidViewModelFactory.add(ContactDetailsViewModel.class,
                 mMockContactDetailsViewModel);
         when(mMockContactDetailsViewModel.getContactDetails(mMockContact)).thenReturn(
diff --git a/tests/robotests/src/com/android/car/dialer/ui/contact/ContactListFragmentTest.java b/tests/robotests/src/com/android/car/dialer/ui/contact/ContactListFragmentTest.java
index 9fc4898..1ae465b 100644
--- a/tests/robotests/src/com/android/car/dialer/ui/contact/ContactListFragmentTest.java
+++ b/tests/robotests/src/com/android/car/dialer/ui/contact/ContactListFragmentTest.java
@@ -31,7 +31,7 @@
 import androidx.fragment.app.FragmentManager;
 import androidx.lifecycle.MutableLiveData;
 
-import com.android.car.apps.common.widget.PagedRecyclerView;
+import com.android.car.arch.common.FutureData;
 import com.android.car.dialer.CarDialerRobolectricTestRunner;
 import com.android.car.dialer.FragmentTestActivity;
 import com.android.car.dialer.R;
@@ -41,6 +41,8 @@
 import com.android.car.dialer.ui.favorite.FavoriteViewModel;
 import com.android.car.telephony.common.Contact;
 import com.android.car.telephony.common.PhoneNumber;
+import com.android.car.telephony.common.PostalAddress;
+import com.android.car.ui.recyclerview.CarUiRecyclerView;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -52,6 +54,7 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowAlertDialog;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -79,18 +82,22 @@
     private Contact mMockContact3;
     @Mock
     private PhoneNumber mMockPhoneNumber;
+    @Mock
+    private PostalAddress mMockPostalAddress;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
 
-        MutableLiveData<Pair<Integer, List<Contact>>> contactList = new MutableLiveData<>();
-        contactList.setValue(new Pair<>(ContactSortingInfo.SORT_BY_LAST_NAME,
-                Arrays.asList(mMockContact1, mMockContact2, mMockContact3)));
+        MutableLiveData<FutureData<Pair<Integer, List<Contact>>>> contactList =
+                new MutableLiveData<>();
+        contactList.setValue(
+                new FutureData<>(false, new Pair<>(ContactSortingInfo.SORT_BY_LAST_NAME,
+                        Arrays.asList(mMockContact1, mMockContact2, mMockContact3))));
         ShadowAndroidViewModelFactory.add(ContactListViewModel.class, mMockContactListViewModel);
         when(mMockContactListViewModel.getAllContacts()).thenReturn(contactList);
-        MutableLiveData<Contact> contactDetail = new MutableLiveData<>();
-        contactDetail.setValue(mMockContact1);
+        MutableLiveData<FutureData<Contact>> contactDetail = new MutableLiveData<>();
+        contactDetail.setValue(new FutureData<>(false, mMockContact1));
         ShadowAndroidViewModelFactory.add(ContactDetailsViewModel.class,
                 mMockContactDetailsViewModel);
         when(mMockContactDetailsViewModel.getContactDetails(any())).thenReturn(contactDetail);
@@ -132,7 +139,22 @@
     }
 
     @Test
-    public void testClickShowContactDetailView_showContactDetail() {
+    public void testClickCallActionButton_ContactHasNoNumbers_callActionButtonNotEnabled() {
+        when(mMockContact1.getNumbers()).thenReturn(new ArrayList<>());
+        setUpFragment();
+
+        View callActionView = mViewHolder.itemView.findViewById(R.id.call_action_id);
+
+        assertThat(callActionView.isEnabled()).isFalse();
+        assertThat(callActionView.getVisibility() == View.VISIBLE).isEqualTo(
+                mViewHolder.itemView.getResources().getBoolean(
+                        R.bool.config_show_contact_detail_button_for_empty_contact));
+    }
+
+    @Test
+    public void testClickShowContactDetailView_withPhoneNumberAndAddress_showContactDetail() {
+        when(mMockContact1.getNumbers()).thenReturn(Arrays.asList(mMockPhoneNumber));
+        when(mMockContact1.getPostalAddresses()).thenReturn(Arrays.asList(mMockPostalAddress));
         setUpFragment();
 
         View showContactDetailActionView = mViewHolder.itemView.findViewById(
@@ -145,13 +167,53 @@
         verifyShowContactDetail();
     }
 
+    @Test
+    public void testClickShowContactDetailView_withAddressButNoPhoneNumber_dependOnConfig() {
+        when(mMockContact1.getPostalAddresses()).thenReturn(Arrays.asList(mMockPostalAddress));
+        setUpFragment();
+
+        View showContactDetailActionView = mViewHolder.itemView.findViewById(
+                R.id.show_contact_detail_id);
+
+        boolean showPostalAddress = mViewHolder.itemView.getResources().getBoolean(
+                R.bool.config_show_postal_address);
+        boolean forceShowButton = mViewHolder.itemView.getResources().getBoolean(
+                R.bool.config_show_contact_detail_button_for_empty_contact);
+
+        assertThat(showContactDetailActionView.isEnabled()).isEqualTo(showPostalAddress);
+        assertThat(showContactDetailActionView.getVisibility() == View.VISIBLE)
+                .isEqualTo(showPostalAddress || forceShowButton);
+
+        if (showPostalAddress) {
+            assertThat(showContactDetailActionView.hasOnClickListeners()).isTrue();
+
+            showContactDetailActionView.performClick();
+
+            // verify contact detail is shown.
+            verifyShowContactDetail();
+        }
+    }
+
+    @Test
+    public void testClickShowContactDetailView_NoPhoneNumberAndNoAddress_NotEnabled() {
+        setUpFragment();
+
+        View showContactDetailActionView = mViewHolder.itemView.findViewById(
+                R.id.show_contact_detail_id);
+
+        assertThat(showContactDetailActionView.isEnabled()).isFalse();
+        assertThat(showContactDetailActionView.getVisibility() == View.VISIBLE).isEqualTo(
+                mViewHolder.itemView.getResources().getBoolean(
+                        R.bool.config_show_contact_detail_button_for_empty_contact));
+    }
+
     private void setUpFragment() {
         mContactListFragment = ContactListFragment.newInstance();
         mFragmentTestActivity = Robolectric.buildActivity(
                 FragmentTestActivity.class).create().resume().get();
         mFragmentTestActivity.setFragment(mContactListFragment);
 
-        PagedRecyclerView recyclerView = mContactListFragment.getView()
+        CarUiRecyclerView recyclerView = mContactListFragment.getView()
                 .findViewById(R.id.list_view);
         //Force RecyclerView to layout to ensure findViewHolderForLayoutPosition works.
         recyclerView.layoutBothForTesting(0, 0, 100, 1000);
diff --git a/tests/robotests/src/com/android/car/dialer/ui/contact/ContactListViewHolderTest.java b/tests/robotests/src/com/android/car/dialer/ui/contact/ContactListViewHolderTest.java
index 5ec96e0..47f1cc8 100644
--- a/tests/robotests/src/com/android/car/dialer/ui/contact/ContactListViewHolderTest.java
+++ b/tests/robotests/src/com/android/car/dialer/ui/contact/ContactListViewHolderTest.java
@@ -35,6 +35,7 @@
 import com.android.car.dialer.telecom.UiCallManager;
 import com.android.car.telephony.common.Contact;
 import com.android.car.telephony.common.PhoneNumber;
+import com.android.car.telephony.common.PostalAddress;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -81,7 +82,7 @@
     @Test
     public void testDisplayName() {
         when(mMockContact.getDisplayName()).thenReturn(DISPLAY_NAME);
-        mContactListViewHolder.onBind(mMockContact, false, "");
+        mContactListViewHolder.bind(mMockContact, false, "");
 
         assertThat(((TextView) mItemView.findViewById(R.id.title)).getText()).isEqualTo(
                 DISPLAY_NAME);
@@ -92,7 +93,7 @@
         PhoneNumber phoneNumber = PhoneNumber.newInstance(mContext, PHONE_NUMBER_1, 0, LABEL_1,
                 false, 0, null, null, 0);
         when(mMockContact.getNumbers()).thenReturn(Arrays.asList(phoneNumber));
-        mContactListViewHolder.onBind(mMockContact, false, "");
+        mContactListViewHolder.bind(mMockContact, false, "");
 
         assertThat(((TextView) mItemView.findViewById(R.id.text)).getText()).isEqualTo(LABEL_1);
     }
@@ -102,7 +103,7 @@
         PhoneNumber phoneNumber = PhoneNumber.newInstance(mContext, PHONE_NUMBER_1, TYPE, null,
                 false, 0, null, null, 0);
         when(mMockContact.getNumbers()).thenReturn(Arrays.asList(phoneNumber));
-        mContactListViewHolder.onBind(mMockContact, false, "");
+        mContactListViewHolder.bind(mMockContact, false, "");
 
         assertThat(((TextView) mItemView.findViewById(R.id.text)).getText()).isEqualTo(
                 mContext.getResources().getText(
@@ -116,7 +117,7 @@
         PhoneNumber phoneNumber = mock(PhoneNumber.class);
         when(phoneNumber.getLabel()).thenReturn(null);
         when(mMockContact.getNumbers()).thenReturn(Arrays.asList(phoneNumber));
-        mContactListViewHolder.onBind(mMockContact, false, "");
+        mContactListViewHolder.bind(mMockContact, false, "");
 
         assertThat(((TextView) mItemView.findViewById(R.id.text)).getText()).isEqualTo("");
     }
@@ -129,7 +130,7 @@
                 false, 0, null, null, 0);
         when(mMockContact.getNumbers()).thenReturn(Arrays.asList(phoneNumber1, phoneNumber2));
         when(mMockContact.hasPrimaryPhoneNumber()).thenReturn(false);
-        mContactListViewHolder.onBind(mMockContact, false, "");
+        mContactListViewHolder.bind(mMockContact, false, "");
 
         assertThat(((TextView) mItemView.findViewById(R.id.text)).getText()).isEqualTo(
                 mContext.getString(R.string.type_multiple));
@@ -144,7 +145,7 @@
         when(mMockContact.getNumbers()).thenReturn(Arrays.asList(phoneNumber1, phoneNumber2));
         when(mMockContact.hasPrimaryPhoneNumber()).thenReturn(true);
         when(mMockContact.getPrimaryPhoneNumber()).thenReturn(phoneNumber2);
-        mContactListViewHolder.onBind(mMockContact, false, "");
+        mContactListViewHolder.bind(mMockContact, false, "");
 
         assertThat(((TextView) mItemView.findViewById(R.id.text)).getText()).isEqualTo(
                 mContext.getString(R.string.primary_number_description, LABEL_2));
@@ -159,7 +160,7 @@
         when(mMockContact.getNumbers()).thenReturn(Arrays.asList(phoneNumber1, phoneNumber2));
         when(mMockContact.hasPrimaryPhoneNumber()).thenReturn(true);
         when(mMockContact.getPrimaryPhoneNumber()).thenReturn(phoneNumber2);
-        mContactListViewHolder.onBind(mMockContact, false, "");
+        mContactListViewHolder.bind(mMockContact, false, "");
 
         assertThat(((TextView) mItemView.findViewById(R.id.text)).getText()).isEqualTo(
                 mContext.getString(R.string.primary_number_description,
@@ -178,7 +179,7 @@
         when(mMockContact.getNumbers()).thenReturn(Arrays.asList(phoneNumber1, phoneNumber2));
         when(mMockContact.hasPrimaryPhoneNumber()).thenReturn(true);
         when(mMockContact.getPrimaryPhoneNumber()).thenReturn(phoneNumber2);
-        mContactListViewHolder.onBind(mMockContact, false, "");
+        mContactListViewHolder.bind(mMockContact, false, "");
 
         assertThat(((TextView) mItemView.findViewById(R.id.text)).getText()).isEqualTo(
                 mContext.getString(R.string.primary_number_description, "null"));
@@ -190,7 +191,7 @@
         PhoneNumber phoneNumber = PhoneNumber.newInstance(mContext, PHONE_NUMBER_1, 0, LABEL_1,
                 false, 0, null, null, 0);
         when(mMockContact.getNumbers()).thenReturn(Arrays.asList(phoneNumber));
-        mContactListViewHolder.onBind(mMockContact, false, "");
+        mContactListViewHolder.bind(mMockContact, false, "");
 
         View callActionView = mItemView.findViewById(R.id.call_action_id);
         assertThat(callActionView.hasOnClickListeners()).isTrue();
@@ -211,7 +212,7 @@
                 false, 0, null, null, 0);
         when(mMockContact.getNumbers()).thenReturn(Arrays.asList(phoneNumber1, phoneNumber2));
         when(mMockContact.hasPrimaryPhoneNumber()).thenReturn(false);
-        mContactListViewHolder.onBind(mMockContact, false, "");
+        mContactListViewHolder.bind(mMockContact, false, "");
 
         assertThat(ShadowAlertDialog.getLatestAlertDialog()).isNull();
         View callActionView = mItemView.findViewById(R.id.call_action_id);
@@ -231,7 +232,7 @@
         when(mMockContact.getNumbers()).thenReturn(Arrays.asList(phoneNumber1, phoneNumber2));
         when(mMockContact.hasPrimaryPhoneNumber()).thenReturn(true);
         when(mMockContact.getPrimaryPhoneNumber()).thenReturn(phoneNumber2);
-        mContactListViewHolder.onBind(mMockContact, false, "");
+        mContactListViewHolder.bind(mMockContact, false, "");
 
         View callActionView = mItemView.findViewById(R.id.call_action_id);
         assertThat(callActionView.hasOnClickListeners()).isTrue();
@@ -244,8 +245,10 @@
     }
 
     @Test
-    public void testClickShowContactDetailView_showContactDetail() {
-        mContactListViewHolder.onBind(mMockContact, false, "");
+    public void testClickShowContactDetailView_hasContactDetail_showContactDetail() {
+        PhoneNumber phoneNumber = mock(PhoneNumber.class);
+        when(mMockContact.getNumbers()).thenReturn(Arrays.asList(phoneNumber));
+        mContactListViewHolder.bind(mMockContact, false, "");
 
         View showContactDetailActionView = mItemView.findViewById(R.id.show_contact_detail_id);
         assertThat(showContactDetailActionView.hasOnClickListeners()).isTrue();
@@ -256,4 +259,44 @@
         verify(mMockListener).onShowContactDetail(captor.capture());
         assertThat(captor.getValue()).isEqualTo(mMockContact);
     }
+
+    @Test
+    public void testClickShowContactDetailView_hasAddressButNoPhoneNumber_dependOnConfig() {
+        PostalAddress postalAddress = mock(PostalAddress.class);
+        when(mMockContact.getPostalAddresses()).thenReturn(Arrays.asList(postalAddress));
+        mContactListViewHolder.bind(mMockContact, false, "");
+
+        View showContactDetailActionView = mItemView.findViewById(R.id.show_contact_detail_id);
+
+        boolean showPostalAddress = mItemView.getResources().getBoolean(
+                R.bool.config_show_postal_address);
+        boolean forceShowButton = mItemView.getResources().getBoolean(
+                R.bool.config_show_contact_detail_button_for_empty_contact);
+
+        assertThat(showContactDetailActionView.isEnabled()).isEqualTo(showPostalAddress);
+        assertThat(showContactDetailActionView.getVisibility() == View.VISIBLE).isEqualTo(
+                showPostalAddress || forceShowButton);
+
+        if (showPostalAddress) {
+            assertThat(showContactDetailActionView.hasOnClickListeners()).isTrue();
+
+            showContactDetailActionView.performClick();
+
+            ArgumentCaptor<Contact> captor = ArgumentCaptor.forClass(Contact.class);
+            verify(mMockListener).onShowContactDetail(captor.capture());
+            assertThat(captor.getValue()).isEqualTo(mMockContact);
+        }
+    }
+
+    @Test
+    public void testClickShowContactDetailView_NoContactDetail_ContactDetailButtonNotEnabled() {
+        mContactListViewHolder.bind(mMockContact, false, "");
+
+        View showContactDetailActionView = mItemView.findViewById(R.id.show_contact_detail_id);
+
+        assertThat(showContactDetailActionView.isEnabled()).isFalse();
+        assertThat(showContactDetailActionView.getVisibility() == View.VISIBLE).isEqualTo(
+                mItemView.getResources().getBoolean(
+                        R.bool.config_show_contact_detail_button_for_empty_contact));
+    }
 }
diff --git a/tests/robotests/src/com/android/car/dialer/ui/favorite/FavoriteListFragmentTest.java b/tests/robotests/src/com/android/car/dialer/ui/favorite/FavoriteFragmentTest.java
similarity index 89%
rename from tests/robotests/src/com/android/car/dialer/ui/favorite/FavoriteListFragmentTest.java
rename to tests/robotests/src/com/android/car/dialer/ui/favorite/FavoriteFragmentTest.java
index 260bb48..5fcb006 100644
--- a/tests/robotests/src/com/android/car/dialer/ui/favorite/FavoriteListFragmentTest.java
+++ b/tests/robotests/src/com/android/car/dialer/ui/favorite/FavoriteFragmentTest.java
@@ -26,7 +26,7 @@
 
 import androidx.lifecycle.MutableLiveData;
 
-import com.android.car.apps.common.widget.PagedRecyclerView;
+import com.android.car.arch.common.FutureData;
 import com.android.car.dialer.CarDialerRobolectricTestRunner;
 import com.android.car.dialer.FragmentTestActivity;
 import com.android.car.dialer.R;
@@ -34,6 +34,7 @@
 import com.android.car.dialer.testutils.ShadowAndroidViewModelFactory;
 import com.android.car.telephony.common.Contact;
 import com.android.car.telephony.common.PhoneNumber;
+import com.android.car.ui.recyclerview.CarUiRecyclerView;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -49,10 +50,10 @@
 
 @Config(shadows = {ShadowAndroidViewModelFactory.class})
 @RunWith(CarDialerRobolectricTestRunner.class)
-public class FavoriteListFragmentTest {
+public class FavoriteFragmentTest {
     private static final String RAW_NUMBER = "6502530000";
 
-    private FavoriteListFragment mFavoriteFragment;
+    private FavoriteFragment mFavoriteFragment;
     private FavoriteContactViewHolder mViewHolder;
     @Mock
     private UiCallManager mMockUiCallManager;
@@ -70,17 +71,17 @@
         UiCallManager.set(mMockUiCallManager);
 
         when(mMockPhoneNumber.getRawNumber()).thenReturn(RAW_NUMBER);
-        MutableLiveData<List<Contact>> favoriteContacts = new MutableLiveData<>();
-        favoriteContacts.setValue(Arrays.asList(mMockContact));
+        MutableLiveData<FutureData<List<Contact>>> favoriteContacts = new MutableLiveData<>();
+        favoriteContacts.setValue(new FutureData<>(false, Arrays.asList(mMockContact)));
         ShadowAndroidViewModelFactory.add(FavoriteViewModel.class, mMockFavoriteViewModel);
         when(mMockFavoriteViewModel.getFavoriteContacts()).thenReturn(favoriteContacts);
 
-        mFavoriteFragment = FavoriteListFragment.newInstance();
+        mFavoriteFragment = FavoriteFragment.newInstance();
         FragmentTestActivity fragmentTestActivity = Robolectric.buildActivity(
                 FragmentTestActivity.class).create().resume().get();
         fragmentTestActivity.setFragment(mFavoriteFragment);
 
-        PagedRecyclerView recyclerView = mFavoriteFragment.getView().findViewById(R.id.list_view);
+        CarUiRecyclerView recyclerView = mFavoriteFragment.getView().findViewById(R.id.list_view);
         // set up layout for recyclerView
         recyclerView.layoutBothForTesting(0, 0, 100, 1000);
         mViewHolder = (FavoriteContactViewHolder) recyclerView.findViewHolderForLayoutPosition(0);
diff --git a/tests/robotests/src/com/android/car/dialer/ui/search/ContactResultsFragmentTest.java b/tests/robotests/src/com/android/car/dialer/ui/search/ContactResultsFragmentTest.java
index 3e349b1..83c8e79 100644
--- a/tests/robotests/src/com/android/car/dialer/ui/search/ContactResultsFragmentTest.java
+++ b/tests/robotests/src/com/android/car/dialer/ui/search/ContactResultsFragmentTest.java
@@ -28,7 +28,7 @@
 import androidx.fragment.app.FragmentManager;
 import androidx.lifecycle.MutableLiveData;
 
-import com.android.car.apps.common.widget.PagedRecyclerView;
+import com.android.car.arch.common.FutureData;
 import com.android.car.dialer.CarDialerRobolectricTestRunner;
 import com.android.car.dialer.FragmentTestActivity;
 import com.android.car.dialer.R;
@@ -37,6 +37,7 @@
 import com.android.car.dialer.ui.contact.ContactDetailsViewModel;
 import com.android.car.telephony.common.Contact;
 import com.android.car.telephony.common.InMemoryPhoneBook;
+import com.android.car.ui.recyclerview.CarUiRecyclerView;
 
 import org.junit.After;
 import org.junit.Before;
@@ -60,7 +61,7 @@
 
     private ContactResultsFragment mContactResultsFragment;
     private FragmentTestActivity mFragmentTestActivity;
-    private PagedRecyclerView mListView;
+    private CarUiRecyclerView mListView;
     private MutableLiveData<List<Contact>> mContactSearchResultsLiveData;
     @Mock
     private ContactResultsViewModel mMockContactResultsViewModel;
@@ -118,8 +119,8 @@
         mContactSearchResultsLiveData.setValue(
                 Arrays.asList(mContact1, mContact2, mContact3));
 
-        MutableLiveData<Contact> contactDetailLiveData = new MutableLiveData<>();
-        contactDetailLiveData.setValue(mMockContact);
+        MutableLiveData<FutureData<Contact>> contactDetailLiveData = new MutableLiveData<>();
+        contactDetailLiveData.setValue(new FutureData<>(false, mMockContact));
         ShadowAndroidViewModelFactory
                 .add(ContactDetailsViewModel.class, mMockContactDetailsViewModel);
         when(mMockContactDetailsViewModel.getContactDetails(any()))
diff --git a/tests/robotests/src/com/android/car/dialer/ui/settings/common/SettingsListPreferenceDialogFragmentTest.java b/tests/robotests/src/com/android/car/dialer/ui/settings/common/SettingsListPreferenceDialogFragmentTest.java
deleted file mode 100644
index 5b49713..0000000
--- a/tests/robotests/src/com/android/car/dialer/ui/settings/common/SettingsListPreferenceDialogFragmentTest.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright 2019 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.
- */
-
-package com.android.car.dialer.ui.settings.common;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.os.Bundle;
-
-import androidx.preference.ListPreference;
-
-import com.android.car.dialer.CarDialerRobolectricTestRunner;
-import com.android.car.dialer.FragmentTestActivity;
-import com.android.car.dialer.R;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.android.controller.ActivityController;
-import org.robolectric.shadows.ShadowAlertDialog;
-import org.robolectric.shadows.ShadowApplication;
-
-/** Unit test for {@link SettingsListPreferenceDialogFragment}. */
-@RunWith(CarDialerRobolectricTestRunner.class)
-public class SettingsListPreferenceDialogFragmentTest {
-
-    private ActivityController<FragmentTestActivity> mTestActivityController;
-    private FragmentTestActivity mTestActivity;
-    private ListPreference mPreference;
-    private SettingsListPreferenceDialogFragment mFragment;
-
-    @Before
-    public void setUp() {
-        Context context = RuntimeEnvironment.application;
-
-        mTestActivityController = ActivityController.of(new FragmentTestActivity());
-        mTestActivity = mTestActivityController.get();
-        mTestActivityController.setup();
-
-        SettingsPreferenceDialogFragmentTest.TestTargetFragment targetFragment =
-                new SettingsPreferenceDialogFragmentTest.TestTargetFragment();
-        mTestActivity.setFragment(targetFragment);
-        mPreference = new ListPreference(context);
-        mPreference.setDialogLayoutResource(R.layout.preference_dialog_edittext);
-        mPreference.setKey("key");
-        mPreference.setEntries(R.array.entries);
-        mPreference.setEntryValues(R.array.entry_values);
-        targetFragment.getPreferenceScreen().addPreference(mPreference);
-
-        mFragment = SettingsListPreferenceDialogFragment.newInstance(mPreference.getKey());
-        mFragment.setTargetFragment(targetFragment, /* requestCode= */ 0);
-    }
-
-    @Test
-    public void dialogPopulatedWithPreferenceEntries() {
-        mTestActivity.showDialog(mFragment, /* tag= */ null);
-
-        assertThat(getShadowAlertDialog().getItems()).isEqualTo(mPreference.getEntries());
-    }
-
-    @Test
-    public void itemSelected_dismissesDialog() {
-        mTestActivity.showDialog(mFragment, /* tag= */ null);
-
-        getShadowAlertDialog().clickOnItem(1);
-
-        assertThat(getShadowAlertDialog().hasBeenDismissed()).isTrue();
-    }
-
-    @Test
-    public void itemSelected_setsPreferenceValue() {
-        mPreference.setValueIndex(0);
-        mTestActivity.showDialog(mFragment, /* tag= */ null);
-
-        getShadowAlertDialog().clickOnItem(1);
-
-        assertThat(mPreference.getValue()).isEqualTo(mPreference.getEntryValues()[1]);
-    }
-
-    @Test
-    public void onDialogClosed_negativeResult_doesNothing() {
-        mPreference.setValueIndex(0);
-        mTestActivity.showDialog(mFragment, /* tag= */ null);
-        AlertDialog dialog = ShadowAlertDialog.getLatestAlertDialog();
-
-        dialog.getButton(DialogInterface.BUTTON_NEGATIVE).performClick();
-
-        assertThat(mPreference.getValue()).isEqualTo(mPreference.getEntryValues()[0]);
-    }
-
-    @Test
-    public void instanceStateRetained() {
-        mPreference.setValueIndex(0);
-        mTestActivity.showDialog(mFragment, /* tag= */ null);
-
-        // Save instance state.
-        Bundle outState = new Bundle();
-        mTestActivityController.pause().saveInstanceState(outState).stop();
-
-        // Recreate everything with saved state.
-        mTestActivityController = ActivityController.of(new FragmentTestActivity());
-        mTestActivity = mTestActivityController.get();
-        mTestActivityController.setup(outState);
-
-        // Ensure saved entries were applied.
-        assertThat(getShadowAlertDialog().getItems()).isEqualTo(mPreference.getEntries());
-    }
-
-    private ShadowAlertDialog getShadowAlertDialog() {
-        return ShadowApplication.getInstance().getLatestAlertDialog();
-    }
-}
diff --git a/tests/robotests/src/com/android/car/dialer/ui/settings/common/SettingsPreferenceDialogFragmentTest.java b/tests/robotests/src/com/android/car/dialer/ui/settings/common/SettingsPreferenceDialogFragmentTest.java
deleted file mode 100644
index 6e49bc9..0000000
--- a/tests/robotests/src/com/android/car/dialer/ui/settings/common/SettingsPreferenceDialogFragmentTest.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * Copyright 2019 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.
- */
-
-package com.android.car.dialer.ui.settings.common;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.os.Bundle;
-import android.view.View;
-import android.view.WindowManager;
-
-import androidx.preference.DialogPreference;
-import androidx.preference.PreferenceFragmentCompat;
-
-import com.android.car.dialer.CarDialerRobolectricTestRunner;
-import com.android.car.dialer.FragmentTestActivity;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.android.controller.ActivityController;
-import org.robolectric.shadow.api.Shadow;
-import org.robolectric.shadows.ShadowAlertDialog;
-import org.robolectric.shadows.ShadowApplication;
-import org.robolectric.shadows.ShadowWindow;
-
-/** Unit test for {@link SettingsPreferenceDialogFragment}. */
-@RunWith(CarDialerRobolectricTestRunner.class)
-public class SettingsPreferenceDialogFragmentTest {
-
-    private ActivityController<FragmentTestActivity> mTestActivityController;
-    private FragmentTestActivity mTestActivity;
-    private DialogPreference mPreference;
-    private TestSettingsPreferenceDialogFragment mFragment;
-
-    @Before
-    public void setUp() {
-        Context context = RuntimeEnvironment.application;
-
-        mTestActivityController = ActivityController.of(new FragmentTestActivity());
-        mTestActivity = mTestActivityController.get();
-        mTestActivityController.setup();
-
-        TestTargetFragment targetFragment = new TestTargetFragment();
-        mTestActivity.setFragment(targetFragment);
-        mPreference = new TestDialogPreference(context);
-        mPreference.setKey("key");
-        targetFragment.getPreferenceScreen().addPreference(mPreference);
-
-        mFragment = TestSettingsPreferenceDialogFragment.newInstance(mPreference.getKey());
-        mFragment.setTargetFragment(targetFragment, /* requestCode= */ 0);
-    }
-
-    @Test
-    public void dialogFieldsPopulatedWithPreferenceFields() {
-        mPreference.setDialogTitle("title");
-        mPreference.setPositiveButtonText("positive button text");
-        mPreference.setNegativeButtonText("negative button text");
-        mPreference.setDialogMessage("dialog message");
-
-        mTestActivity.showDialog(mFragment, /* tag= */ null);
-
-        assertThat(getShadowAlertDialog().getTitle()).isEqualTo(mPreference.getDialogTitle());
-        assertThat(ShadowAlertDialog.getLatestAlertDialog().getButton(
-                DialogInterface.BUTTON_POSITIVE).getText()).isEqualTo(
-                mPreference.getPositiveButtonText());
-        assertThat(ShadowAlertDialog.getLatestAlertDialog().getButton(
-                DialogInterface.BUTTON_NEGATIVE).getText()).isEqualTo(
-                mPreference.getNegativeButtonText());
-        assertThat(getShadowAlertDialog().getMessage()).isEqualTo(mPreference.getDialogMessage());
-    }
-
-    @Test
-    public void dialogMessage_messageViewShown() {
-        mPreference.setDialogTitle("title");
-        mPreference.setPositiveButtonText("positive button text");
-        mPreference.setNegativeButtonText("negative button text");
-        mPreference.setDialogMessage("dialog message");
-
-        mTestActivity.showDialog(mFragment, /* tag= */ null);
-        View messageView = ShadowAlertDialog.getLatestAlertDialog().findViewById(
-                android.R.id.message);
-
-        assertThat(messageView.getVisibility()).isEqualTo(View.VISIBLE);
-    }
-
-    @Test
-    public void noDialogMessage_messageViewHidden() {
-        mPreference.setDialogTitle("title");
-        mPreference.setPositiveButtonText("positive button text");
-        mPreference.setNegativeButtonText("negative button text");
-
-        mTestActivity.showDialog(mFragment, /* tag= */ null);
-        View messageView = ShadowAlertDialog.getLatestAlertDialog().findViewById(
-                android.R.id.message);
-
-        assertThat(messageView.getVisibility()).isEqualTo(View.GONE);
-    }
-
-    @Test
-    public void getPreference_returnsDialogRequestingPreference() {
-        mTestActivity.showDialog(mFragment, /* tag= */ null);
-
-        assertThat(mFragment.getPreference()).isEqualTo(mPreference);
-    }
-
-    @Test
-    public void dialogClosed_positiveButton_callsOnDialogClosed() {
-        mTestActivity.showDialog(mFragment, /* tag= */ null);
-        AlertDialog dialog = ShadowAlertDialog.getLatestAlertDialog();
-
-        dialog.getButton(DialogInterface.BUTTON_POSITIVE).performClick();
-
-        assertThat(mFragment.getDialogClosedResult()).isEqualTo(Boolean.TRUE);
-    }
-
-    @Test
-    public void dialogClosed_negativeButton_callsOnDialogClosed() {
-        mTestActivity.showDialog(mFragment, /* tag= */ null);
-        AlertDialog dialog = ShadowAlertDialog.getLatestAlertDialog();
-
-        dialog.getButton(DialogInterface.BUTTON_NEGATIVE).performClick();
-
-        assertThat(mFragment.getDialogClosedResult()).isEqualTo(Boolean.FALSE);
-    }
-
-    @Test
-    public void subclassNeedsInputMethod_softInputModeSetOnWindow() {
-        mFragment.setNeedsInputMethod(true);
-        mTestActivity.showDialog(mFragment, /* tag= */ null);
-
-        assertThat(getShadowWindowFromDialog(
-                ShadowAlertDialog.getLatestAlertDialog()).getSoftInputMode()).isEqualTo(
-                WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
-    }
-
-    @Test
-    public void subclassDoesNotNeedInputMethod_noWindowSoftInputMode() {
-        mFragment.setNeedsInputMethod(false);
-        mTestActivity.showDialog(mFragment, /* tag= */ null);
-
-        assertThat(getShadowWindowFromDialog(
-                ShadowAlertDialog.getLatestAlertDialog()).getSoftInputMode()).isEqualTo(0);
-    }
-
-    @Test
-    public void instanceStateRetained() {
-        String dialogTitle = "dialog title";
-        String positiveButtonText = "positive button text";
-        String negativeButtonText = "negative button text";
-        String dialogMessage = "dialog message";
-        mPreference.setDialogTitle(dialogTitle);
-        mPreference.setPositiveButtonText(positiveButtonText);
-        mPreference.setNegativeButtonText(negativeButtonText);
-        mPreference.setDialogMessage(dialogMessage);
-
-        mTestActivity.showDialog(mFragment, /* tag= */ null);
-
-        // Save instance state.
-        Bundle outState = new Bundle();
-        mTestActivityController.pause().saveInstanceState(outState).stop();
-
-        // Recreate everything with saved state.
-        mTestActivityController = ActivityController.of(new FragmentTestActivity());
-        mTestActivity = mTestActivityController.get();
-        mTestActivityController.setup(outState);
-
-        // Ensure saved fields were applied.
-        assertThat(getShadowAlertDialog().getTitle()).isEqualTo(dialogTitle);
-        assertThat(ShadowAlertDialog.getLatestAlertDialog().getButton(
-                DialogInterface.BUTTON_POSITIVE).getText()).isEqualTo(positiveButtonText);
-        assertThat(ShadowAlertDialog.getLatestAlertDialog().getButton(
-                DialogInterface.BUTTON_NEGATIVE).getText()).isEqualTo(negativeButtonText);
-        assertThat(getShadowAlertDialog().getMessage()).isEqualTo(dialogMessage);
-    }
-
-    private ShadowAlertDialog getShadowAlertDialog() {
-        return ShadowApplication.getInstance().getLatestAlertDialog();
-    }
-
-    private ShadowWindow getShadowWindowFromDialog(AlertDialog dialog) {
-        return (ShadowWindow) Shadow.extract(dialog.getWindow());
-    }
-
-    /** Concrete implementation of the fragment under test. */
-    public static class TestSettingsPreferenceDialogFragment extends
-            SettingsPreferenceDialogFragment {
-
-        private Boolean mDialogClosedResult;
-        private boolean mNeedsInputMethod;
-
-        static TestSettingsPreferenceDialogFragment newInstance(String key) {
-            TestSettingsPreferenceDialogFragment fragment =
-                    new TestSettingsPreferenceDialogFragment();
-            Bundle b = new Bundle(/* capacity= */ 1);
-            b.putString(ARG_KEY, key);
-            fragment.setArguments(b);
-            return fragment;
-        }
-
-        @Override
-        protected boolean needInputMethod() {
-            return mNeedsInputMethod;
-        }
-
-        void setNeedsInputMethod(boolean needsInputMethod) {
-            mNeedsInputMethod = needsInputMethod;
-        }
-
-        @Override
-        protected void onDialogClosed(boolean positiveResult) {
-            mDialogClosedResult = positiveResult;
-        }
-
-        Boolean getDialogClosedResult() {
-            return mDialogClosedResult;
-        }
-    }
-
-    /** Concrete implementation of {@link DialogPreference} for testing use. */
-    private static class TestDialogPreference extends DialogPreference {
-        TestDialogPreference(Context context) {
-            super(context);
-        }
-    }
-
-    /** Simple {@link PreferenceFragmentCompat} implementation to serve as the target fragment. */
-    public static class TestTargetFragment extends PreferenceFragmentCompat {
-        @Override
-        public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-            setPreferenceScreen(getPreferenceManager().createPreferenceScreen(getContext()));
-        }
-    }
-}