From dce8011d84fb4f774f34e83e59b77668c03d3978 Mon Sep 17 00:00:00 2001
From: Mohit <futuretechnoworld.mohit@gmail.com>
Date: Fri, 6 Mar 2020 12:31:27 +0530
Subject: [PATCH 1/9] Contacts: about: Add license, authors, and contact
 information

---
 res/values/e_strings.xml                      | 35 ++++++++++++++++++
 res/xml/preference_about.xml                  | 26 +++++++++++++
 .../preference/AboutPreferenceFragment.java   | 37 ++++++++++++++++---
 3 files changed, 92 insertions(+), 6 deletions(-)
 create mode 100644 res/values/e_strings.xml

diff --git a/res/values/e_strings.xml b/res/values/e_strings.xml
new file mode 100644
index 0000000000..14e376dfe3
--- /dev/null
+++ b/res/values/e_strings.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2006 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- About App -->
+    <string name="preferences_about_app">Contacts is forked from LineageOS Contacts</string>
+
+    <!-- Authors -->
+    <string name="preferences_authors">Authors</string>
+
+    <!-- Source Code-->
+    <string name="preferences_source_code">Source code</string>
+
+    <!-- License -->
+    <string name="preferences_licence">Licence</string>
+
+    <!-- Contact Information -->
+    <string name="preferences_app_info_title">Contacts information</string>
+    <string name="preferences_app_info">Contacts is an open source App for Android</string>
+
+    <!--Explanation with icon of Drawer in Contacts. Your medical information ie. Date of birth, Bloodtype, allergic details can be recorded for reference. -->
+    <string name="menu_emergency_information_txt">Emergency information</string>
+</resources>
diff --git a/res/xml/preference_about.xml b/res/xml/preference_about.xml
index a109db68ed..9258a60d75 100644
--- a/res/xml/preference_about.xml
+++ b/res/xml/preference_about.xml
@@ -15,11 +15,37 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <Preference
+            android:icon="@null"
+            android:key="contacts_info"
+            android:summary="@string/preferences_app_info"
+            android:title="@string/preferences_app_info_title" />
+
     <Preference
             android:icon="@null"
             android:key="@string/pref_build_version_key"
             android:title="@string/about_build_version"/>
 
+    <Preference
+            android:icon="@null"
+            android:key="about_app"
+            android:title="@string/preferences_about_app" />
+
+    <Preference
+            android:icon="@null"
+            android:key="license"
+            android:title="@string/preferences_licence" />
+
+    <Preference
+            android:icon="@null"
+            android:key="authors"
+            android:title="@string/preferences_authors" />
+
+    <Preference
+            android:icon="@null"
+            android:key="source_code"
+            android:title="@string/preferences_source_code" />
+
     <Preference
             android:icon="@null"
             android:key="@string/pref_open_source_licenses_key"
diff --git a/src/com/android/contacts/preference/AboutPreferenceFragment.java b/src/com/android/contacts/preference/AboutPreferenceFragment.java
index 378948033a..272cd04398 100644
--- a/src/com/android/contacts/preference/AboutPreferenceFragment.java
+++ b/src/com/android/contacts/preference/AboutPreferenceFragment.java
@@ -35,8 +35,13 @@ import com.android.contacts.activities.LicenseActivity;
  */
 public class AboutPreferenceFragment extends PreferenceFragment {
 
-    public static final String PRIVACY_POLICY_URL = "http://www.google.com/policies/privacy";
-    public static final String TERMS_OF_SERVICE_URL = "http://www.google.com/policies/terms";
+    public static final String BUILD_VERSION_URL = "https://gitlab.e.foundation/e/os/android_packages_apps_Contacts/-/releases";
+    public static final String ABOUT_APP_URL = "https://github.com/LineageOS/android_packages_apps_Contacts";
+    public static final String LICENSE_URL = "https://gitlab.e.foundation/e/os/android_packages_apps_Contacts/-/blob/v1-r/NOTICE";
+    public static final String AUTHORS_URL = "https://gitlab.e.foundation/e/os/android_packages_apps_Contacts";
+    public static final String SOURCE_CODE_URL = "https://gitlab.e.foundation/e/os/android_packages_apps_Contacts";
+    public static final String PRIVACY_POLICY_URL = "https://e.foundation/legal-notice-privacy/";
+    public static final String TERMS_OF_SERVICE_URL = "https://e.foundation/legal-notice-privacy/";
 
     public static AboutPreferenceFragment newInstance() {
         return new AboutPreferenceFragment();
@@ -60,12 +65,14 @@ public class AboutPreferenceFragment extends PreferenceFragment {
             // Nothing
         }
 
-        final Preference licensePreference = findPreference(
-                getString(R.string.pref_open_source_licenses_key));
-        licensePreference.setIntent(new Intent(getActivity(), LicenseActivity.class));
-
+        final Preference buildVersionPreference = findPreference("pref_build_version");
+        final Preference aboutAppPreference = findPreference("about_app");
+        final Preference licensePreference = findPreference("license");
+        final Preference authorsPreference = findPreference("authors");
+        final Preference sourceCodePreference = findPreference("source_code");
         final Preference privacyPolicyPreference = findPreference("pref_privacy_policy");
         final Preference termsOfServicePreference = findPreference("pref_terms_of_service");
+        final Preference openSourceLicensePreference = findPreference(getString(R.string.pref_open_source_licenses_key));
 
         final Preference.OnPreferenceClickListener listener =
                 new Preference.OnPreferenceClickListener() {
@@ -76,6 +83,18 @@ public class AboutPreferenceFragment extends PreferenceFragment {
                         startActivityForUrl(PRIVACY_POLICY_URL);
                     } else if (preference == termsOfServicePreference) {
                         startActivityForUrl(TERMS_OF_SERVICE_URL);
+                    } else if (preference == buildVersionPreference) {
+                        startActivityForUrl(BUILD_VERSION_URL);
+                    } else if (preference == aboutAppPreference) {
+                        startActivityForUrl(ABOUT_APP_URL);
+                    } else if (preference == licensePreference) {
+                        startActivityForUrl(LICENSE_URL);
+                    } else if (preference == authorsPreference) {
+                        startActivityForUrl(AUTHORS_URL);
+                    } else if (preference == sourceCodePreference) {
+                        startActivityForUrl(SOURCE_CODE_URL);
+                    } else if (preference == openSourceLicensePreference) {
+                        startActivity(new Intent(getActivity(), LicenseActivity.class));
                     }
                 } catch (ActivityNotFoundException ex) {
                     Toast.makeText(getContext(), getString(R.string.url_open_error_toast),
@@ -85,6 +104,12 @@ public class AboutPreferenceFragment extends PreferenceFragment {
             }
         };
 
+        buildVersionPreference.setOnPreferenceClickListener(listener);
+        aboutAppPreference.setOnPreferenceClickListener(listener);
+        licensePreference.setOnPreferenceClickListener(listener);
+        authorsPreference.setOnPreferenceClickListener(listener);
+        sourceCodePreference.setOnPreferenceClickListener(listener);
+        openSourceLicensePreference.setOnPreferenceClickListener(listener);
         privacyPolicyPreference.setOnPreferenceClickListener(listener);
         termsOfServicePreference.setOnPreferenceClickListener(listener);
     }
-- 
GitLab


From 0fe245a92e2d75baccc1ace66eeddbc32bfcda58 Mon Sep 17 00:00:00 2001
From: Amit Kumar <mr.doc10jl96@gmail.com>
Date: Thu, 25 Mar 2021 22:18:37 +0530
Subject: [PATCH 2/9] Contacts: Sort /e/ account with first priority and allow
 user to modify primary account for profile

Change-Id: I27755aa319359ec33438f0a6bd470be126fd0f9a
---
 .../contacts/editor/RawContactEditorView.java        |  2 +-
 .../contacts/model/account/AccountComparator.java    | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/com/android/contacts/editor/RawContactEditorView.java b/src/com/android/contacts/editor/RawContactEditorView.java
index 19da5bc81c..4e6d61f375 100644
--- a/src/com/android/contacts/editor/RawContactEditorView.java
+++ b/src/com/android/contacts/editor/RawContactEditorView.java
@@ -782,7 +782,7 @@ public class RawContactEditorView extends LinearLayout implements View.OnClickLi
         }
 
         // If we're saving a new contact and there are multiple accounts, add the account selector.
-        if (mHasNewContact && !mIsUserProfile && mAccounts.size() > 1) {
+        if (mHasNewContact && mAccounts.size() > 1) {
             addAccountSelector(mCurrentRawContactDelta);
         }
     }
diff --git a/src/com/android/contacts/model/account/AccountComparator.java b/src/com/android/contacts/model/account/AccountComparator.java
index 70ccf494fb..8bc8fbbf76 100644
--- a/src/com/android/contacts/model/account/AccountComparator.java
+++ b/src/com/android/contacts/model/account/AccountComparator.java
@@ -38,13 +38,13 @@ public class AccountComparator implements Comparator<AccountWithDataSet> {
             return -1;
         } else if (a.name == null || a.type == null) {
             return 1;
-        } else if (isWritableGoogleAccount(a) && a.equals(mDefaultAccount)) {
+        } else if (isWritableEAccount(a) && a.equals(mDefaultAccount)) {
             return -1;
-        } else if (isWritableGoogleAccount(b) && b.equals(mDefaultAccount)) {
+        } else if (isWritableEAccount(b) && b.equals(mDefaultAccount)) {
             return 1;
-        } else if (isWritableGoogleAccount(a) && !isWritableGoogleAccount(b)) {
+        } else if (isWritableEAccount(a) && !isWritableEAccount(b)) {
             return -1;
-        } else if (isWritableGoogleAccount(b) && !isWritableGoogleAccount(a)) {
+        } else if (isWritableEAccount(b) && !isWritableEAccount(a)) {
             return 1;
         } else {
             int diff = a.name.compareToIgnoreCase(b.name);
@@ -65,7 +65,7 @@ public class AccountComparator implements Comparator<AccountWithDataSet> {
         }
     }
 
-    private static boolean isWritableGoogleAccount(AccountWithDataSet account) {
-        return GoogleAccountType.ACCOUNT_TYPE.equals(account.type) && account.dataSet == null;
+    private static boolean isWritableEAccount(AccountWithDataSet account) {
+        return "foundation.e.accountmanager.eelo.address_book".equals(account.type) && account.dataSet == null;
     }
 }
-- 
GitLab


From 7628559ad27a46c76c2f575bf6817a7b14a68ba0 Mon Sep 17 00:00:00 2001
From: Fahim Salam Chowdhury <fahim@e.email>
Date: Mon, 3 Oct 2022 12:14:37 +0000
Subject: [PATCH 3/9] 709-s-Open_accountManager_onClick_add_account

---
 .../activities/ContactEditorAccountsChangedActivity.java        | 2 +-
 src/com/android/contacts/list/ContactsUnavailableFragment.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java b/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java
index 8f0509baba..c0d71d774c 100644
--- a/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java
+++ b/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java
@@ -70,7 +70,7 @@ public class ContactEditorAccountsChangedActivity extends Activity
     private final OnClickListener mAddAccountClickListener = new OnClickListener() {
         @Override
         public void onClick(View v) {
-            final Intent intent = ImplicitIntentsUtil.getIntentForAddingGoogleAccount();
+            final Intent intent = ImplicitIntentsUtil.getIntentForAddingAccount();
             startActivityForResult(intent, SUBACTIVITY_ADD_NEW_ACCOUNT);
         }
     };
diff --git a/src/com/android/contacts/list/ContactsUnavailableFragment.java b/src/com/android/contacts/list/ContactsUnavailableFragment.java
index 048ce62e36..299a184550 100644
--- a/src/com/android/contacts/list/ContactsUnavailableFragment.java
+++ b/src/com/android/contacts/list/ContactsUnavailableFragment.java
@@ -131,7 +131,7 @@ public class ContactsUnavailableFragment extends Fragment implements OnClickList
     public void onClick(View v) {
         final int id = v.getId();
         if (id == R.id.add_account_button) {
-            final Intent intent = ImplicitIntentsUtil.getIntentForAddingGoogleAccount();
+            final Intent intent = ImplicitIntentsUtil.getIntentForAddingAccount();
             ImplicitIntentsUtil.startActivityOutsideApp(getActivity(), intent);
 
         } else if (id == R.id.import_contacts_button) {
-- 
GitLab


From 1c7916bd8839fcd53c2fa18d87a8360912aee45a Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Mon, 10 Oct 2022 14:30:21 +0530
Subject: [PATCH 4/9] Change app icon to our custom icon

---
 res/drawable/ic_launcher_background.xml | 40 ++++++++++----
 res/drawable/ic_launcher_foreground.xml | 70 +++++++++++++++----------
 res/drawable/ic_launcher_monochrome.xml | 19 -------
 res/mipmap-anydpi/ic_launcher.xml       | 25 ++++++---
 4 files changed, 91 insertions(+), 63 deletions(-)
 delete mode 100644 res/drawable/ic_launcher_monochrome.xml

diff --git a/res/drawable/ic_launcher_background.xml b/res/drawable/ic_launcher_background.xml
index fc4823054e..f1931a336b 100644
--- a/res/drawable/ic_launcher_background.xml
+++ b/res/drawable/ic_launcher_background.xml
@@ -1,20 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
+  ~ Copyright (C) 2022  E FOUNDATION
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
     android:width="108dp"
     android:height="108dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
   <path
-      android:pathData="M0,0h108v108h-108z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M77,51C77,59.837 70,63 61,63C52,63 45,59.837 45,51C45,38.163 52,31 61,31C70,31 77,38.163 77,51Z"
-      android:fillColor="#4D84E9"/>
-  <path
-      android:pathData="M71,49C68.569,50.255 64.821,51 61,51C57.179,51 53.431,50.255 51,49C52.093,52.47 54.333,57 61,57C67.667,57 69.907,52.47 71,49Z"
-      android:fillColor="#ffffff"/>
+      android:pathData="M0,0h108v108h-108z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="54"
+          android:startY="7.15"
+          android:endX="54"
+          android:endY="208.35"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFD8DDDF"/>
+        <item android:offset="1" android:color="#FF949DA1"/>
+      </gradient>
+    </aapt:attr>
+  </path>
 </vector>
diff --git a/res/drawable/ic_launcher_foreground.xml b/res/drawable/ic_launcher_foreground.xml
index 686ffa2b53..e305355101 100644
--- a/res/drawable/ic_launcher_foreground.xml
+++ b/res/drawable/ic_launcher_foreground.xml
@@ -1,36 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
+  ~ Copyright (C) 2022  E FOUNDATION
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt"
     android:width="108dp"
     android:height="108dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
-  <group>
-    <clip-path
-        android:pathData="M0,0h108v108h-108z"/>
-    <path
-        android:pathData="M64,64C64,72.837 57,76 48,76C39,76 32,72.837 32,64C32,51.163 39,44 48,44C57,44 64,51.163 64,64Z"
-        android:fillColor="#193057"/>
-    <path
-        android:pathData="M58,62C55.569,63.255 51.821,64 48,64C44.179,64 40.431,63.255 38,62C39.093,65.47 41.333,70 48,70C54.667,70 56.907,65.47 58,62Z"
-        android:fillColor="#ffffff"/>
-    <path
-        android:pathData="M28.54,28.54m-72,0a72,72 0,1 1,144 0a72,72 0,1 1,-144 0"
-        android:fillAlpha="0.6">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:gradientRadius="72"
-            android:centerX="28.54"
-            android:centerY="28.54"
-            android:type="radial">
-          <item android:offset="0" android:color="#19FFFFFF"/>
-          <item android:offset="1" android:color="#00FFFFFF"/>
-        </gradient>
-      </aapt:attr>
-    </path>
-  </group>
+  <path
+      android:pathData="M45.7,47.13C45.65,46.65 45.65,46.17 45.7,45.69C45.8,45.04 48.37,41.23 48.99,40.88C49.41,40.61 49.87,40.43 50.36,40.35C50.44,40.34 50.51,40.32 50.58,40.28C50.72,40.11 50.92,39.99 51.14,39.95C51.36,39.91 51.59,39.94 51.79,40.04C51.61,39.76 52.07,39.38 52.38,39.42C53.68,39.56 55.01,39.48 56.29,39.79C57.94,40.19 60.54,42.64 60.64,42.75C60.56,42.8 60.54,42.84 60.64,42.89C60.64,42.89 62.15,45.5 62.04,47.08C61.96,48.25 61.81,49.92 61.69,51.1C61.67,51.19 61.68,51.28 61.7,51.37C61.73,51.45 61.77,51.54 61.83,51.6C62.45,52.12 62.29,52.78 62.15,53.4C61.93,54.39 61.65,55.36 61.38,56.33C61.37,56.41 61.35,56.48 61.3,56.54C61.26,56.6 61.2,56.65 61.13,56.69C60.95,56.78 60.8,56.92 60.68,57.08C60.56,57.25 60.48,57.44 60.45,57.64C60.21,58.48 59.84,59.27 59.37,60.01C59.07,60.57 58.96,61.2 59.03,61.83C59.05,62.36 59.09,62.88 59.11,63.41C59.12,63.56 59.18,63.71 59.28,63.82C59.38,63.94 59.52,64.02 59.67,64.04C60.37,64.26 60.58,64.75 60.65,65.44C60.75,66.44 61.08,67.26 62.16,67.75C64.49,68.76 66.78,69.89 69.08,70.98C69.25,71.03 69.41,71.12 69.53,71.26C68.78,71.94 67.98,72.58 67.13,73.15C63.15,75.9 58.41,77.32 53.57,77.22C48.06,77.17 42.74,75.15 38.59,71.52C38.2,71.2 38.21,71.2 38.69,70.96C40.93,69.89 43.17,68.82 45.46,67.84C45.97,67.65 46.41,67.3 46.72,66.85C47.03,66.4 47.19,65.87 47.18,65.32C47.22,64.52 47.35,64.34 48.11,64.09C48.29,64.04 48.44,63.93 48.55,63.78C48.66,63.64 48.71,63.46 48.7,63.27C48.7,62.58 48.73,61.91 48.75,61.19C48.74,60.94 48.69,60.68 48.59,60.44C48.23,59.5 47.86,59.08 47.52,58.11C47.33,57.54 47.02,57.01 46.61,56.57C46.29,56.15 46.09,55.64 46.04,55.12C45.88,54.48 45.77,53.83 45.63,53.19C45.55,52.97 45.49,52.74 45.47,52.5C45.47,52.09 45.47,51.79 45.92,51.59C46.15,51.49 46.09,51.22 46.07,51.01C45.94,49.91 45.82,48.27 45.7,47.13Z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="53.91"
+          android:startY="54.66"
+          android:endX="53.91"
+          android:endY="126.78"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFFFFFF"/>
+        <item android:offset="1" android:color="#FFCBD6EA"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M54,31.79C59.89,31.8 65.53,34.14 69.7,38.3C73.86,42.47 76.2,48.11 76.21,54C76.2,59.89 73.86,65.54 69.7,69.7C65.53,73.86 59.89,76.21 54,76.21C48.11,76.21 42.46,73.86 38.3,69.7C34.14,65.53 31.79,59.89 31.79,54C31.79,48.11 34.14,42.47 38.3,38.3C42.46,34.14 48.11,31.8 54,31.79ZM54,29.28C47.44,29.28 41.16,31.89 36.52,36.52C31.89,41.16 29.28,47.44 29.28,54C29.28,60.56 31.89,66.84 36.52,71.48C41.16,76.11 47.44,78.72 54,78.72C57.24,78.72 60.46,78.08 63.46,76.84C66.46,75.59 69.18,73.77 71.48,71.48C73.77,69.18 75.59,66.46 76.84,63.46C78.08,60.46 78.72,57.25 78.72,54C78.72,50.75 78.08,47.54 76.84,44.54C75.59,41.54 73.77,38.82 71.48,36.52C69.18,34.23 66.46,32.41 63.46,31.16C60.46,29.92 57.24,29.28 54,29.28Z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="53.98"
+          android:startY="49.21"
+          android:endX="53.98"
+          android:endY="143.51"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFFFFFF"/>
+        <item android:offset="1" android:color="#FFCBD6EA"/>
+      </gradient>
+    </aapt:attr>
+  </path>
 </vector>
diff --git a/res/drawable/ic_launcher_monochrome.xml b/res/drawable/ic_launcher_monochrome.xml
deleted file mode 100644
index fc64ec074b..0000000000
--- a/res/drawable/ic_launcher_monochrome.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <path
-      android:pathData="M70.724,57.809C72.696,56.509 74,54.485 74,51C74,45.112 72.398,40.856 70.086,38.125C67.803,35.43 64.654,34 61,34C57.346,34 54.197,35.43 51.915,38.125C51.199,38.97 50.551,39.962 49.998,41.102C49.341,41.034 48.674,41 48,41C47.579,41 47.161,41.013 46.747,41.04C49.369,34.518 54.693,31 61,31C70,31 77,38.163 77,51C77,57.753 72.912,61.193 66.967,62.439C66.924,61.405 66.836,60.4 66.706,59.425C68.305,59.057 69.654,58.515 70.724,57.809ZM64.076,50.84C64.882,52.37 65.53,54.051 66.009,55.867C68.942,54.302 70.245,51.398 71,49C69.23,49.914 66.762,50.557 64.076,50.84Z"
-      android:fillColor="#ffffffff"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M48,76C57,76 64,72.837 64,64C64,51.163 57,44 48,44C39,44 32,51.163 32,64C32,72.837 39,76 48,76ZM48,64C51.821,64 55.569,63.255 58,62C56.907,65.47 54.667,70 48,70C41.333,70 39.093,65.47 38,62C40.431,63.255 44.179,64 48,64Z"
-      android:fillColor="#ffffffff"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/res/mipmap-anydpi/ic_launcher.xml b/res/mipmap-anydpi/ic_launcher.xml
index b58c81ff94..f96ce541f6 100644
--- a/res/mipmap-anydpi/ic_launcher.xml
+++ b/res/mipmap-anydpi/ic_launcher.xml
@@ -1,10 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
+  ~ Copyright (C) 2022  E FOUNDATION
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground> 
+        <inset android:drawable="@drawable/ic_launcher_foreground" android:inset="5%" />
+    </foreground>
 </adaptive-icon>
-- 
GitLab


From 66df9fdbddf9270b6a67716583d0efe2c5b3f6aa Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Mon, 10 Oct 2022 16:15:38 +0530
Subject: [PATCH 5/9] Theme app according to our palette

---
 Android.bp                                    |   1 +
 res/drawable-anydpi-v26/fab_pink.xml          |  28 +++++
 ...ite_540dp.png => ic_person_white_base.png} | Bin
 ...ite_540dp.png => ic_person_white_base.png} | Bin
 ...ite_540dp.png => ic_person_white_base.png} | Bin
 ...ite_540dp.png => ic_person_white_base.png} | Bin
 ...ite_540dp.png => ic_person_white_base.png} | Bin
 res/drawable/person_white_540dp.xml           |  19 +++
 res/drawable/quantum_ic_drawer_my_info_32.xml |  10 +-
 res/layout-land/people_activity_toolbar.xml   |   2 +-
 res/layout/contact_editor_activity.xml        |   2 +-
 res/layout/contact_editor_fields.xml          |   2 +-
 res/layout/people_activity_toolbar.xml        |   2 +-
 res/layout/search_bar_expanded.xml            |   4 +-
 res/layout/selection_bar.xml                  |   2 +-
 res/values-night/colors.xml                   |   2 +-
 res/values-v27/styles.xml                     |  16 +--
 res/values/colors.xml                         | 116 +++++++++---------
 res/values/lineage_colors.xml                 |   4 +-
 res/values/styles.xml                         |  28 +++--
 .../contacts/activities/PeopleActivity.java   |   4 +-
 .../contacts/drawer/DrawerAdapter.java        |   2 +-
 .../lettertiles/LetterTileDrawable.java       |   1 -
 .../contacts/util/MaterialColorMapUtils.java  |   4 +-
 24 files changed, 147 insertions(+), 102 deletions(-)
 create mode 100644 res/drawable-anydpi-v26/fab_pink.xml
 rename res/drawable-hdpi/{person_white_540dp.png => ic_person_white_base.png} (100%)
 rename res/drawable-mdpi/{person_white_540dp.png => ic_person_white_base.png} (100%)
 rename res/drawable-xhdpi/{person_white_540dp.png => ic_person_white_base.png} (100%)
 rename res/drawable-xxhdpi/{person_white_540dp.png => ic_person_white_base.png} (100%)
 rename res/drawable-xxxhdpi/{person_white_540dp.png => ic_person_white_base.png} (100%)
 create mode 100644 res/drawable/person_white_540dp.xml

diff --git a/Android.bp b/Android.bp
index de9041260d..e02fef8216 100644
--- a/Android.bp
+++ b/Android.bp
@@ -43,6 +43,7 @@ android_app {
         "com.android.vcard",
         "guava",
         "libphonenumber",
+        "elib",
     ],
 
     certificate: "shared",
diff --git a/res/drawable-anydpi-v26/fab_pink.xml b/res/drawable-anydpi-v26/fab_pink.xml
new file mode 100644
index 0000000000..deea990297
--- /dev/null
+++ b/res/drawable-anydpi-v26/fab_pink.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022  E FOUNDATION
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+
+    <solid
+        android:color="@color/e_accent"/>
+
+    <size
+        android:width="24dp"
+        android:height="24dp"/>
+</shape>
diff --git a/res/drawable-hdpi/person_white_540dp.png b/res/drawable-hdpi/ic_person_white_base.png
similarity index 100%
rename from res/drawable-hdpi/person_white_540dp.png
rename to res/drawable-hdpi/ic_person_white_base.png
diff --git a/res/drawable-mdpi/person_white_540dp.png b/res/drawable-mdpi/ic_person_white_base.png
similarity index 100%
rename from res/drawable-mdpi/person_white_540dp.png
rename to res/drawable-mdpi/ic_person_white_base.png
diff --git a/res/drawable-xhdpi/person_white_540dp.png b/res/drawable-xhdpi/ic_person_white_base.png
similarity index 100%
rename from res/drawable-xhdpi/person_white_540dp.png
rename to res/drawable-xhdpi/ic_person_white_base.png
diff --git a/res/drawable-xxhdpi/person_white_540dp.png b/res/drawable-xxhdpi/ic_person_white_base.png
similarity index 100%
rename from res/drawable-xxhdpi/person_white_540dp.png
rename to res/drawable-xxhdpi/ic_person_white_base.png
diff --git a/res/drawable-xxxhdpi/person_white_540dp.png b/res/drawable-xxxhdpi/ic_person_white_base.png
similarity index 100%
rename from res/drawable-xxxhdpi/person_white_540dp.png
rename to res/drawable-xxxhdpi/ic_person_white_base.png
diff --git a/res/drawable/person_white_540dp.xml b/res/drawable/person_white_540dp.xml
new file mode 100644
index 0000000000..479c55cbb9
--- /dev/null
+++ b/res/drawable/person_white_540dp.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_person_white_base"
+    android:tint="@color/e_background"/>
\ No newline at end of file
diff --git a/res/drawable/quantum_ic_drawer_my_info_32.xml b/res/drawable/quantum_ic_drawer_my_info_32.xml
index 4e310cb4a1..b0b0f16afe 100644
--- a/res/drawable/quantum_ic_drawer_my_info_32.xml
+++ b/res/drawable/quantum_ic_drawer_my_info_32.xml
@@ -5,15 +5,11 @@
         android:viewportHeight="32.0">
     <path
         android:pathData="M15.8,1C7.5,1 0.9,7.7 1,16c0.1,8.3 6.9,15 15.2,15S31.1,24.3 31,16C30.9,7.7 24.1,1 15.8,1z"
-        android:fillColor="#4185F3"/>
+        android:fillColor="@color/e_accent"/>
     <path
         android:pathData="M16,12.3m-3.8,0a3.8,3.8 0,1 1,7.6 0a3.8,3.8 0,1 1,-7.6 0"
-        android:fillAlpha="0.2"
-        android:fillColor="#FFFFFF"
-        android:strokeAlpha="0.2"/>
+        android:fillColor="@color/e_background" />
     <path
         android:pathData="M23.5,23.5h-15v-1.9c0,-2.5 5,-3.8 7.5,-3.8s7.5,1.3 7.5,3.8V23.5z"
-        android:fillAlpha="0.2"
-        android:fillColor="#FFFFFF"
-        android:strokeAlpha="0.2"/>
+        android:fillColor="@color/e_background" />
 </vector>
diff --git a/res/layout-land/people_activity_toolbar.xml b/res/layout-land/people_activity_toolbar.xml
index 15f12f6718..eb33d39578 100644
--- a/res/layout-land/people_activity_toolbar.xml
+++ b/res/layout-land/people_activity_toolbar.xml
@@ -29,7 +29,7 @@
         android:id="@+id/toolbar_frame"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:background="?attr/colorPrimary">
+        android:background="@color/actionbar_background_color">
 
         <!-- the attribute padding removes the gap between this Toolbar and its parent FrameLayout on tablet -->
         <androidx.appcompat.widget.Toolbar
diff --git a/res/layout/contact_editor_activity.xml b/res/layout/contact_editor_activity.xml
index 5843a58cdd..e7eb9c91c8 100644
--- a/res/layout/contact_editor_activity.xml
+++ b/res/layout/contact_editor_activity.xml
@@ -27,7 +27,7 @@
         style="@style/EditorActionBarStyle"
         android:layout_width="match_parent"
         android:layout_height="?android:attr/actionBarSize"
-        android:background="?android:attr/colorPrimary"
+        android:background="@color/actionbar_background_color"
         android:elevation="4dp"
         app:navigationContentDescription="@string/cancel_button_content_description"
         app:navigationIcon="@drawable/quantum_ic_close_vd_theme_24"
diff --git a/res/layout/contact_editor_fields.xml b/res/layout/contact_editor_fields.xml
index b9bda16980..93517446e1 100644
--- a/res/layout/contact_editor_fields.xml
+++ b/res/layout/contact_editor_fields.xml
@@ -43,7 +43,7 @@
                 android:gravity="center_vertical"
                 android:text="@string/editor_more_fields"
                 android:textAlignment="viewStart"
-                android:textColor="?android:attr/colorAccent"
+                android:textColor="@color/e_primary_text_color"
                 android:textSize="@dimen/expanding_entry_card_title_text_size"/>
 
     </LinearLayout>
diff --git a/res/layout/people_activity_toolbar.xml b/res/layout/people_activity_toolbar.xml
index 4e8ea2f7e1..1bc4652dd1 100644
--- a/res/layout/people_activity_toolbar.xml
+++ b/res/layout/people_activity_toolbar.xml
@@ -25,7 +25,7 @@
         android:id="@+id/toolbar_frame"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:background="?attr/colorPrimary">
+        android:background="@color/actionbar_background_color">
 
         <!-- the attribute padding removes the gap between this Toolbar and its parent FrameLayout on tablet -->
         <androidx.appcompat.widget.Toolbar
diff --git a/res/layout/search_bar_expanded.xml b/res/layout/search_bar_expanded.xml
index 9f90bc7d09..8f9c6089bf 100644
--- a/res/layout/search_bar_expanded.xml
+++ b/res/layout/search_bar_expanded.xml
@@ -30,7 +30,7 @@
         android:src="@drawable/quantum_ic_arrow_back_vd_theme_24"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/action_menu_back_from_search"
-        android:tint="@color/actionbar_background_color" />
+        android:tint="@color/e_primary_text_color" />
 
     <android.widget.AutoCompleteTextView
         android:id="@+id/search_view"
@@ -54,7 +54,7 @@
         android:layout_width="@dimen/search_box_close_icon_size"
         android:padding="@dimen/search_box_close_icon_padding"
         android:src="@drawable/quantum_ic_close_vd_theme_24"
-        android:tint="@color/quantum_black_secondary_text"
+        android:tint="@color/e_secondary_text_color"
         android:clickable="true"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/description_clear_search" />
diff --git a/res/layout/selection_bar.xml b/res/layout/selection_bar.xml
index 272a2fcf9d..0d9f8a8ef4 100644
--- a/res/layout/selection_bar.xml
+++ b/res/layout/selection_bar.xml
@@ -51,7 +51,7 @@
         android:paddingEnd="16dp"
         android:paddingStart="16dp"
         android:text="@string/menu_add_contacts"
-        android:textColor="@color/primary_color"
+        android:textColor="@color/actionbar_text_color"
         android:textStyle="bold"
         android:visibility="gone"/>
 
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index e88ed65b73..a242b5e9c2 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -5,7 +5,7 @@
 -->
 <resources>
     <!-- Background color of pinned header items. -->
-    <color name="list_item_pinned_header_color">#1f1f1f</color>
+    <color name="list_item_pinned_header_color">@color/background_primary</color>
 
     <!-- Color of contact name in list. -->
     <color name="contact_list_name_text_color">#dadada</color>
diff --git a/res/values-v27/styles.xml b/res/values-v27/styles.xml
index e821cc1570..0187a5cabc 100644
--- a/res/values-v27/styles.xml
+++ b/res/values-v27/styles.xml
@@ -12,8 +12,8 @@
         <item name="android:listViewStyle">@style/ListViewStyle</item>
         <item name="android:windowBackground">@color/background_primary</item>
         <item name="android:colorPrimaryDark">@color/primary_color_dark</item>
-        <item name="android:colorPrimary">@color/primary_color</item>
-        <item name="android:colorAccent">@color/primary_color</item>
+        <item name="android:colorPrimary">@color/e_accent</item>
+        <item name="android:colorAccent">@color/e_accent</item>
         <item name="android:alertDialogTheme">@style/ContactsAlertDialogTheme</item>
         <item name="list_item_height">@dimen/contact_browser_list_item_height</item>
         <item name="list_section_header_height">24dip</item>
@@ -51,10 +51,11 @@
         <item name="android:popupMenuStyle">@style/PopupMenuStyle</item>
         <item name="android:navigationBarColor">@color/navigation_bar_bg</item>
         <item name="android:navigationBarDividerColor">@color/navigation_bar_divider</item>
-        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLightNavigationBar">@bool/isLight</item>
+        <item name="android:windowLightStatusBar">@bool/isLight</item>
     </style>
 
-    <style name="PeopleThemeAppCompat" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="PeopleThemeAppCompat" parent="Theme.AppCompat.DayNight.DarkActionBar">
         <item name="android:forceDarkAllowed">true</item>
         <!-- Styles that require AppCompat compatibility, remember to update both sets -->
         <item name="android:actionBarStyle">@style/ContactsActionBarStyleAppCompat</item>
@@ -73,8 +74,8 @@
         <item name="android:windowBackground">@color/background_primary</item>
         <item name="android:colorPrimaryDark">@color/primary_color_dark</item>
         <item name="colorPrimaryDark">@color/primary_color_dark</item>
-        <item name="android:colorPrimary">@color/primary_color</item>
-        <item name="colorPrimary">@color/primary_color</item>
+        <item name="android:colorPrimary">@color/e_accent</item>
+        <item name="colorPrimary">@color/e_accent</item>
         <item name="android:colorAccent">@color/primary_color</item>
         <item name="colorAccent">@color/primary_color</item>
         <item name="android:alertDialogTheme">@style/ContactsAlertDialogThemeAppCompat</item>
@@ -120,7 +121,8 @@
         <item name="popupMenuStyle">@style/PopupMenuStyleAppCompat</item>
         <item name="android:navigationBarColor">@color/navigation_bar_bg</item>
         <item name="android:navigationBarDividerColor">@color/navigation_bar_divider</item>
-        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLightNavigationBar">@bool/isLight</item>
+        <item name="android:windowLightStatusBar">@bool/isLight</item>
     </style>
 
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index aeba877162..51eb19d11d 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -17,39 +17,39 @@
     <color name="ic_add_contact_shortcut_background">#F5F5F5</color>
 
     <!-- 87% black -->
-    <color name="quantum_black_text">#dd000000</color>
+    <color name="quantum_black_text">@color/e_primary_text_color</color>
 
     <!-- 54% black -->
-    <color name="quantum_black_secondary_text">#89000000</color>
+    <color name="quantum_black_secondary_text">@color/e_secondary_text_color</color>
 
     <!-- 38% black -->
-    <color name="quantum_black_hint_text">#61000000</color>
+    <color name="quantum_black_hint_text">@color/e_disabled_color</color>
 
-    <color name="quickcontact_entry_sub_header_text_color">#737373</color>
+    <color name="quickcontact_entry_sub_header_text_color">@color/e_secondary_text_color</color>
     <color name="quickcontact_entry_header_text_color">#202020</color>
 
     <color name="action_bar_background">#2a56c6</color>
 
     <color name="nav_item_selected_background">#0f000000</color>
 
-    <color name="action_bar_button_text_color">#FFFFFF</color>
+    <color name="action_bar_button_text_color">@color/e_primary_text_color</color>
 
-    <color name="actionbar_background_color">@color/primary_color</color>
+    <color name="actionbar_background_color">@color/e_action_bar</color>
 
-    <color name="contextual_selection_bar_color">#f6f6f6</color>
+    <color name="contextual_selection_bar_color">@color/e_action_bar</color>
     <!-- Color of the status bar above the contextual selection bar. -->
-    <color name="contextual_selection_bar_status_bar_color">#bababa</color>
+    <color name="contextual_selection_bar_status_bar_color">@color/e_action_bar</color>
 
-    <color name="primary_color_dark">#1c3aa9</color>
-    <color name="primary_color">#2a56c6</color>
+    <color name="primary_color_dark">@color/e_action_bar</color>
+    <color name="primary_color">@color/e_accent</color>
 
-    <color name="group_primary_color_dark">#546E7A</color>
-    <color name="group_primary_color">#607D8B</color>
+    <color name="group_primary_color_dark">@color/e_action_bar</color>
+    <color name="group_primary_color">@color/e_action_bar</color>
 
     <!-- Color of the selected tab underline -->
     <color name="contacts_accent_color">#FFFFFF</color>
 
-    <color name="floating_action_button_icon_color">@color/contacts_accent_color</color>
+    <color name="floating_action_button_icon_color">@color/e_background</color>
 
     <!-- Horizontal separator line should be 12% dark in the light theme. -->
     <color name="divider_line_color_light">#e0e0e0</color>
@@ -61,7 +61,7 @@
     <color name="expanding_entry_card_background_color">#ffffff</color>
 
     <!-- Color of the margin for cards -->
-    <color name="card_margin_color">#f4f4f4</color>
+    <color name="card_margin_color">@color/e_background</color>
 
     <color name="call_arrow_green">#2aad6f</color>
     <color name="call_arrow_red">#ff2e58</color>
@@ -73,7 +73,7 @@
     <color name="editor_icon_color">#7f7f7f</color>
 
     <!-- Color of disabled text and unfocused hint text inside the contact editor. 25% black. -->
-    <color name="editor_disabled_text_color">#40000000</color>
+    <color name="editor_disabled_text_color">@color/e_disabled_color</color>
 
     <!-- Color of text on disabled link contacts button, 25% black. -->
     <color name="disabled_button_text">#40000000</color>
@@ -85,7 +85,7 @@
     <color name="disabled_contact_list_name_text">#4D000000</color>
 
     <!-- Color of background of all empty states. -->
-    <color name="empty_state_background">#efefef</color>
+    <color name="empty_state_background">@color/e_background</color>
 
     <!-- Colors of swipeRefreshLayout's spinning circle. -->
     <color name="swipe_refresh_color1">#0f9d58</color>
@@ -97,12 +97,12 @@
     <color name="ripple_material_dark">#a0ffffff</color>
 
     <!-- Divider color for header separator -->
-    <color name="primary_text_color">#363636</color>
+    <color name="primary_text_color">@color/e_primary_text_color</color>
 
-    <color name="secondary_text_color">@color/dialtacts_secondary_text_color</color>
+    <color name="secondary_text_color">@color/e_secondary_text_color</color>
 
     <!-- Text color for section header. -->
-    <color name="section_header_text_color">@color/dialtacts_theme_color</color>
+    <color name="section_header_text_color">@color/e_primary_text_color</color>
 
     <!-- Color of the theme of the People app -->
     <color name="people_app_theme_color">#363636</color>
@@ -117,7 +117,7 @@
     <color name="dialtacts_primary_text_color">#333333</color>
 
     <!-- Secondary text color in the Phone app -->
-    <color name="dialtacts_secondary_text_color">#737373</color>
+    <color name="dialtacts_secondary_text_color">@color/e_secondary_text_color</color>
 
     <color name="shortcut_overlay_text_background">#7f000000</color>
 
@@ -132,39 +132,35 @@
         These colors are also used by MaterialColorMapUtils to generate primary activity colors.
     -->
     <array name="letter_tile_colors">
-        <item>#DB4437</item>
-        <item>#E91E63</item>
-        <item>#9C27B0</item>
-        <item>#673AB7</item>
-        <item>#3F51B5</item>
-        <item>#4285F4</item>
-        <item>#039BE5</item>
-        <item>#0097A7</item>
-        <item>#009688</item>
-        <item>#0F9D58</item>
-        <item>#689F38</item>
-        <item>#EF6C00</item>
-        <item>#FF5722</item>
-        <item>#757575</item>
+        <item>#0F94F6</item>
+        <item>#00B4B4</item>
+        <item>#008D96</item>
+        <item>#44B04C</item>
+        <item>#AFD83D</item>
+        <item>#FFED21</item>
+        <item>#FFC300</item>
+        <item>#FF7A00</item>
+        <item>#F8432E</item>
+        <item>#ED1C61</item>
+        <item>#ED1C61</item>
+        <item>#5754DC</item>
     </array>
 
     <!-- Darker versions of letter_tile_colors, two shades darker. These colors are used
         for settings secondary activity colors. -->
     <array name="letter_tile_colors_dark">
-        <item>#C53929</item>
-        <item>#C2185B</item>
-        <item>#7B1FA2</item>
-        <item>#512DA8</item>
-        <item>#303F9F</item>
-        <item>#3367D6</item>
-        <item>#0277BD</item>
-        <item>#006064</item>
-        <item>#00796B</item>
-        <item>#0B8043</item>
-        <item>#33691E</item>
-        <item>#E65100</item>
-        <item>#E64A19</item>
-        <item>#424242</item>
+        <item>#0F94F6</item>
+        <item>#00B4B4</item>
+        <item>#008D96</item>
+        <item>#44B04C</item>
+        <item>#AFD83D</item>
+        <item>#FFED21</item>
+        <item>#FFC300</item>
+        <item>#FF7A00</item>
+        <item>#F8432E</item>
+        <item>#ED1C61</item>
+        <item>#ED1C61</item>
+        <item>#5754DC</item>
     </array>
 
     <!-- The default color used for tinting photos when no color can be extracted via Palette,
@@ -177,35 +173,35 @@
 
     <color name="letter_tile_default_color">#cccccc</color>
 
-    <color name="letter_tile_font_color">#ffffff</color>
+    <color name="letter_tile_font_color">@android:color/white</color>
 
     <!-- Color for icons in the actionbar -->
-    <color name="actionbar_icon_color">#ffffff</color>
+    <color name="actionbar_icon_color">@color/e_primary_text_color</color>
 
     <!-- Color of the title to the Frequently Contacted section -->
     <color name="frequently_contacted_title_color">@color/actionbar_background_color</color>
 
     <!-- Color of action bar text. Ensure this stays in sync with packages/Telephony
     phone_settings_actionbar_text_color-->
-    <color name="actionbar_text_color">#ffffff</color>
+    <color name="actionbar_text_color">@color/e_primary_text_color</color>
     <!-- 54% black for icons -->
     <color name="actionbar_icon_color_grey">#8C000000</color>
     <!-- 87% black for actionbar text -->
-    <color name="actionbar_text_color_black">#DF000000</color>
+    <color name="actionbar_text_color_black">@color/actionbar_text_color</color>
     <!-- Solid grey for status bar overlay-->
     <color name="actionbar_color_grey_solid">#777777</color>
 
     <!-- Text color of the search box text as entered by user  -->
-    <color name="searchbox_text_color">#000000</color>
+    <color name="searchbox_text_color">@color/e_primary_text_color</color>
     <!-- Background color of the search box -->
-    <color name="searchbox_background_color">#ffffff</color>
+    <color name="searchbox_background_color">@color/e_action_bar</color>
 
-    <color name="searchbox_hint_text_color">#66000000</color>
+    <color name="searchbox_hint_text_color">@color/e_disabled_color</color>
 
     <color name="search_shortcut_icon_color">@color/dialtacts_theme_color</color>
 
     <!-- Color of the background of the contact detail and editor pages -->
-    <color name="background_primary">#f9f9f9</color>
+    <color name="background_primary">@color/e_background</color>
     <color name="contact_all_list_background_color">#FFFFFF</color>
 
     <!-- Text color used for character counter when the max limit has been exceeded -->
@@ -233,7 +229,7 @@
     <color name="account_filter_text_color">@color/actionbar_text_color_black</color>
     <color name="custom_filter_divider">#dbdbdb</color>
 
-    <color name="material_star_pink">#f50057</color>
+    <color name="material_star_pink">@color/e_accent</color>
 
     <!-- Primary text color in Contacts app -->
     <color name="contacts_text_color">#333333</color>
@@ -245,13 +241,13 @@
     <color name="alert_background">#e0e0e0</color>
 
     <!-- Divider color in navigation drawer -->
-    <color name="drawer_divider_color">#E5E5E5</color>
+    <color name="drawer_divider_color">@android:color/transparent</color>
 
     <!-- Background color for the navigation drawer -->
-    <color name="navigation_drawer_background_color">#FAFAFA</color>
+    <color name="navigation_drawer_background_color">@color/e_drawer_background</color>
 
     <!-- Background color for the current selected item in the navigation drawer -->
-    <color name="drawer_selected_color">#E8E8E8</color>
+    <color name="drawer_selected_color">@color/navigation_drawer_item_background</color>
 
     <!-- Highlight color used in places such as ripples -->
     <color name="control_highlight_color">#1A000000</color>
diff --git a/res/values/lineage_colors.xml b/res/values/lineage_colors.xml
index 6aee4d227e..96b4c511d0 100644
--- a/res/values/lineage_colors.xml
+++ b/res/values/lineage_colors.xml
@@ -15,6 +15,6 @@
      limitations under the License.
 -->
 <resources>
-    <color name="navigation_bar_bg">@android:color/white</color>
-    <color name="navigation_bar_divider">#1f000000</color>
+    <color name="navigation_bar_bg">@color/e_action_bar</color>
+    <color name="navigation_bar_divider">@android:color/transparent</color>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 18401599ea..64b5af0a61 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -92,7 +92,7 @@
     <style name="LaunchScreenTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
         <item name="android:windowBackground">@drawable/quantum_launchscreen_contacts</item>
         <item name="colorPrimaryDark">@color/primary_color_dark</item>
-        <item name="colorPrimary">@color/primary_color</item>
+        <item name="colorPrimary">@color/e_accent</item>
     </style>
 
     <style name="PeopleActivityTheme" parent="@style/PeopleThemeAppCompat">
@@ -182,8 +182,8 @@
 
     <style name="DrawerArrowStyle" parent="Widget.AppCompat.DrawerArrowToggle">
         <item name="spinBars">false</item>
-        <item name="color">@android:color/white</item>
-        <item name="android:color">@android:color/white</item>
+        <item name="color">@color/e_primary_text_color</item>
+        <item name="android:color">@color/e_primary_text_color</item>
     </style>
 
     <!-- Use the non-light style so that the up button & icons aren't black. If we use the
@@ -272,11 +272,14 @@
 
     <style name="ContactsPreferencesTheme" parent="@style/PeopleThemeAppCompat">
         <item name="android:listViewStyle">@style/ListViewStyle</item>
+        <item name="android:listDivider">@null</item>
+        <item name="android:divider">@null</item>
     </style>
 
     <style name="ContactListFilterTheme" parent="@style/PeopleTheme">
         <item name="android:listViewStyle">@style/ListViewStyle</item>
         <item name="android:actionButtonStyle">@style/FilterActionButtonStyle</item>
+        <item name="android:homeAsUpIndicator">@drawable/e_ic_back</item>
     </style>
 
     <style name="NonPhoneActivityTheme" parent="@android:Theme.Translucent.NoTitleBar">
@@ -294,11 +297,11 @@
         <item name="android:textColorPrimary">@color/primary_text_color</item>
         <item name="android:textColorSecondary">@color/secondary_text_color</item>
         <item name="android:listViewStyle">@style/ListViewStyle</item>
-        <item name="android:colorAccent">@color/primary_color</item>
+        <item name="android:colorAccent">@color/e_accent</item>
     </style>
 
     <style name="SelectableItem" parent="@android:style/Theme.Material.Light">
-        <item name="android:background">?android:attr/selectableItemBackground</item>
+        <item name="android:background">@color/e_floating_background</item>
     </style>
 
     <style name="ExpandingEntryCardStyle">
@@ -337,12 +340,12 @@
     <!-- Inherit from Theme.Material.Light.Dialog instead of Theme.Material.Light.Dialog.Alert
         since the Alert dialog is private. They are identical anyway. -->
     <style name="ContactsAlertDialogTheme" parent="@android:style/Theme.Material.Light.Dialog">
-        <item name="android:colorAccent">@color/primary_color</item>
+        <item name="android:colorAccent">@color/e_accent</item>
     </style>
 
     <style name="ContactsAlertDialogThemeAppCompat" parent="Theme.AppCompat.Light.Dialog.MinWidth">
-        <item name="android:colorAccent">@color/primary_color</item>
-        <item name="colorAccent">@color/primary_color</item>
+        <item name="android:colorAccent">@color/e_accent</item>
+        <item name="colorAccent">@color/e_accent</item>
     </style>
 
     <style name="EditKindIconStyle">
@@ -386,8 +389,7 @@
     <!-- Text style for empty states (no account view, empty label). -->
     <style name="EmptyStateTextStyle">
         <item name="android:textSize">18sp</item>
-        <item name="android:textColor">#000000</item>
-        <item name="android:alpha">0.54</item>
+        <item name="android:textColor">@color/e_primary_text_color</item>
         <item name="android:fontFamily">sans-serif</item>
     </style>
 
@@ -453,6 +455,8 @@ background and text color. See also android:style/Widget.Holo.TextView.ListSepar
 
     <style name="ListViewStyle" parent="@android:style/Widget.Material.Light.ListView">
         <item name="android:overScrollMode">always</item>
+        <item name="android:listDivider">@null</item>
+        <item name="android:divider">@null</item>
     </style>
 
     <!-- Adding padding to action button doesn't move it to left, we increase the button width to
@@ -568,12 +572,12 @@ background and text color. See also android:style/Widget.Holo.TextView.ListSepar
     </style>
 
     <style name="DrawerItemTextActiveStyle">
-        <item name="android:textColor">@color/primary_color</item>
+        <item name="android:textColor">@color/e_accent</item>
         <item name="android:textStyle">bold</item>
     </style>
 
     <style name="DrawerItemTextInactiveStyle">
-        <item name="android:textColor">@color/quantum_black_text</item>
+        <item name="android:textColor">@color/e_icon_color</item>
         <item name="android:textStyle">bold</item>
     </style>
 
diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index 6101760e8d..8fababc5d7 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -1039,8 +1039,8 @@ public class PeopleActivity extends AppCompatContactsActivity implements
     // Reset toolbar and status bar color to Contacts theme color.
     private void resetToolBarStatusBarColor() {
         findViewById(R.id.toolbar_frame).setBackgroundColor(
-                ContextCompat.getColor(this, R.color.primary_color));
-        updateStatusBarBackground(ContextCompat.getColor(this, R.color.primary_color_dark));
+                ContextCompat.getColor(this, R.color.actionbar_background_color));
+        updateStatusBarBackground(ContextCompat.getColor(this, R.color.actionbar_background_color));
     }
 
     protected DefaultContactBrowseListFragment getListFragment() {
diff --git a/src/com/android/contacts/drawer/DrawerAdapter.java b/src/com/android/contacts/drawer/DrawerAdapter.java
index f6898b54fa..5501faf113 100644
--- a/src/com/android/contacts/drawer/DrawerAdapter.java
+++ b/src/com/android/contacts/drawer/DrawerAdapter.java
@@ -398,7 +398,7 @@ public class DrawerAdapter extends BaseAdapter {
         textView.setTextAppearance(mActivity, activated
                 ? TYPEFACE_STYLE_ACTIVATE : TYPEFACE_STYLE_INACTIVE);
         if (activated) {
-            imageView.setColorFilter(mActivity.getResources().getColor(R.color.primary_color),
+            imageView.setColorFilter(mActivity.getResources().getColor(R.color.navigation_drawer_selector),
                     PorterDuff.Mode.SRC_ATOP);
         } else {
             imageView.clearColorFilter();
diff --git a/src/com/android/contacts/lettertiles/LetterTileDrawable.java b/src/com/android/contacts/lettertiles/LetterTileDrawable.java
index b80fd4f76d..e5ef2ca378 100644
--- a/src/com/android/contacts/lettertiles/LetterTileDrawable.java
+++ b/src/com/android/contacts/lettertiles/LetterTileDrawable.java
@@ -160,7 +160,6 @@ public class LetterTileDrawable extends Drawable {
             sPaint.getTextBounds(sFirstChar, 0, 1, sRect);
             sPaint.setTypeface(Typeface.create("sans-serif", Typeface.NORMAL));
             sPaint.setColor(sTileFontColor);
-            sPaint.setAlpha(ALPHA);
 
             // Draw the letter in the canvas, vertically shifted up or down by the user-defined
             // offset
diff --git a/src/com/android/contacts/util/MaterialColorMapUtils.java b/src/com/android/contacts/util/MaterialColorMapUtils.java
index c1616cec7d..7182104545 100644
--- a/src/com/android/contacts/util/MaterialColorMapUtils.java
+++ b/src/com/android/contacts/util/MaterialColorMapUtils.java
@@ -199,7 +199,7 @@ public class MaterialColorMapUtils {
         final boolean isGroupView = activity instanceof PeopleActivity
                 && ((PeopleActivity) activity).isGroupView();
         return isGroupView
-                ? ContextCompat.getColor(activity, R.color.group_primary_color)
-                : ContextCompat.getColor(activity, R.color.primary_color);
+                ? ContextCompat.getColor(activity, R.color.actionbar_background_color)
+                : ContextCompat.getColor(activity, R.color.actionbar_background_color);
     }
 }
-- 
GitLab


From 23cbe190320db00a0bd2c188f27698077ef668d4 Mon Sep 17 00:00:00 2001
From: althafvly <althafvly@gmail.com>
Date: Fri, 21 Oct 2022 05:41:16 +0000
Subject: [PATCH 6/9] Contacts: add support for importing VCF v4

Change-Id: I07246d624b277417ed60f67c4b50e99cb9761111
---
 .../contacts/vcard/ImportProcessor.java       | 11 ++++---
 .../contacts/vcard/ImportVCardActivity.java   | 29 +++++++++++++++++--
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/src/com/android/contacts/vcard/ImportProcessor.java b/src/com/android/contacts/vcard/ImportProcessor.java
index c6fcccb8c2..bdeb35312d 100644
--- a/src/com/android/contacts/vcard/ImportProcessor.java
+++ b/src/com/android/contacts/vcard/ImportProcessor.java
@@ -30,6 +30,7 @@ import com.android.vcard.VCardInterpreter;
 import com.android.vcard.VCardParser;
 import com.android.vcard.VCardParser_V21;
 import com.android.vcard.VCardParser_V30;
+import com.android.vcard.VCardParser_V40;
 import com.android.vcard.exception.VCardException;
 import com.android.vcard.exception.VCardNotSupportedException;
 import com.android.vcard.exception.VCardVersionException;
@@ -135,7 +136,8 @@ public class ImportProcessor extends ProcessorBase implements VCardEntryHandler
              */
             possibleVCardVersions = new int[] {
                     ImportVCardActivity.VCARD_VERSION_V21,
-                    ImportVCardActivity.VCARD_VERSION_V30
+                    ImportVCardActivity.VCARD_VERSION_V30,
+                    ImportVCardActivity.VCARD_VERSION_V40
             };
         } else {
             possibleVCardVersions = new int[] {
@@ -231,9 +233,10 @@ public class ImportProcessor extends ProcessorBase implements VCardEntryHandler
                 // In the worst case, a user may call cancel() just before creating
                 // mVCardParser.
                 synchronized (this) {
-                    mVCardParser = (vcardVersion == ImportVCardActivity.VCARD_VERSION_V30 ?
-                            new VCardParser_V30(vcardType) :
-                                new VCardParser_V21(vcardType));
+                    VCardParser useOldVcardParser = (vcardVersion == ImportVCardActivity.VCARD_VERSION_V30 ?
+                            new VCardParser_V30(vcardType) : new VCardParser_V21(vcardType));
+                    mVCardParser = (vcardVersion == ImportVCardActivity.VCARD_VERSION_V40 ?
+                            new VCardParser_V40(vcardType) : useOldVcardParser);
                     if (isCancelled()) {
                         Log.i(LOG_TAG, "ImportProcessor already recieves cancel request, so " +
                                 "send cancel request to vCard parser too.");
diff --git a/src/com/android/contacts/vcard/ImportVCardActivity.java b/src/com/android/contacts/vcard/ImportVCardActivity.java
index 38367c40f9..d89f1fdcd5 100644
--- a/src/com/android/contacts/vcard/ImportVCardActivity.java
+++ b/src/com/android/contacts/vcard/ImportVCardActivity.java
@@ -49,6 +49,7 @@ import com.android.vcard.VCardEntryCounter;
 import com.android.vcard.VCardParser;
 import com.android.vcard.VCardParser_V21;
 import com.android.vcard.VCardParser_V30;
+import com.android.vcard.VCardParser_V40;
 import com.android.vcard.VCardSourceDetector;
 import com.android.vcard.exception.VCardException;
 import com.android.vcard.exception.VCardNestedException;
@@ -83,6 +84,7 @@ public class ImportVCardActivity extends Activity implements ImportVCardDialogFr
     /* package */ final static int VCARD_VERSION_AUTO_DETECT = 0;
     /* package */ final static int VCARD_VERSION_V21 = 1;
     /* package */ final static int VCARD_VERSION_V30 = 2;
+    /* package */ final static int VCARD_VERSION_V40 = 3;
 
     private static final int REQUEST_OPEN_DOCUMENT = 100;
 
@@ -321,6 +323,7 @@ public class ImportVCardActivity extends Activity implements ImportVCardDialogFr
             int vcardVersion = VCARD_VERSION_V21;
             try {
                 boolean shouldUseV30 = false;
+                boolean shouldUseV40 = false;
                 InputStream is;
                 if (data != null) {
                     is = new ByteArrayInputStream(data);
@@ -354,7 +357,28 @@ public class ImportVCardActivity extends Activity implements ImportVCardDialogFr
                         mVCardParser.addInterpreter(detector);
                         mVCardParser.parse(is);
                     } catch (VCardVersionException e2) {
-                        throw new VCardException("vCard with unspported version.");
+                        try {
+                            is.close();
+                        } catch (IOException e) {
+
+                        }
+
+                        shouldUseV40 = true;
+                        if (data != null) {
+                            is = new ByteArrayInputStream(data);
+                        } else {
+                            is = resolver.openInputStream(localDataUri);
+                        }
+                        mVCardParser = new VCardParser_V40();
+                        try {
+                            counter = new VCardEntryCounter();
+                            detector = new VCardSourceDetector();
+                            mVCardParser.addInterpreter(counter);
+                            mVCardParser.addInterpreter(detector);
+                            mVCardParser.parse(is);
+                        } catch (VCardVersionException e3) {
+                            throw new VCardException("vCard with unspported version.");
+                        }
                     }
                 } finally {
                     if (is != null) {
@@ -365,7 +389,8 @@ public class ImportVCardActivity extends Activity implements ImportVCardDialogFr
                     }
                 }
 
-                vcardVersion = shouldUseV30 ? VCARD_VERSION_V30 : VCARD_VERSION_V21;
+                int useOldvcardVersion = shouldUseV30 ? VCARD_VERSION_V30 : VCARD_VERSION_V21;
+                vcardVersion = shouldUseV40 ? VCARD_VERSION_V40 : useOldvcardVersion;
             } catch (VCardNestedException e) {
                 Log.w(LOG_TAG, "Nested Exception is found (it may be false-positive).");
                 // Go through without throwing the Exception, as we may be able to detect the
-- 
GitLab


From 95e9753bfc52030b00ea4cf7282b73a0c8905a18 Mon Sep 17 00:00:00 2001
From: althafvly <althafvly@gmail.com>
Date: Sun, 23 Oct 2022 21:14:50 +0530
Subject: [PATCH 7/9] Contacts: Support changing vCard export version

Change-Id: Ib275eeb002f71ea74490b2c2c780a734dbc3cac0
---
 res/values/e_arrays.xml                       | 28 ++++++++++++++++
 res/values/strings.xml                        |  9 +++++
 res/xml/preference_display_options.xml        |  8 +++++
 .../contacts/vcard/ExportProcessor.java       | 33 +++++++++++++------
 4 files changed, 68 insertions(+), 10 deletions(-)
 create mode 100644 res/values/e_arrays.xml

diff --git a/res/values/e_arrays.xml b/res/values/e_arrays.xml
new file mode 100644
index 0000000000..a38cce56ce
--- /dev/null
+++ b/res/values/e_arrays.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 MURENA SAS
+
+     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>
+    <string-array name="menu_vcf_export_types" translatable="false">
+        <item>@string/menu_export_type_vcf_21</item>
+        <item>@string/menu_export_type_vcf_30</item>
+        <item>@string/menu_export_type_vcf_40</item>
+    </string-array>
+
+    <string-array name="menu_vcf_export_values" translatable="false">
+        <item>@string/menu_export_type_vcf_21_value</item>
+        <item>@string/menu_export_type_vcf_30_value</item>
+        <item>@string/menu_export_type_vcf_40_value</item>
+    </string-array>
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d87be0ba3a..b69cdbc48c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1549,4 +1549,13 @@
     <!-- Text of Negative Button in dialog -->
     <string name="no_button">No</string>
 
+    <!-- VCF Export -->
+    <string name="menu_export_type_title">Export vCard version</string>
+    <string name="menu_export_type_vcf_21" translatable="false">VCF 2.1</string>
+    <string name="menu_export_type_vcf_30" translatable="false">VCF 3.0</string>
+    <string name="menu_export_type_vcf_40" translatable="false">VCF 4.0</string>
+    <string name="menu_export_type_vcf_21_value" translatable="false">v21_generic</string>
+    <string name="menu_export_type_vcf_30_value" translatable="false">v30_generic</string>
+    <string name="menu_export_type_vcf_40_value" translatable="false">v40_generic</string>
+
 </resources>
\ No newline at end of file
diff --git a/res/xml/preference_display_options.xml b/res/xml/preference_display_options.xml
index 9987250878..b2f5a3b7d3 100644
--- a/res/xml/preference_display_options.xml
+++ b/res/xml/preference_display_options.xml
@@ -65,6 +65,14 @@
         android:key="export"
         android:title="@string/menu_export"/>
 
+    <ListPreference
+        android:icon="@null"
+        android:key="exportToVcfType"
+        android:entries="@array/menu_vcf_export_types"
+        android:entryValues="@array/menu_vcf_export_values"
+        android:defaultValue="v21_generic"
+        android:title="@string/menu_export_type_title"/>
+
     <Preference
         android:icon="@null"
         android:key="blockedNumbers"
diff --git a/src/com/android/contacts/vcard/ExportProcessor.java b/src/com/android/contacts/vcard/ExportProcessor.java
index 0b96ea1950..3bb533a4da 100755
--- a/src/com/android/contacts/vcard/ExportProcessor.java
+++ b/src/com/android/contacts/vcard/ExportProcessor.java
@@ -15,25 +15,29 @@
  */
 package com.android.contacts.vcard;
 
+import static com.android.vcard.VCardConfig.VCARD_TYPE_V21_GENERIC;
+import static com.android.vcard.VCardConfig.VCARD_TYPE_V30_GENERIC;
+import static com.android.vcard.VCardConfig.VCARD_TYPE_V40_GENERIC;
+
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.net.Uri;
 import android.os.Handler;
 import android.os.Message;
+import android.preference.PreferenceManager;
 import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.RawContactsEntity;
-import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
 
 import com.android.contacts.R;
 import com.android.contactsbind.FeedbackHelper;
 import com.android.vcard.VCardComposer;
-import com.android.vcard.VCardConfig;
 
 import java.io.BufferedWriter;
 import java.io.FileNotFoundException;
@@ -41,6 +45,8 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Class for processing one export request from a user. Dropped after exporting requested Uri(s).
@@ -50,6 +56,11 @@ public class ExportProcessor extends ProcessorBase {
     private static final String LOG_TAG = "VCardExport";
     private static final boolean DEBUG = VCardService.DEBUG;
 
+    private static final String KEY_EXPORT_TYPE = "exportToVcfType";
+    private static final String VCARD_TYPE_V21_GENERIC_STR = "v21_generic";
+    private static final String VCARD_TYPE_V30_GENERIC_STR = "v30_generic";
+    private static final String VCARD_TYPE_V40_GENERIC_STR = "v40_generic";
+
     private final VCardService mService;
     private final ContentResolver mResolver;
     private final NotificationManager mNotificationManager;
@@ -133,14 +144,16 @@ public class ExportProcessor extends ProcessorBase {
                 return;
             }
 
-            final String exportType = request.exportType;
-            final int vcardType;
-            if (TextUtils.isEmpty(exportType)) {
-                vcardType = VCardConfig.getVCardTypeFromString(
-                        mService.getString(R.string.config_export_vcard_type));
-            } else {
-                vcardType = VCardConfig.getVCardTypeFromString(exportType);
-            }
+            Map<String, Integer> sVCardTypeMap = new HashMap<>();
+            sVCardTypeMap.put(VCARD_TYPE_V21_GENERIC_STR, VCARD_TYPE_V21_GENERIC);
+            sVCardTypeMap.put(VCARD_TYPE_V30_GENERIC_STR, VCARD_TYPE_V30_GENERIC);
+            sVCardTypeMap.put(VCARD_TYPE_V40_GENERIC_STR, VCARD_TYPE_V40_GENERIC);
+
+            final SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(
+                    mService.getApplicationContext());
+            final String defVcfType = pref.getString(KEY_EXPORT_TYPE,
+                    VCARD_TYPE_V21_GENERIC_STR);
+            final int vcardType = sVCardTypeMap.get(defVcfType);
 
             composer = new VCardComposer(mService, vcardType, true);
 
-- 
GitLab


From d79c08639ccd1f64fe9a9d17f494cdb2e49af162 Mon Sep 17 00:00:00 2001
From: althafvly <althafvly@gmail.com>
Date: Wed, 2 Nov 2022 10:45:05 +0530
Subject: [PATCH 8/9] Contacts: Use VCF 4.0 as default export type

Change-Id: I2fca0d47196570d697a2e5968a3a0114274c35b4
---
 res/xml/preference_display_options.xml              | 2 +-
 src/com/android/contacts/vcard/ExportProcessor.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/xml/preference_display_options.xml b/res/xml/preference_display_options.xml
index b2f5a3b7d3..d232d8c364 100644
--- a/res/xml/preference_display_options.xml
+++ b/res/xml/preference_display_options.xml
@@ -70,7 +70,7 @@
         android:key="exportToVcfType"
         android:entries="@array/menu_vcf_export_types"
         android:entryValues="@array/menu_vcf_export_values"
-        android:defaultValue="v21_generic"
+        android:defaultValue="v40_generic"
         android:title="@string/menu_export_type_title"/>
 
     <Preference
diff --git a/src/com/android/contacts/vcard/ExportProcessor.java b/src/com/android/contacts/vcard/ExportProcessor.java
index 3bb533a4da..c3554757e9 100755
--- a/src/com/android/contacts/vcard/ExportProcessor.java
+++ b/src/com/android/contacts/vcard/ExportProcessor.java
@@ -152,7 +152,7 @@ public class ExportProcessor extends ProcessorBase {
             final SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(
                     mService.getApplicationContext());
             final String defVcfType = pref.getString(KEY_EXPORT_TYPE,
-                    VCARD_TYPE_V21_GENERIC_STR);
+                    VCARD_TYPE_V40_GENERIC_STR);
             final int vcardType = sVCardTypeMap.get(defVcfType);
 
             composer = new VCardComposer(mService, vcardType, true);
-- 
GitLab


From c898efc8afc397b30984b27bb6ac6b1e3801859d Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Wed, 22 Mar 2023 15:07:29 +0530
Subject: [PATCH 9/9] Port translation changes from Android S

---
 res/values-de/strings.xml | 92 +++++++++++++++++++--------------------
 res/values-fr/strings.xml | 12 +++--
 res/values-it/strings.xml | 19 ++++----
 res/values-nl/strings.xml | 73 ++++++++++++++++---------------
 res/values-ru/strings.xml |  8 ++--
 5 files changed, 101 insertions(+), 103 deletions(-)

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index d5aaf47e08..d138a60bd0 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,10 +12,7 @@
      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">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="8908212014470937609">"Kontakte"</string>
     <string name="contactsList" msgid="4456188358262700898">"Kontakte"</string>
     <string name="shortcut_add_contact" msgid="7949342235528657981">"Kontakt hinzufügen"</string>
@@ -96,7 +93,7 @@
     <string name="emptyMainList" msgid="3266182207039677163">"Die Kontaktliste ist leer"</string>
     <string name="contactSavedNamedToast" msgid="3067050290584834386">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> gespeichert"</string>
     <string name="contactSavedToast" msgid="4370392215196995301">"Kontakt gespeichert"</string>
-    <string name="contactUnlinkedToast" msgid="6791720274141804377">"Verknüpfung der Kontakte wurde aufgehoben."</string>
+    <string name="contactUnlinkedToast" msgid="6791720274141804377">Verknüpfung der Kontakte wurde aufgehoben</string>
     <string name="contactSavedErrorToast" msgid="3213619905154956918">"Änderungen am Kontakt konnten nicht gespeichert werden"</string>
     <string name="contactUnlinkErrorToast" msgid="7289356996668886841">"Verknüpfung mit Kontakt konnte nicht aufgehoben werden"</string>
     <string name="contactJoinErrorToast" msgid="1222155997933362787">"Kontakt konnte nicht verknüpft werden"</string>
@@ -120,11 +117,11 @@
     <string name="listFoundAllContactsZero" msgid="1933842282916988563">"Keine Kontakte"</string>
     <string name="add_contact_dlg_message_fmt" msgid="7498024710169591375">"\"<xliff:g id="EMAIL">%s</xliff:g>\" zu den Kontakten hinzufügen?"</string>
     <string name="search_settings_description" msgid="5630675648560839920">"Namen meiner Kontakte"</string>
-    <string name="quickcontact_transparent_view_description" msgid="7783027850792852265">"Klicke hier, um zum vorherigen Bildschirm zurückzukehren."</string>
+    <string name="quickcontact_transparent_view_description" msgid="7783027850792852265">Klicke hier, um zum vorherigen Bildschirm zurückzukehren</string>
     <string name="quickcontact_add_phone_number" msgid="1683577288080727862">"Telefonnummer hinzufügen"</string>
     <string name="quickcontact_add_email" msgid="1442894568471116797">"E-Mail-Adresse hinzufügen"</string>
     <string name="missing_app" msgid="5674389915738964148">"Für diese Aktion wurde keine App gefunden."</string>
-    <string name="menu_share" msgid="6343022811796001773">"Teilen"</string>
+    <string name="menu_share" msgid="6343022811796001773">Teilen</string>
     <string name="menu_add_contact" msgid="5822356185421997656">"Zu Kontakten hinzufügen"</string>
     <string name="menu_add_contacts" msgid="7114262784903366463">"Hinzufügen"</string>
     <string name="title_share_via" msgid="3300082736229182956">"{count,plural, =1{Kontakt teilen über}other{Kontakte teilen über}}"</string>
@@ -135,25 +132,25 @@
     <string name="label_name_dialog_hint" msgid="7027635439255596191">"Labelname"</string>
     <string name="audio_chat" msgid="5921525823973697372">"Sprachchat"</string>
     <string name="video_chat" msgid="2477295971622477433">"Videochat"</string>
-    <string name="account_type_format" msgid="4926968760755013450">"<xliff:g id="SOURCE">%1$s</xliff:g> Kontakt"</string>
-    <string name="google_account_type_format" msgid="4046692740262396811">"<xliff:g id="SOURCE">%1$s</xliff:g>-Konto"</string>
-    <string name="take_photo" msgid="820071555236547516">"Foto machen"</string>
+    <string name="account_type_format" msgid="4926968760755013450"><xliff:g id="source" example="Gmail">%1$s</xliff:g> Kontakt</string>
+    <string name="google_account_type_format" msgid="4046692740262396811"><xliff:g id="source" example="Google">%1$s</xliff:g>-Konto</string>
+    <string name="take_photo" msgid="820071555236547516">Foto aufnehmen</string>
     <string name="take_new_photo" msgid="4383091978116875778">"Neues Foto aufnehmen"</string>
     <string name="pick_photo" msgid="2050859661654812588">"Foto auswählen"</string>
     <string name="pick_new_photo" msgid="4218112182908240970">"Neues Foto auswählen"</string>
-    <string name="search_results_searching" msgid="1373859095361975648">"Suche..."</string>
+    <string name="search_results_searching" msgid="1373859095361975648">Suche …</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Datum"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Label"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Abbrechen"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Zurück"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"Schließen"</string>
     <string name="aggregation_suggestion_edit_dialog_message" msgid="4339333746086996062">"Zur Bearbeitung des ausgewählten Kontakts wechseln? Die bisher eingegebenen Informationen werden kopiert."</string>
-    <string name="contact_directory_description" msgid="1773630547110881835">"Verzeichnis <xliff:g id="TYPE">%1$s</xliff:g>"</string>
+    <string name="contact_directory_description" msgid="1773630547110881835"><xliff:g id="type" example="Corporate Directory">%1$s</xliff:g></string>
     <string name="activity_title_settings" msgid="4004290638426915162">"Einstellungen"</string>
     <string name="menu_settings" msgid="3524924670246877187">"Einstellungen"</string>
     <string name="menu_help" msgid="287801702920372292">"Hilfe &amp; Feedback"</string>
-    <string name="organization_entry_two_field" msgid="6034934619269052455">"<xliff:g id="FIRST">%1$s</xliff:g> • <xliff:g id="SECOND">%2$s</xliff:g>"</string>
-    <string name="organization_entry_all_field" msgid="6724345890324437167">"<xliff:g id="COMPANY">%1$s</xliff:g> • <xliff:g id="DEPARTMENT">%2$s</xliff:g> • <xliff:g id="TITLE">%3$s</xliff:g>"</string>
+    <string name="organization_entry_two_field" msgid="6034934619269052455"> <xliff:g id="first" example="Google">%1$s</xliff:g> • <xliff:g id="second" example="Developer">%2$s</xliff:g> </string>
+    <string name="organization_entry_all_field" msgid="6724345890324437167"> <xliff:g id="company" example="Google">%1$s</xliff:g> • <xliff:g id="department" example="People">%2$s</xliff:g> • <xliff:g id="title" example="Developer">%3$s</xliff:g> </string>
     <string name="non_phone_caption" msgid="7343449684187013327">"Telefonnummer"</string>
     <string name="non_phone_add_to_contacts" msgid="5472784294274676663">"Zu Kontakten hinzufügen"</string>
     <string name="non_phone_close" msgid="2792373584950696532">"Schließen"</string>
@@ -161,7 +158,7 @@
     <string name="contacts_unavailable_add_account" msgid="5196453892411710750">"Konto hinzufügen"</string>
     <string name="contacts_unavailable_import_contacts" msgid="4914180876114104054">"Importieren"</string>
     <string name="create_group_item_label" msgid="921929508079162463">"Neu erstellen…"</string>
-    <string name="delete_group_dialog_message" msgid="754082019928025404">"Soll das Label \"<xliff:g id="GROUP_LABEL">%1$s</xliff:g>\" gelöscht werden? (Die Kontakte selbst werden nicht gelöscht.)"</string>
+    <string name="delete_group_dialog_message" msgid="754082019928025404">Soll das Kennzeichen „<xliff:g id="group_label" example="Friends">%1$s</xliff:g>“ gelöscht werden\? (Die Kontakte selbst werden nicht gelöscht.) </string>
     <string name="toast_join_with_empty_contact" msgid="3886468280665325350">"Gib einen Namen für den Kontakt ein, bevor du ihn mit einem anderen Kontakt verknüpfst."</string>
     <string name="copy_text" msgid="6835250673373028909">"In die Zwischenablage kopieren"</string>
     <string name="set_default" msgid="3704074175618702225">"Als Standard festlegen"</string>
@@ -192,7 +189,7 @@
     <string name="expanding_entry_card_view_see_more" msgid="6636033205952561590">"Mehr anzeigen"</string>
     <string name="expanding_entry_card_view_see_less" msgid="6399603072579278030">"Weniger anzeigen"</string>
     <string name="about_card_title" msgid="6635849009952435700">"Info"</string>
-    <string name="toast_making_personal_copy" msgid="9053129410039312386">"Persönliche Kopie wird erstellt..."</string>
+    <string name="toast_making_personal_copy" msgid="9053129410039312386">Persönliche Kopie wird erstellt …</string>
     <string name="date_time_set" msgid="8526160894146496334">"Festlegen"</string>
     <string name="header_im_entry" msgid="3581797653862294826">"Chat"</string>
     <string name="header_organization_entry" msgid="7428066442988227441">"Organisation"</string>
@@ -229,7 +226,7 @@
     <string name="hamburger_feature_highlight_header" msgid="1786641424099282909">"Vorschläge"</string>
     <string name="hamburger_feature_highlight_body" msgid="782935036630531528">"So sind deine Kontakte immer organisiert und übersichtlich"</string>
     <string name="undo" msgid="2446931036220975026">"Rückgängig machen"</string>
-    <string name="call_custom" msgid="2844900154492073207">"<xliff:g id="CUSTOM_LABEL">%s</xliff:g> anrufen"</string>
+    <string name="call_custom" msgid="2844900154492073207"><xliff:g id="custom_label" example="business">%s</xliff:g> anrufen </string>
     <string name="call_home" msgid="2443904771140750492">"Anruf (privat)"</string>
     <string name="call_mobile" msgid="6504312789160309832">"Anruf (mobil)"</string>
     <string name="call_work" msgid="2414313348547560346">"Anruf (geschäftl.)"</string>
@@ -248,10 +245,10 @@
     <string name="call_tty_tdd" msgid="3647586527611369559">"TTY/TDD anrufen"</string>
     <string name="call_work_mobile" msgid="2507794786733587181">"Anruf Handy (geschäftl.)"</string>
     <string name="call_work_pager" msgid="615335008331933747">"Anruf Pager (geschäftl.)"</string>
-    <string name="call_assistant" msgid="8556909944379826616">"<xliff:g id="CUSTOM_LABEL">%s</xliff:g> anrufen"</string>
+    <string name="call_assistant" msgid="8556909944379826616"><xliff:g id="custom_label" example="assistant">%s</xliff:g> anrufen </string>
     <string name="call_mms" msgid="1760746475672950386">"Anruf (MMS)"</string>
     <string name="call_by_shortcut" msgid="5707329943368933423">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Anruf)"</string>
-    <string name="sms_custom" msgid="3684453744622817362">"SMS an <xliff:g id="CUSTOM_LABEL">%s</xliff:g> senden"</string>
+    <string name="sms_custom" msgid="3684453744622817362">SMS an <xliff:g id="custom_label" example="business">%s</xliff:g> senden </string>
     <string name="sms_home" msgid="6132392861245316613">"SMS (privat)"</string>
     <string name="sms_mobile" msgid="433949735070334192">"Text (mobil)"</string>
     <string name="sms_work" msgid="7784676780449153911">"SMS (geschäftl.)"</string>
@@ -270,7 +267,7 @@
     <string name="sms_tty_tdd" msgid="5517202384458721064">"SMS an TTY/TDD"</string>
     <string name="sms_work_mobile" msgid="1170012557483816931">"SMS an Handy (geschäftl.)"</string>
     <string name="sms_work_pager" msgid="8827367747655005608">"SMS an Pager (geschäftl.)"</string>
-    <string name="sms_assistant" msgid="245045451580096547">"SMS an <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
+    <string name="sms_assistant" msgid="245045451580096547">SMS an <xliff:g id="assistant">%s</xliff:g> </string>
     <string name="sms_mms" msgid="7395133080765833725">"Text (MMS)"</string>
     <string name="sms_by_shortcut" msgid="4682340916268521006">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Nachricht)"</string>
     <string name="description_video_call" msgid="4956825008907720371">"Videoanruf starten"</string>
@@ -324,7 +321,7 @@
     <string name="email_mobile" msgid="6461172430397598705">"E-Mail (mobil)"</string>
     <string name="email_work" msgid="24992619164533704">"E-Mail (geschäftl.)"</string>
     <string name="email_other" msgid="9200478615023952240">"E-Mail an"</string>
-    <string name="email_custom" msgid="4614140345586842953">"E-Mail an <xliff:g id="CUSTOM_LABEL">%s</xliff:g> senden"</string>
+    <string name="email_custom" msgid="4614140345586842953">E-Mail an <xliff:g id="custom_label" example="business">%s</xliff:g> senden</string>
     <string name="email" msgid="7367975425670798827">"E-Mail"</string>
     <string name="postal_street" msgid="43809570436400749">"Straße"</string>
     <string name="postal_city" msgid="3571927981675393150">"Stadt"</string>
@@ -334,7 +331,7 @@
     <string name="map_home" msgid="2169053372466501148">"Privatadresse anzeigen"</string>
     <string name="map_work" msgid="8296916987749726461">"Arbeitsadresse anzeigen"</string>
     <string name="map_other" msgid="4009931029322619674">"Adresse anzeigen"</string>
-    <string name="map_custom" msgid="7797812861927817335">"Adresse <xliff:g id="CUSTOM_LABEL">%s</xliff:g> anzeigen"</string>
+    <string name="map_custom" msgid="7797812861927817335">Adresse <xliff:g id="custom_label" example="vacation">%s</xliff:g> anzeigen</string>
     <string name="chat_aim" msgid="2044861410748519265">"Über AIM chatten"</string>
     <string name="chat_msn" msgid="4733206223124506247">"Über Windows Live chatten"</string>
     <string name="chat_yahoo" msgid="3807571878191282528">"Über Yahoo! chatten"</string>
@@ -361,9 +358,9 @@
     <string name="display_all_contacts" msgid="1281067776483704512">"Alle Kontakte"</string>
     <string name="menu_sync_remove" msgid="7523335046562082188">"Synchronisierungsgruppe entfernen"</string>
     <string name="dialog_sync_add" msgid="8012361965908515959">"Synchronisierungsgruppe hinzufügen"</string>
-    <string name="display_more_groups" msgid="8398232980355188133">"Weitere Gruppen..."</string>
-    <string name="display_warn_remove_ungrouped" msgid="522866344738506017">"Wenn \"<xliff:g id="GROUP">%s</xliff:g>\" aus der Synchronisierung entfernt wird, werden auch alle nicht gruppierten Kontakte aus der Synchronisierung entfernt."</string>
-    <string name="savingDisplayGroups" msgid="6779839417901711381">"Anzeigeoptionen werden gespeichert..."</string>
+    <string name="display_more_groups" msgid="8398232980355188133">Weitere Gruppen …</string>
+    <string name="display_warn_remove_ungrouped" msgid="522866344738506017">Wenn „<xliff:g id="group" example="Starred">%s</xliff:g>“ aus der Synchronisierung entfernt wird, werden auch alle nicht gruppierten Kontakte aus der Synchronisierung entfernt.</string>
+    <string name="savingDisplayGroups" msgid="6779839417901711381">Anzeigeoptionen werden gespeichert …</string>
     <string name="listCustomView" msgid="5782275477737032610">"Benutzerdefinierte Ansicht"</string>
     <string name="dialog_new_contact_account" msgid="5652018124788855057">"Importierte Kontakte speichern unter:"</string>
     <string name="import_from_sim" msgid="7825280799813847991">"SIM-Karte"</string>
@@ -373,10 +370,10 @@
     <string name="import_from_vcf_file" msgid="6776403212804361301">"VCF-Datei"</string>
     <string name="nothing_to_import_message" msgid="2594519620375509783">"Keine Daten zum Importieren vorhanden"</string>
     <string name="import_from_vcf_file_confirmation_message" msgid="8579284961401472204">"Kontakte von vCard importieren?"</string>
-    <string name="cancel_import_confirmation_message" msgid="1007412828398265611">"Import von <xliff:g id="FILENAME">%s</xliff:g> abbrechen?"</string>
-    <string name="cancel_export_confirmation_message" msgid="370693160959236239">"Export von <xliff:g id="FILENAME">%s</xliff:g> abbrechen?"</string>
+    <string name="cancel_import_confirmation_message" msgid="1007412828398265611">Importieren von <xliff:g id="filename" example="import.vcf">%s</xliff:g> abbrechen\?</string>
+    <string name="cancel_export_confirmation_message" msgid="370693160959236239">Exportieren von <xliff:g id="filename" example="export.vcf">%s</xliff:g> abbrechen\?</string>
     <string name="cancel_vcard_import_or_export_failed" msgid="3041814872516288484">"vCard-Import/-Export nicht abgebrochen"</string>
-    <string name="fail_reason_unknown" msgid="3721044979355043778">"Unbekannter Fehler"</string>
+    <string name="fail_reason_unknown" msgid="3721044979355043778">Unbekannter Fehler.</string>
     <string name="fail_reason_could_not_open_file" msgid="6015509564074145162">"\"<xliff:g id="FILE_NAME">%1$s</xliff:g>\" konnte nicht geöffnet werden: <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
     <string name="fail_reason_could_not_initialize_exporter" msgid="4145819808407973981">"Exportprogramm konnte nicht gestartet werden: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
     <string name="fail_reason_no_exportable_contact" msgid="487925011719622851">"Es ist kein exportierbarer Kontakt vorhanden."</string>
@@ -385,33 +382,33 @@
     <string name="fail_reason_io_error" msgid="6364839914349999408">"E/A-Fehler"</string>
     <string name="fail_reason_low_memory_during_import" msgid="4525361860523306991">"Nicht genügend Speicherplatz. Die Datei ist möglicherweise zu groß."</string>
     <string name="fail_reason_not_supported" msgid="6449916670421646290">"Das Format wird nicht unterstützt."</string>
-    <string name="exporting_vcard_finished_title" msgid="1984393609140969504">"Export von <xliff:g id="FILENAME">%s</xliff:g> abgeschlossen"</string>
+    <string name="exporting_vcard_finished_title" msgid="1984393609140969504">Export von <xliff:g id="filename" example="export.vcf">%s</xliff:g> abgeschlossen.</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="9029067439586573959">"Kontakte wurden exportiert."</string>
     <string name="exporting_vcard_finished_toast" msgid="5463125514187187782">"Das Exportieren der Kontakte ist abgeschlossen. Klicke auf die Benachrichtigung, um die Kontakte freizugeben."</string>
     <string name="touch_to_share_contacts" msgid="7678194978416052577">"Zum Teilen der Kontakte tippen."</string>
-    <string name="exporting_vcard_canceled_title" msgid="1287529222628052526">"Export von <xliff:g id="FILENAME">%s</xliff:g> abgebrochen"</string>
-    <string name="exporting_contact_list_title" msgid="6599904516394311592">"Kontaktdaten werden exportiert."</string>
+    <string name="exporting_vcard_canceled_title" msgid="1287529222628052526">Export von <xliff:g id="filename" example="export.vcf">%s</xliff:g> abgebrochen.</string>
+    <string name="exporting_contact_list_title" msgid="6599904516394311592">Kontaktdaten werden exportiert.</string>
     <string name="exporting_contact_list_message" msgid="6253904938452184387">"Die Kontaktdaten werden gerade exportiert."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="4394169679142311379">"Datenbankinformationen konnten nicht abgerufen werden."</string>
     <string name="composer_has_no_exportable_contact" msgid="473911071832548562">"Keine Kontakte zum Exportieren vorhanden."</string>
     <string name="composer_not_initialized" msgid="3861391548605450184">"Das Programm zum Erstellen der vCard wurde nicht richtig gestartet."</string>
     <string name="exporting_contact_failed_title" msgid="9003659313161289860">"Export nicht möglich"</string>
     <string name="exporting_contact_failed_message" msgid="9198720310560773485">"Die Kontaktdaten wurden nicht exportiert.\nGrund: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
-    <string name="importing_vcard_description" msgid="6982207216746936735">"<xliff:g id="NAME">%s</xliff:g> wird importiert"</string>
+    <string name="importing_vcard_description" msgid="6982207216746936735"><xliff:g id="name" example="Joe Due">%s</xliff:g> wird importiert</string>
     <string name="reading_vcard_failed_title" msgid="1230432142768184978">"Lesen der vCard-Daten nicht möglich"</string>
-    <string name="importing_vcard_finished_title" msgid="2274644947000264322">"Import der vCard <xliff:g id="FILENAME">%s</xliff:g> abgeschlossen"</string>
-    <string name="importing_vcard_canceled_title" msgid="8165471996631186776">"Import von <xliff:g id="FILENAME">%s</xliff:g> abgebrochen"</string>
-    <string name="vcard_import_will_start_message" msgid="4514702035621833178">"<xliff:g id="FILENAME">%s</xliff:g> wird demnächst importiert."</string>
+    <string name="importing_vcard_finished_title" msgid="2274644947000264322">Import der vCard <xliff:g id="filename" example="import.vcf">%s</xliff:g> abgeschlossen</string>
+    <string name="importing_vcard_canceled_title" msgid="8165471996631186776">Import von <xliff:g id="filename" example="import.vcf">%s</xliff:g> abgebrochen</string>
+    <string name="vcard_import_will_start_message" msgid="4514702035621833178"><xliff:g id="filename" example="import.vcf">%s</xliff:g> wird demnächst importiert.</string>
     <string name="vcard_import_will_start_message_with_default_name" msgid="8205422202924103470">"Die Datei wird in Kürze importiert."</string>
     <string name="vcard_import_request_rejected_message" msgid="4754292694777189540">"Die vCard-Importanfrage wurde abgelehnt. Bitte versuchen Sie es später erneut."</string>
     <string name="contacts_export_will_start_message" msgid="6428126265599715944">"Die Kontakte werden in Kürze exportiert."</string>
     <string name="vcard_export_request_rejected_message" msgid="6455336845734884740">"Die vCard-Exportanfrage wurde abgelehnt. Bitte versuchen Sie es später erneut."</string>
     <string name="vcard_unknown_filename" msgid="8320954544777782497">"Kontakt"</string>
     <string name="caching_vcard_message" msgid="1879339732783666517">"Caching der vCard(s) in lokalen temporären Speicher wird durchgeführt. Der eigentliche Import beginnt gleich."</string>
-    <string name="vcard_import_failed" msgid="37313715326741013">"Importieren der vCard nicht möglich"</string>
+    <string name="vcard_import_failed" msgid="37313715326741013">Importieren der vCard nicht möglich</string>
     <string name="nfc_vcard_file_name" msgid="2113518216329123152">"Kontakt erhalten per NCF"</string>
-    <string name="caching_vcard_title" msgid="6333926052524937628">"Caching läuft..."</string>
-    <string name="progress_notifier_message" msgid="8522060892889599746">"<xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g> wird importiert: <xliff:g id="NAME">%3$s</xliff:g>"</string>
+    <string name="caching_vcard_title" msgid="6333926052524937628">Caching läuft …</string>
+    <string name="progress_notifier_message" msgid="8522060892889599746"><xliff:g id="current_number">%1$s</xliff:g>/<xliff:g id="total_number">%2$s</xliff:g> wird importiert: <xliff:g id="name" example="Joe Due">%3$s</xliff:g></string>
     <string name="export_to_vcf_file" msgid="3096479544575798192">"In VCF-Datei exportieren"</string>
     <string name="display_options_sort_list_by" msgid="4333658089057400431">"Sortieren nach"</string>
     <string name="display_options_phonetic_name_fields" msgid="1857564544755287298">"Phonetischer Name"</string>
@@ -443,17 +440,17 @@
     <string name="menu_import" msgid="2206768098740726906">"Importieren"</string>
     <string name="menu_export" msgid="1217402092617629429">"Exportieren"</string>
     <string name="menu_blocked_numbers" msgid="7064680515202657609">"Blockierte Nummern"</string>
-    <string name="contact_status_update_attribution" msgid="5051874518046969847">"über <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="2195847657702455703">"<xliff:g id="DATE">%1$s</xliff:g> über <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
-    <string name="action_menu_back_from_search" msgid="683765774264585732">"Suche beenden"</string>
-    <string name="description_clear_search" msgid="1852934085825794095">"Suche zurücksetzen"</string>
+    <string name="contact_status_update_attribution" msgid="5051874518046969847">über <xliff:g id="source" example="Google Talk">%1$s</xliff:g></string>
+    <string name="contact_status_update_attribution_with_date" msgid="2195847657702455703"><xliff:g id="date" example="3 hours ago">%1$s</xliff:g> über <xliff:g id="source" example="Google Talk">%2$s</xliff:g></string>
+    <string name="action_menu_back_from_search" msgid="683765774264585732">Suche anhalten</string>
+    <string name="description_clear_search" msgid="1852934085825794095">Suchfeld löschen</string>
     <string name="select_account_dialog_title" msgid="5047523441152129207">"Konto"</string>
     <string name="set_default_account" msgid="9194321110211682396">"Diese SIM für alle Anrufe verwenden"</string>
     <string name="call_with_a_note" msgid="2463785820399287281">"Mit einer Notiz anrufen"</string>
     <string name="call_subject_hint" msgid="7056652101889538157">"Notiz eingeben, die beim Anrufen gesendet wird…"</string>
     <string name="send_and_call_button" msgid="4851257959568592699">"SENDEN &amp; ANRUFEN"</string>
-    <string name="call_subject_limit" msgid="5679166729627777474">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="134754147019287616">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_limit" msgid="5679166729627777474"><xliff:g id="count" example="4">%1$s</xliff:g> / <xliff:g id="limit" example="64">%2$s</xliff:g></string>
+    <string name="call_subject_type_and_number" msgid="134754147019287616"><xliff:g id="type" example="Mobile">%1$s</xliff:g> • <xliff:g id="number" example="(650) 555-1212">%2$s</xliff:g></string>
     <string name="about_build_version" msgid="5870642814752351712">"Build-Version"</string>
     <string name="about_open_source_licenses" msgid="1617836621315557445">"Open Source-Lizenzen"</string>
     <string name="about_open_source_licenses_summary" msgid="4843627659117423491">"Lizenzdetails für Open-Source-Software"</string>
@@ -492,4 +489,7 @@
     <string name="contacts_default_notification_channel" msgid="5116916969874075866">"Benachrichtigungen"</string>
     <string name="yes_button" msgid="1120514817091581293">"Ja"</string>
     <string name="no_button" msgid="8965841385742548947">"Nein"</string>
-</resources>
+    <string name="menu_export_type_title">Exportiere vCard-Version</string>
+    <string name="search_font_family">sans-serif</string>
+    <string name="letter_tile_letter_font_family">sans-serif-medium</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 83cd256688..44cb8ef865 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,10 +12,7 @@
      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">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="8908212014470937609">"Contacts"</string>
     <string name="contactsList" msgid="4456188358262700898">"Contacts"</string>
     <string name="shortcut_add_contact" msgid="7949342235528657981">"Ajouter le contact"</string>
@@ -454,7 +451,7 @@
     <string name="send_and_call_button" msgid="4851257959568592699">"ENVOYER L\'OBJET ET APPELER"</string>
     <string name="call_subject_limit" msgid="5679166729627777474">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
     <string name="call_subject_type_and_number" msgid="134754147019287616">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="about_build_version" msgid="5870642814752351712">"Version de build"</string>
+    <string name="about_build_version" msgid="5870642814752351712">Version</string>
     <string name="about_open_source_licenses" msgid="1617836621315557445">"Licences Open Source"</string>
     <string name="about_open_source_licenses_summary" msgid="4843627659117423491">"Informations sur les licences des logiciels Open Source"</string>
     <string name="about_privacy_policy" msgid="4581488375200402678">"Règles de confidentialité"</string>
@@ -492,4 +489,5 @@
     <string name="contacts_default_notification_channel" msgid="5116916969874075866">"Notifications"</string>
     <string name="yes_button" msgid="1120514817091581293">"Oui"</string>
     <string name="no_button" msgid="8965841385742548947">"Non"</string>
-</resources>
+    <string name="menu_export_type_title">Version d\'export de la vCard</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 4996594532..601a60b1b2 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,10 +12,7 @@
      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">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="8908212014470937609">"Contatti"</string>
     <string name="contactsList" msgid="4456188358262700898">"Contatti"</string>
     <string name="shortcut_add_contact" msgid="7949342235528657981">"Aggiungi contatto"</string>
@@ -221,8 +218,8 @@
     <string name="editor_delete_view_description_short" msgid="6471032197042328181">"Elimina <xliff:g id="DATA_KIND">%s</xliff:g>"</string>
     <string name="menu_assistant" msgid="3980364519724237934">"Suggerimenti"</string>
     <string name="menu_assistant_new_badge" msgid="1992049406019853898">"Nuovo"</string>
-    <string name="navigation_drawer_open" msgid="3428713515765555712">"Apri riquadro di navigazione a scomparsa"</string>
-    <string name="navigation_drawer_close" msgid="3052989100471689722">"Chiudi riquadro navigazione a scomparsa"</string>
+    <string name="navigation_drawer_open" msgid="3428713515765555712">Apro la barra di navigazione</string>
+    <string name="navigation_drawer_close" msgid="3052989100471689722">Chiudo la barra di navigazione</string>
     <string name="navigation_drawer_label" msgid="8391863484838783638">"Etichetta <xliff:g id="LABEL_NAME">%s</xliff:g>"</string>
     <string name="menu_title_groups" msgid="3722199658759568221">"Etichette"</string>
     <string name="menu_title_filters" msgid="349866121417914494">"Account"</string>
@@ -325,7 +322,7 @@
     <string name="email_work" msgid="24992619164533704">"Invia email a ind. lavoro"</string>
     <string name="email_other" msgid="9200478615023952240">"Invia email"</string>
     <string name="email_custom" msgid="4614140345586842953">"Invia un\'email a <xliff:g id="CUSTOM_LABEL">%s</xliff:g>"</string>
-    <string name="email" msgid="7367975425670798827">"Email"</string>
+    <string name="email" msgid="7367975425670798827">Email</string>
     <string name="postal_street" msgid="43809570436400749">"Indirizzo postale"</string>
     <string name="postal_city" msgid="3571927981675393150">"Città"</string>
     <string name="postal_region" msgid="6130239447563491435">"Provincia"</string>
@@ -445,8 +442,8 @@
     <string name="menu_blocked_numbers" msgid="7064680515202657609">"Numeri bloccati"</string>
     <string name="contact_status_update_attribution" msgid="5051874518046969847">"tramite <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
     <string name="contact_status_update_attribution_with_date" msgid="2195847657702455703">"<xliff:g id="DATE">%1$s</xliff:g> tramite <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
-    <string name="action_menu_back_from_search" msgid="683765774264585732">"interrompi ricerca"</string>
-    <string name="description_clear_search" msgid="1852934085825794095">"Cancella ricerca"</string>
+    <string name="action_menu_back_from_search" msgid="683765774264585732">arresta la ricerca</string>
+    <string name="description_clear_search" msgid="1852934085825794095">Svuota la ricerca</string>
     <string name="select_account_dialog_title" msgid="5047523441152129207">"Account"</string>
     <string name="set_default_account" msgid="9194321110211682396">"Usa sempre questa per chiamare"</string>
     <string name="call_with_a_note" msgid="2463785820399287281">"Chiama e invia una nota"</string>
@@ -492,4 +489,4 @@
     <string name="contacts_default_notification_channel" msgid="5116916969874075866">"Notifiche"</string>
     <string name="yes_button" msgid="1120514817091581293">"Sì"</string>
     <string name="no_button" msgid="8965841385742548947">"No"</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 39949dd045..82d4180ab7 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -135,25 +135,25 @@
     <string name="label_name_dialog_hint" msgid="7027635439255596191">"Labelnaam"</string>
     <string name="audio_chat" msgid="5921525823973697372">"Voicechat"</string>
     <string name="video_chat" msgid="2477295971622477433">"Videochat"</string>
-    <string name="account_type_format" msgid="4926968760755013450">"<xliff:g id="SOURCE">%1$s</xliff:g>-contact"</string>
-    <string name="google_account_type_format" msgid="4046692740262396811">"<xliff:g id="SOURCE">%1$s</xliff:g>-account"</string>
-    <string name="take_photo" msgid="820071555236547516">"Foto maken"</string>
+    <string name="account_type_format" msgid="4926968760755013450"><xliff:g id="source" example="Gmail">%1$s</xliff:g> contact</string>
+    <string name="google_account_type_format" msgid="4046692740262396811"><xliff:g id="source" example="Google">%1$s</xliff:g> account</string>
+    <string name="take_photo" msgid="820071555236547516">Neem foto</string>
     <string name="take_new_photo" msgid="4383091978116875778">"Nieuwe foto nemen"</string>
     <string name="pick_photo" msgid="2050859661654812588">"Foto kiezen"</string>
     <string name="pick_new_photo" msgid="4218112182908240970">"Nieuwe foto selecteren"</string>
-    <string name="search_results_searching" msgid="1373859095361975648">"Zoeken..."</string>
+    <string name="search_results_searching" msgid="1373859095361975648">Zoeken…</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Datum"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Labelen"</string>
     <string name="cancel_button_content_description" msgid="7407595608883650004">"Annuleren"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"Terug"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"sluiten"</string>
     <string name="aggregation_suggestion_edit_dialog_message" msgid="4339333746086996062">"Wil je overschakelen naar het bewerken van het geselecteerde contact? Gegevens die je tot nu toe hebt ingevoerd, worden gekopieerd."</string>
-    <string name="contact_directory_description" msgid="1773630547110881835">"Directory <xliff:g id="TYPE">%1$s</xliff:g>"</string>
+    <string name="contact_directory_description" msgid="1773630547110881835">Map <xliff:g id="type" example="Corporate Directory">%1$s</xliff:g></string>
     <string name="activity_title_settings" msgid="4004290638426915162">"Instellingen"</string>
-    <string name="menu_settings" msgid="3524924670246877187">"Instellingen"</string>
+    <string name="menu_settings" msgid="3524924670246877187">Instellingen</string>
     <string name="menu_help" msgid="287801702920372292">"Hulp en feedback"</string>
-    <string name="organization_entry_two_field" msgid="6034934619269052455">"<xliff:g id="FIRST">%1$s</xliff:g> • <xliff:g id="SECOND">%2$s</xliff:g>"</string>
-    <string name="organization_entry_all_field" msgid="6724345890324437167">"<xliff:g id="COMPANY">%1$s</xliff:g> • <xliff:g id="DEPARTMENT">%2$s</xliff:g> • <xliff:g id="TITLE">%3$s</xliff:g>"</string>
+    <string name="organization_entry_two_field" msgid="6034934619269052455"> <xliff:g id="first" example="Google">%1$s</xliff:g> • <xliff:g id="second" example="Developer">%2$s</xliff:g> </string>
+    <string name="organization_entry_all_field" msgid="6724345890324437167"> <xliff:g id="company" example="Google">%1$s</xliff:g> • <xliff:g id="department" example="People">%2$s</xliff:g> • <xliff:g id="title" example="Developer">%3$s</xliff:g> </string>
     <string name="non_phone_caption" msgid="7343449684187013327">"Telefoonnummer"</string>
     <string name="non_phone_add_to_contacts" msgid="5472784294274676663">"Toevoegen aan contacten"</string>
     <string name="non_phone_close" msgid="2792373584950696532">"Sluiten"</string>
@@ -161,7 +161,7 @@
     <string name="contacts_unavailable_add_account" msgid="5196453892411710750">"Account toevoegen"</string>
     <string name="contacts_unavailable_import_contacts" msgid="4914180876114104054">"Importeren"</string>
     <string name="create_group_item_label" msgid="921929508079162463">"Nieuwe maken…"</string>
-    <string name="delete_group_dialog_message" msgid="754082019928025404">"Het label <xliff:g id="GROUP_LABEL">%1$s</xliff:g> verwijderen? (Contacten zelf worden niet verwijderd.)"</string>
+    <string name="delete_group_dialog_message" msgid="754082019928025404">Het label <xliff:g id="group_label" example="Friends">%1$s</xliff:g> verwijderen\? (Contacten zullen niet verwijderd worden.) </string>
     <string name="toast_join_with_empty_contact" msgid="3886468280665325350">"Geef een contactnaam op voordat je dit contact linkt met een ander contact."</string>
     <string name="copy_text" msgid="6835250673373028909">"Kopiëren naar klembord"</string>
     <string name="set_default" msgid="3704074175618702225">"Standaard instellen"</string>
@@ -177,7 +177,7 @@
     <string name="external_profile_title" msgid="2706282819025406927">"Mijn <xliff:g id="EXTERNAL_SOURCE">%1$s</xliff:g>-profiel"</string>
     <string name="contact_editor_prompt_zero_accounts" msgid="4468363031413457746">"Voeg snel een account toe om een back-up van je contacten te maken op Google."</string>
     <string name="contact_editor_prompt_one_account" msgid="765343809177951169">"Nieuwe contacten worden opgeslagen in <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g>."</string>
-    <string name="contact_editor_prompt_multiple_accounts" msgid="1543322760761168351">"Kies een standaardaccount voor nieuwe contacten"</string>
+    <string name="contact_editor_prompt_multiple_accounts" msgid="1543322760761168351">Kies een standaardaccount voor nieuwe contacten:</string>
     <string name="contact_editor_title_new_contact" msgid="7534775011591770343">"Nieuw contact maken"</string>
     <string name="contact_editor_title_existing_contact" msgid="3647774955741654029">"Contact bewerken"</string>
     <string name="contact_editor_title_read_only_contact" msgid="5494810291515292596">"Alleen bekijken"</string>
@@ -192,7 +192,7 @@
     <string name="expanding_entry_card_view_see_more" msgid="6636033205952561590">"Meer tonen"</string>
     <string name="expanding_entry_card_view_see_less" msgid="6399603072579278030">"Minder tonen"</string>
     <string name="about_card_title" msgid="6635849009952435700">"Over"</string>
-    <string name="toast_making_personal_copy" msgid="9053129410039312386">"Een persoonlijke kopie maken..."</string>
+    <string name="toast_making_personal_copy" msgid="9053129410039312386">Een persoonlijke kopie maken…</string>
     <string name="date_time_set" msgid="8526160894146496334">"Instellen"</string>
     <string name="header_im_entry" msgid="3581797653862294826">"Chat"</string>
     <string name="header_organization_entry" msgid="7428066442988227441">"Organisatie"</string>
@@ -225,11 +225,11 @@
     <string name="navigation_drawer_close" msgid="3052989100471689722">"Zijmenu sluiten"</string>
     <string name="navigation_drawer_label" msgid="8391863484838783638">"Label <xliff:g id="LABEL_NAME">%s</xliff:g>"</string>
     <string name="menu_title_groups" msgid="3722199658759568221">"Labels"</string>
-    <string name="menu_title_filters" msgid="349866121417914494">"Accounts"</string>
+    <string name="menu_title_filters" msgid="349866121417914494">Accounts</string>
     <string name="hamburger_feature_highlight_header" msgid="1786641424099282909">"Suggesties"</string>
     <string name="hamburger_feature_highlight_body" msgid="782935036630531528">"Organiseer je contacten op een overzichtelijke en nuttige manier"</string>
     <string name="undo" msgid="2446931036220975026">"Ongedaan maken"</string>
-    <string name="call_custom" msgid="2844900154492073207">"<xliff:g id="CUSTOM_LABEL">%s</xliff:g> bellen"</string>
+    <string name="call_custom" msgid="2844900154492073207"><xliff:g id="custom_label" example="business">%s</xliff:g> bellen </string>
     <string name="call_home" msgid="2443904771140750492">"Thuis bellen"</string>
     <string name="call_mobile" msgid="6504312789160309832">"Bellen naar mobiel"</string>
     <string name="call_work" msgid="2414313348547560346">"Bellen naar werk"</string>
@@ -248,10 +248,10 @@
     <string name="call_tty_tdd" msgid="3647586527611369559">"Tekststelefoon bellen"</string>
     <string name="call_work_mobile" msgid="2507794786733587181">"Bellen naar mobiel werk"</string>
     <string name="call_work_pager" msgid="615335008331933747">"Bellen naar pager werk"</string>
-    <string name="call_assistant" msgid="8556909944379826616">"<xliff:g id="CUSTOM_LABEL">%s</xliff:g> bellen"</string>
+    <string name="call_assistant" msgid="8556909944379826616"><xliff:g id="custom_label" example="assistant">%s</xliff:g> bellen </string>
     <string name="call_mms" msgid="1760746475672950386">"Bellen via MMS"</string>
     <string name="call_by_shortcut" msgid="5707329943368933423">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (bellen)"</string>
-    <string name="sms_custom" msgid="3684453744622817362">"<xliff:g id="CUSTOM_LABEL">%s</xliff:g> sms\'en"</string>
+    <string name="sms_custom" msgid="3684453744622817362">SMS naar <xliff:g id="custom_label" example="business">%s</xliff:g> </string>
     <string name="sms_home" msgid="6132392861245316613">"Sms\'en naar huis"</string>
     <string name="sms_mobile" msgid="433949735070334192">"Sms\'en naar mobiel"</string>
     <string name="sms_work" msgid="7784676780449153911">"Sms\'en naar werk"</string>
@@ -270,13 +270,13 @@
     <string name="sms_tty_tdd" msgid="5517202384458721064">"Sms\'en naar teksttelefoon"</string>
     <string name="sms_work_mobile" msgid="1170012557483816931">"Sms\'en naar mobiel werk"</string>
     <string name="sms_work_pager" msgid="8827367747655005608">"Sms\'en naar werkpager"</string>
-    <string name="sms_assistant" msgid="245045451580096547">"Sms\'en naar <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
+    <string name="sms_assistant" msgid="245045451580096547">SMS naar <xliff:g id="assistant">%s</xliff:g> </string>
     <string name="sms_mms" msgid="7395133080765833725">"Sms\'en via MMS"</string>
     <string name="sms_by_shortcut" msgid="4682340916268521006">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (sms\'en)"</string>
     <string name="description_video_call" msgid="4956825008907720371">"Videogesprek starten"</string>
     <string name="clearFrequentsConfirmation_title" msgid="9194415661170740437">"Lijst met regelmatige contacten wissen?"</string>
     <string name="clearFrequentsConfirmation" msgid="2120741757522063938">"Je wist de lijst met contacten waarmee je regelmatig contact opneemt in de apps Contacten en Telefoon, en e-mailapps moeten je voorkeursadressen weer opnieuw leren."</string>
-    <string name="clearFrequentsProgress_title" msgid="8271935295080659743">"Regelmatige contacten wissen..."</string>
+    <string name="clearFrequentsProgress_title" msgid="8271935295080659743">\"Regelmatig gecontacteerd\" wissen…</string>
     <string name="status_available" msgid="8081626460682959098">"Beschikbaar"</string>
     <string name="status_away" msgid="2677693194455091315">"Afwezig"</string>
     <string name="status_busy" msgid="2759339190187696727">"Bezet"</string>
@@ -324,7 +324,7 @@
     <string name="email_mobile" msgid="6461172430397598705">"E-mailen naar mobiel"</string>
     <string name="email_work" msgid="24992619164533704">"E-mailen naar werk"</string>
     <string name="email_other" msgid="9200478615023952240">"E-mail"</string>
-    <string name="email_custom" msgid="4614140345586842953">"<xliff:g id="CUSTOM_LABEL">%s</xliff:g> e-mailen"</string>
+    <string name="email_custom" msgid="4614140345586842953">Email naar <xliff:g id="custom_label" example="business">%s</xliff:g></string>
     <string name="email" msgid="7367975425670798827">"E-mail"</string>
     <string name="postal_street" msgid="43809570436400749">"Straat"</string>
     <string name="postal_city" msgid="3571927981675393150">"Plaats"</string>
@@ -334,7 +334,7 @@
     <string name="map_home" msgid="2169053372466501148">"Woonadres bekijken"</string>
     <string name="map_work" msgid="8296916987749726461">"Werkadres bekijken"</string>
     <string name="map_other" msgid="4009931029322619674">"Adres bekijken"</string>
-    <string name="map_custom" msgid="7797812861927817335">"Adres voor <xliff:g id="CUSTOM_LABEL">%s</xliff:g> bekijken"</string>
+    <string name="map_custom" msgid="7797812861927817335">Adres <xliff:g id="custom_label" example="vacation">%s</xliff:g> bekijken</string>
     <string name="chat_aim" msgid="2044861410748519265">"Chatten via AIM"</string>
     <string name="chat_msn" msgid="4733206223124506247">"Chatten via Windows Live"</string>
     <string name="chat_yahoo" msgid="3807571878191282528">"Chatten via Yahoo"</string>
@@ -362,8 +362,8 @@
     <string name="menu_sync_remove" msgid="7523335046562082188">"Synchronisatiegroep verwijderen"</string>
     <string name="dialog_sync_add" msgid="8012361965908515959">"Synchronisatiegroep toevoegen"</string>
     <string name="display_more_groups" msgid="8398232980355188133">"Meer groepen…"</string>
-    <string name="display_warn_remove_ungrouped" msgid="522866344738506017">"Als je \'<xliff:g id="GROUP">%s</xliff:g>\' verwijdert uit de synchronisatie, worden ook contacten die niet bij een groep horen uit de synchronisatie verwijderd."</string>
-    <string name="savingDisplayGroups" msgid="6779839417901711381">"Weergaveopties opslaan..."</string>
+    <string name="display_warn_remove_ungrouped" msgid="522866344738506017">Als je \"<xliff:g id="group" example="Starred">%s</xliff:g>\" verwijdert uit de synchronisatie, worden ook contacten die niet bij een groep horen uit de synchronisatie verwijderd.</string>
+    <string name="savingDisplayGroups" msgid="6779839417901711381">Weergaveopties opslaan…</string>
     <string name="listCustomView" msgid="5782275477737032610">"Aangepaste weergave"</string>
     <string name="dialog_new_contact_account" msgid="5652018124788855057">"Geïmporteerde contacten opslaan in:"</string>
     <string name="import_from_sim" msgid="7825280799813847991">"Simkaart"</string>
@@ -373,8 +373,8 @@
     <string name="import_from_vcf_file" msgid="6776403212804361301">"VCF-bestand"</string>
     <string name="nothing_to_import_message" msgid="2594519620375509783">"Niets te importeren"</string>
     <string name="import_from_vcf_file_confirmation_message" msgid="8579284961401472204">"Contacten importeren van vCard?"</string>
-    <string name="cancel_import_confirmation_message" msgid="1007412828398265611">"Import van <xliff:g id="FILENAME">%s</xliff:g> annuleren?"</string>
-    <string name="cancel_export_confirmation_message" msgid="370693160959236239">"Export van <xliff:g id="FILENAME">%s</xliff:g> annuleren?"</string>
+    <string name="cancel_import_confirmation_message" msgid="1007412828398265611">Import van <xliff:g id="filename" example="import.vcf">%s</xliff:g> annuleren\?</string>
+    <string name="cancel_export_confirmation_message" msgid="370693160959236239">Export van <xliff:g id="filename" example="export.vcf">%s</xliff:g> annuleren\?</string>
     <string name="cancel_vcard_import_or_export_failed" msgid="3041814872516288484">"Kan vCard-import/export niet annuleren"</string>
     <string name="fail_reason_unknown" msgid="3721044979355043778">"Onbekende fout."</string>
     <string name="fail_reason_could_not_open_file" msgid="6015509564074145162">"Kan \'<xliff:g id="FILE_NAME">%1$s</xliff:g>\' niet openen: <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
@@ -385,11 +385,11 @@
     <string name="fail_reason_io_error" msgid="6364839914349999408">"I/O-fout"</string>
     <string name="fail_reason_low_memory_during_import" msgid="4525361860523306991">"Onvoldoende geheugen. Het bestand is mogelijk te groot."</string>
     <string name="fail_reason_not_supported" msgid="6449916670421646290">"De indeling wordt niet ondersteund."</string>
-    <string name="exporting_vcard_finished_title" msgid="1984393609140969504">"Exporteren van <xliff:g id="FILENAME">%s</xliff:g> voltooid."</string>
+    <string name="exporting_vcard_finished_title" msgid="1984393609140969504">Exporteren van <xliff:g id="filename" example="export.vcf">%s</xliff:g> voltooid.</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="9029067439586573959">"Contacten geëxporteerd."</string>
     <string name="exporting_vcard_finished_toast" msgid="5463125514187187782">"De contacten zijn geëxporteerd. Klik op de melding om contacten te delen."</string>
     <string name="touch_to_share_contacts" msgid="7678194978416052577">"Tik om contacten te delen."</string>
-    <string name="exporting_vcard_canceled_title" msgid="1287529222628052526">"Exporteren van <xliff:g id="FILENAME">%s</xliff:g> geannuleerd."</string>
+    <string name="exporting_vcard_canceled_title" msgid="1287529222628052526">Exporteren van<xliff:g id="filename" example="export.vcf">%s</xliff:g> geannuleerd.</string>
     <string name="exporting_contact_list_title" msgid="6599904516394311592">"Contactgegevens exporteren"</string>
     <string name="exporting_contact_list_message" msgid="6253904938452184387">"Contactgegevens worden geëxporteerd."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="4394169679142311379">"Kan databasegegevens niet ophalen."</string>
@@ -397,11 +397,11 @@
     <string name="composer_not_initialized" msgid="3861391548605450184">"De vCard-editor is niet correct gestart."</string>
     <string name="exporting_contact_failed_title" msgid="9003659313161289860">"Kan niet exporteren"</string>
     <string name="exporting_contact_failed_message" msgid="9198720310560773485">"De contactgegevens zijn niet geëxporteerd.\nReden: \'<xliff:g id="FAIL_REASON">%s</xliff:g>\'"</string>
-    <string name="importing_vcard_description" msgid="6982207216746936735">"<xliff:g id="NAME">%s</xliff:g> importeren"</string>
+    <string name="importing_vcard_description" msgid="6982207216746936735"><xliff:g id="name" example="Joe Due">%s</xliff:g> aan het importeren</string>
     <string name="reading_vcard_failed_title" msgid="1230432142768184978">"Kan vCard-gegevens niet lezen"</string>
-    <string name="importing_vcard_finished_title" msgid="2274644947000264322">"Importeren van vCard <xliff:g id="FILENAME">%s</xliff:g> voltooid"</string>
-    <string name="importing_vcard_canceled_title" msgid="8165471996631186776">"Importeren van <xliff:g id="FILENAME">%s</xliff:g> geannuleerd"</string>
-    <string name="vcard_import_will_start_message" msgid="4514702035621833178">"<xliff:g id="FILENAME">%s</xliff:g> wordt binnenkort geïmporteerd."</string>
+    <string name="importing_vcard_finished_title" msgid="2274644947000264322">Importeren van vCard <xliff:g id="filename" example="import.vcf">%s</xliff:g> voltooid</string>
+    <string name="importing_vcard_canceled_title" msgid="8165471996631186776">Importeren van <xliff:g id="filename" example="import.vcf">%s</xliff:g> geannuleerd</string>
+    <string name="vcard_import_will_start_message" msgid="4514702035621833178"><xliff:g id="filename" example="import.vcf">%s</xliff:g> wordt zo dadelijk geïmporteerd.</string>
     <string name="vcard_import_will_start_message_with_default_name" msgid="8205422202924103470">"Het bestand wordt binnenkort geïmporteerd."</string>
     <string name="vcard_import_request_rejected_message" msgid="4754292694777189540">"Verzoek voor vCard-import is geweigerd. Probeer het later opnieuw."</string>
     <string name="contacts_export_will_start_message" msgid="6428126265599715944">"Contacten worden binnenkort geëxporteerd."</string>
@@ -411,7 +411,7 @@
     <string name="vcard_import_failed" msgid="37313715326741013">"Kan vCard niet importeren."</string>
     <string name="nfc_vcard_file_name" msgid="2113518216329123152">"Contact via NFC"</string>
     <string name="caching_vcard_title" msgid="6333926052524937628">"In cachegeheugen opslaan"</string>
-    <string name="progress_notifier_message" msgid="8522060892889599746">"Importeren <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
+    <string name="progress_notifier_message" msgid="8522060892889599746">Importeren <xliff:g id="current_number">%1$s</xliff:g>/<xliff:g id="total_number">%2$s</xliff:g>: <xliff:g id="name" example="Joe Due">%3$s</xliff:g></string>
     <string name="export_to_vcf_file" msgid="3096479544575798192">"Exporteren naar VCF"</string>
     <string name="display_options_sort_list_by" msgid="4333658089057400431">"Sorteren op"</string>
     <string name="display_options_phonetic_name_fields" msgid="1857564544755287298">"Fonetische naam"</string>
@@ -422,7 +422,7 @@
     <string name="display_options_view_names_as" msgid="4060686468465916565">"Naamindeling"</string>
     <string name="display_options_view_given_name_first" msgid="383885125505521383">"Voornaam eerst"</string>
     <string name="display_options_view_family_name_first" msgid="6597077054231296007">"Achternaam eerst"</string>
-    <string name="settings_accounts" msgid="119582613811929994">"Accounts"</string>
+    <string name="settings_accounts" msgid="119582613811929994">Accounts</string>
     <string name="default_editor_account" msgid="4810392921888877149">"Standaardaccount voor nieuwe contacten"</string>
     <string name="settings_my_info_title" msgid="6236848378653551341">"Mijn info"</string>
     <string name="set_up_profile" msgid="3554999219868611431">"Je profiel instellen"</string>
@@ -443,8 +443,8 @@
     <string name="menu_import" msgid="2206768098740726906">"Importeren"</string>
     <string name="menu_export" msgid="1217402092617629429">"Exporteren"</string>
     <string name="menu_blocked_numbers" msgid="7064680515202657609">"Geblokkeerde nummers"</string>
-    <string name="contact_status_update_attribution" msgid="5051874518046969847">"via <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="2195847657702455703">"<xliff:g id="DATE">%1$s</xliff:g> via <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
+    <string name="contact_status_update_attribution" msgid="5051874518046969847">via <xliff:g id="source" example="Google Talk">%1$s</xliff:g></string>
+    <string name="contact_status_update_attribution_with_date" msgid="2195847657702455703"><xliff:g id="date" example="3 hours ago">%1$s</xliff:g> via <xliff:g id="source" example="Google Talk">%2$s</xliff:g></string>
     <string name="action_menu_back_from_search" msgid="683765774264585732">"stoppen met zoeken"</string>
     <string name="description_clear_search" msgid="1852934085825794095">"Zoekopdracht wissen"</string>
     <string name="select_account_dialog_title" msgid="5047523441152129207">"Account"</string>
@@ -452,8 +452,8 @@
     <string name="call_with_a_note" msgid="2463785820399287281">"Gesprek met een notitie"</string>
     <string name="call_subject_hint" msgid="7056652101889538157">"Typ een notitie om te verzenden met het gesprek…"</string>
     <string name="send_and_call_button" msgid="4851257959568592699">"VERZENDEN EN BELLEN"</string>
-    <string name="call_subject_limit" msgid="5679166729627777474">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="134754147019287616">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
+    <string name="call_subject_limit" msgid="5679166729627777474"><xliff:g id="count" example="4">%1$s</xliff:g>/<xliff:g id="limit" example="64">%2$s</xliff:g></string>
+    <string name="call_subject_type_and_number" msgid="134754147019287616"><xliff:g id="type" example="Mobile">%1$s</xliff:g> • <xliff:g id="number" example="(650) 555-1212">%2$s</xliff:g></string>
     <string name="about_build_version" msgid="5870642814752351712">"Buildversie"</string>
     <string name="about_open_source_licenses" msgid="1617836621315557445">"Opensource-licenties"</string>
     <string name="about_open_source_licenses_summary" msgid="4843627659117423491">"Licentiedetails voor open-sourcesoftware"</string>
@@ -492,4 +492,7 @@
     <string name="contacts_default_notification_channel" msgid="5116916969874075866">"Meldingen"</string>
     <string name="yes_button" msgid="1120514817091581293">"Ja"</string>
     <string name="no_button" msgid="8965841385742548947">"Nee"</string>
+    <string name="search_font_family">sans-serif</string>
+    <string name="menu_export_type_title">Export vCard versie</string>
+    <string name="letter_tile_letter_font_family">sans-serif-medium</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index ccfdcd3401..a40068cef6 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -124,7 +124,7 @@
     <string name="quickcontact_add_phone_number" msgid="1683577288080727862">"Добавить номер телефона"</string>
     <string name="quickcontact_add_email" msgid="1442894568471116797">"Добавить адрес электронной почты"</string>
     <string name="missing_app" msgid="5674389915738964148">"Действие не поддерживается ни в одном приложении."</string>
-    <string name="menu_share" msgid="6343022811796001773">"Поделиться"</string>
+    <string name="menu_share" msgid="6343022811796001773">Поделиться</string>
     <string name="menu_add_contact" msgid="5822356185421997656">"Добавить в контакты"</string>
     <string name="menu_add_contacts" msgid="7114262784903366463">"Добавить"</string>
     <string name="title_share_via" msgid="3300082736229182956">"{count,plural, =1{Выберите способ отправки}one{Выберите способ отправки}few{Выберите способ отправки}many{Выберите способ отправки}other{Выберите способ отправки}}"</string>
@@ -137,7 +137,7 @@
     <string name="video_chat" msgid="2477295971622477433">"Видеочат"</string>
     <string name="account_type_format" msgid="4926968760755013450">"Контакт <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
     <string name="google_account_type_format" msgid="4046692740262396811">"Аккаунт <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
-    <string name="take_photo" msgid="820071555236547516">"Сфотографировать"</string>
+    <string name="take_photo" msgid="820071555236547516">Сделать фото</string>
     <string name="take_new_photo" msgid="4383091978116875778">"Сфотографировать"</string>
     <string name="pick_photo" msgid="2050859661654812588">"Выбрать фото"</string>
     <string name="pick_new_photo" msgid="4218112182908240970">"Выбрать другое фото"</string>
@@ -150,7 +150,7 @@
     <string name="aggregation_suggestion_edit_dialog_message" msgid="4339333746086996062">"Переключиться на редактирование выбранного контакта? Введенная информация будет скопирована."</string>
     <string name="contact_directory_description" msgid="1773630547110881835">"Каталог <xliff:g id="TYPE">%1$s</xliff:g>"</string>
     <string name="activity_title_settings" msgid="4004290638426915162">"Настройки"</string>
-    <string name="menu_settings" msgid="3524924670246877187">"Настройки"</string>
+    <string name="menu_settings" msgid="3524924670246877187">Настройки</string>
     <string name="menu_help" msgid="287801702920372292">"Справка/отзыв"</string>
     <string name="organization_entry_two_field" msgid="6034934619269052455">"<xliff:g id="FIRST">%1$s</xliff:g> • <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="organization_entry_all_field" msgid="6724345890324437167">"<xliff:g id="COMPANY">%1$s</xliff:g> • <xliff:g id="DEPARTMENT">%2$s</xliff:g> • <xliff:g id="TITLE">%3$s</xliff:g>"</string>
@@ -445,7 +445,7 @@
     <string name="menu_blocked_numbers" msgid="7064680515202657609">"Заблокированные номера"</string>
     <string name="contact_status_update_attribution" msgid="5051874518046969847">"с помощью <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
     <string name="contact_status_update_attribution_with_date" msgid="2195847657702455703">"<xliff:g id="DATE">%1$s</xliff:g> с помощью <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
-    <string name="action_menu_back_from_search" msgid="683765774264585732">"прекратить поиск"</string>
+    <string name="action_menu_back_from_search" msgid="683765774264585732">остановить поиск</string>
     <string name="description_clear_search" msgid="1852934085825794095">"Очистить условия поиска"</string>
     <string name="select_account_dialog_title" msgid="5047523441152129207">"Аккаунт"</string>
     <string name="set_default_account" msgid="9194321110211682396">"Всегда использовать для звонков"</string>
-- 
GitLab