From 4aab417a7fe07953eeab2a7b2a3b506a9b743e3d Mon Sep 17 00:00:00 2001
From: Fahim <fahim.cse11@gmail.com>
Date: Mon, 9 Aug 2021 21:31:03 +0600
Subject: [PATCH 1/8] 3570-Q-Settings_UI_Issue

---
 res/layout/custom_pref_layout.xml             | 54 +++++++++++++++++++
 res/layout/custom_settings_toolbar.xml        | 22 ++++++++
 res/values/styles.xml                         |  4 ++
 res/xml/preference_about.xml                  | 38 +++++++++----
 res/xml/preference_display_options.xml        | 26 ++++++++-
 .../ContactsPreferenceActivity.java           | 10 ++--
 6 files changed, 140 insertions(+), 14 deletions(-)
 create mode 100644 res/layout/custom_pref_layout.xml
 create mode 100644 res/layout/custom_settings_toolbar.xml

diff --git a/res/layout/custom_pref_layout.xml b/res/layout/custom_pref_layout.xml
new file mode 100644
index 0000000000..5c239eb69c
--- /dev/null
+++ b/res/layout/custom_pref_layout.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:gravity="center_vertical"
+    android:paddingEnd="?android:attr/scrollbarSize"
+    android:background="@color/color_default_background"
+    android:focusable="true" >
+
+    <FrameLayout
+        android:id="@+id/icon_frame"
+        android:background="@color/color_default_background"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+        <ImageView
+            android:id="@android:id/icon"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_gravity="center"
+            />
+    </FrameLayout>
+
+    <RelativeLayout
+        android:background="@color/color_default_background"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="15dip"
+        android:layout_marginEnd="6dip"
+        android:layout_marginTop="6dip"
+        android:layout_marginBottom="6dip"
+        android:layout_weight="1">
+
+        <TextView android:id="@android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textAppearance="@android:style/TextAppearance.DeviceDefault.Subhead"
+            android:textColor="?android:attr/textColorPrimary"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal" />
+
+        <TextView android:id="@android:id/summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@android:id/title"
+            android:layout_alignStart="@android:id/title"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="?android:attr/textColorSecondary"
+            android:maxLines="4" />
+
+    </RelativeLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/custom_settings_toolbar.xml b/res/layout/custom_settings_toolbar.xml
new file mode 100644
index 0000000000..831ed0b098
--- /dev/null
+++ b/res/layout/custom_settings_toolbar.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/toolbar"
+    android:layout_width="match_parent"
+    android:layout_height="?attr/actionBarSize"
+    android:background="@color/primary_color_dark">
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textStyle="bold"
+        android:textSize="20sp"
+        android:gravity="center_vertical"
+        android:background="@color/primary_color_dark"
+        android:textColor="@color/color_default_primary_text"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentBottom="true"
+        />
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 8b1167700d..a934f6f5d5 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -683,6 +683,10 @@ background and text color. See also android:style/Widget.Holo.TextView.ListSepar
 
     <style name="Toolbar.Button.Navigation.Tinted" parent="Widget.AppCompat.Toolbar.Button.Navigation">
         <item name="tint">@color/accent</item>
+        <item name="android:src">@drawable/quantum_ic_arrow_back_vd_theme_24</item>
+        <item name="android:minHeight">0dp</item>
+        <item name="android:paddingTop">15dp</item>
+        <item name="android:paddingBottom">10dp</item>
     </style>
 
     <style name="Theme.QuickContact.White.TopBar" parent="@style/Theme.QuickContact">
diff --git a/res/xml/preference_about.xml b/res/xml/preference_about.xml
index 3a71f6e501..cc648bbf77 100644
--- a/res/xml/preference_about.xml
+++ b/res/xml/preference_about.xml
@@ -14,15 +14,21 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto" >
     
     <Preference
-	android:icon="@null"
+        android:layout="@layout/custom_pref_layout"
+        app:iconSpaceReserved="false"
+	    android:icon="@null"
         android:key="contacts_info"
         android:summary="@string/preferences_app_info"
         android:title="@string/preferences_app_info_title" />
 
     <Preference
+        android:layout="@layout/custom_pref_layout"
+        app:iconSpaceReserved="false"
         android:icon="@null"
         android:key="@string/pref_build_version_key"
         android:title="@string/about_build_version">
@@ -34,7 +40,9 @@
     </Preference>
 
     <Preference
-	android:icon="@null"
+        android:layout="@layout/custom_pref_layout"
+        app:iconSpaceReserved="false"
+	    android:icon="@null"
         android:key="about_app"
         android:title="@string/preferences_about_app">
 
@@ -45,42 +53,54 @@
     </Preference>
 
     <Preference
-	android:icon="@null"
-	android:title="@string/preferences_licence">
+        android:layout="@layout/custom_pref_layout"
+        app:iconSpaceReserved="false"
+        android:icon="@null"
+        android:title="@string/preferences_licence" >
         <intent
             android:action="android.intent.action.VIEW"
             android:data="https://gitlab.e.foundation/e/os/android_packages_apps_Contacts/-/blob/v1-oreo/NOTICE" />
     </Preference>
 
     <Preference
-	android:icon="@null"   
-	android:title="@string/preferences_authors">
+        android:layout="@layout/custom_pref_layout"
+        app:iconSpaceReserved="false"
+        android:icon="@null"
+        android:title="@string/preferences_authors">
         <intent
             android:action="android.intent.action.VIEW"
             android:data="https://gitlab.e.foundation/e/os/android_packages_apps_Contacts" />
     </Preference>
 
     <Preference
-	android:icon="@null"
-	android:title="@string/preferences_source_code">
+        android:layout="@layout/custom_pref_layout"
+        app:iconSpaceReserved="false"
+        android:icon="@null"
+        android:title="@string/preferences_source_code">
         <intent
             android:action="android.intent.action.VIEW"
             android:data="https://gitlab.e.foundation/e/os/android_packages_apps_Contacts" />
     </Preference>
 
     <Preference
+        android:layout="@layout/custom_pref_layout"
+        app:iconSpaceReserved="false"
         android:icon="@null"
         android:key="@string/pref_open_source_licenses_key"
         android:title="@string/about_open_source_licenses"
         android:summary="@string/about_open_source_licenses_summary"/>
 
     <Preference
+        android:layout="@layout/custom_pref_layout"
+        app:iconSpaceReserved="false"
         android:icon="@null"
         android:key="@string/pref_privacy_policy_key"
         android:title="@string/about_privacy_policy">
     </Preference>
 
     <Preference
+        android:layout="@layout/custom_pref_layout"
+        app:iconSpaceReserved="false"
         android:icon="@null"
         android:key="@string/pref_terms_of_service_key"
         android:title="@string/about_terms_of_service">
diff --git a/res/xml/preference_display_options.xml b/res/xml/preference_display_options.xml
index c969cd24f1..bdc36b8c4a 100644
--- a/res/xml/preference_display_options.xml
+++ b/res/xml/preference_display_options.xml
@@ -14,63 +14,87 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto" >
     <Preference
+        android:layout="@layout/custom_pref_layout"
+        app:iconSpaceReserved="false"
         android:icon="@null"
         android:key="myInfo"
         android:title="@string/settings_my_info_title"/>
 
     <Preference
+        android:layout="@layout/custom_pref_layout"
+        app:iconSpaceReserved="false"
         android:icon="@null"
         android:key="accounts"
         android:title="@string/settings_accounts">
     </Preference>
 
     <com.android.contacts.preference.DefaultAccountPreference
+        android:layout="@layout/custom_pref_layout"
+        app:iconSpaceReserved="false"
         android:icon="@null"
         android:key="defaultAccount"
         android:title="@string/default_editor_account"
         android:dialogTitle="@string/default_editor_account" />
 
     <Preference
+        android:layout="@layout/custom_pref_layout"
+        app:iconSpaceReserved="false"
         android:icon="@null"
         android:key="customContactsFilter"
         android:title="@string/menu_contacts_filter"/>
 
     <com.android.contacts.preference.SortOrderPreference
+        android:layout="@layout/custom_pref_layout"
+        app:iconSpaceReserved="false"
         android:icon="@null"
         android:key="sortOrder"
         android:title="@string/display_options_sort_list_by"
         android:dialogTitle="@string/display_options_sort_list_by" />
 
     <com.android.contacts.preference.DisplayOrderPreference
+        android:layout="@layout/custom_pref_layout"
+        app:iconSpaceReserved="false"
         android:icon="@null"
         android:key="displayOrder"
         android:title="@string/display_options_view_names_as"
         android:dialogTitle="@string/display_options_view_names_as" />
 
     <com.android.contacts.preference.PhoneticNameDisplayPreference
+        android:layout="@layout/custom_pref_layout"
+        app:iconSpaceReserved="false"
         android:icon="@null"
         android:key="phoneticNameDisplay"
         android:title="@string/display_options_phonetic_name_fields"
         android:dialogTitle="@string/display_options_phonetic_name_fields"/>
 
     <Preference
+        android:layout="@layout/custom_pref_layout"
+        app:iconSpaceReserved="false"
         android:icon="@null"
         android:key="import"
         android:title="@string/menu_import"/>
 
     <Preference
+        android:layout="@layout/custom_pref_layout"
+        app:iconSpaceReserved="false"
         android:icon="@null"
         android:key="export"
         android:title="@string/menu_export"/>
 
     <Preference
+        android:layout="@layout/custom_pref_layout"
+        app:iconSpaceReserved="false"
         android:icon="@null"
         android:key="blockedNumbers"
         android:title="@string/menu_blocked_numbers" />
 
     <Preference
+        android:layout="@layout/custom_pref_layout"
+        app:iconSpaceReserved="false"
         android:icon="@null"
         android:key="about"
         android:title="@string/setting_about"
diff --git a/src/com/android/contacts/preference/ContactsPreferenceActivity.java b/src/com/android/contacts/preference/ContactsPreferenceActivity.java
index c153cc7bff..78ac784d1e 100644
--- a/src/com/android/contacts/preference/ContactsPreferenceActivity.java
+++ b/src/com/android/contacts/preference/ContactsPreferenceActivity.java
@@ -37,6 +37,7 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 
 import com.android.contacts.R;
 import com.android.contacts.editor.SelectAccountDialogFragment;
@@ -79,6 +80,9 @@ public final class ContactsPreferenceActivity extends PreferenceActivity
         if (actionBar != null) {
             actionBar.setBackgroundDrawable(new ColorDrawable(getColor(R.color.primary_color_dark)));
             actionBar.setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP, ActionBar.DISPLAY_HOME_AS_UP);
+            actionBar.setDisplayShowCustomEnabled(true);
+            actionBar.setDisplayShowTitleEnabled(false);
+            actionBar.setCustomView(R.layout.custom_settings_toolbar);
         }
 
         mProviderStatusWatcher = ProviderStatusWatcher.getInstance(this);
@@ -202,10 +206,8 @@ public final class ContactsPreferenceActivity extends PreferenceActivity
         final ActionBar actionBar = mCompatDelegate.getSupportActionBar();
         if (actionBar != null) {
             actionBar.setBackgroundDrawable(new ColorDrawable(getColor(R.color.primary_color_dark)));
-            //actionBar.setTitle(res);
-            String title=this.getResources().getString(res);
-
-            actionBar.setTitle(title);
+            TextView titleTextView = actionBar.getCustomView().findViewById(R.id.title);
+            titleTextView.setText(res);
 
         }
     }
-- 
GitLab


From 491f296b56dc2f90af9fee50b8dd77a434d5ba84 Mon Sep 17 00:00:00 2001
From: Fahim <fahim.cse11@gmail.com>
Date: Mon, 9 Aug 2021 21:42:35 +0600
Subject: [PATCH 2/8] Fix attribute not found issue

---
 res/layout/custom_pref_layout.xml      |  2 +-
 res/xml/preference_about.xml           | 12 +-----------
 res/xml/preference_display_options.xml | 14 +-------------
 3 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/res/layout/custom_pref_layout.xml b/res/layout/custom_pref_layout.xml
index 5c239eb69c..3a6ec36807 100644
--- a/res/layout/custom_pref_layout.xml
+++ b/res/layout/custom_pref_layout.xml
@@ -36,7 +36,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:singleLine="true"
-            android:textAppearance="@android:style/TextAppearance.DeviceDefault.Subhead"
+            android:textAppearance="?android:attr/textAppearanceMedium"
             android:textColor="?android:attr/textColorPrimary"
             android:ellipsize="marquee"
             android:fadingEdge="horizontal" />
diff --git a/res/xml/preference_about.xml b/res/xml/preference_about.xml
index cc648bbf77..6fbc312fce 100644
--- a/res/xml/preference_about.xml
+++ b/res/xml/preference_about.xml
@@ -15,12 +15,10 @@
 -->
 
 <PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto" >
+    xmlns:android="http://schemas.android.com/apk/res/android" >
     
     <Preference
         android:layout="@layout/custom_pref_layout"
-        app:iconSpaceReserved="false"
 	    android:icon="@null"
         android:key="contacts_info"
         android:summary="@string/preferences_app_info"
@@ -28,7 +26,6 @@
 
     <Preference
         android:layout="@layout/custom_pref_layout"
-        app:iconSpaceReserved="false"
         android:icon="@null"
         android:key="@string/pref_build_version_key"
         android:title="@string/about_build_version">
@@ -41,7 +38,6 @@
 
     <Preference
         android:layout="@layout/custom_pref_layout"
-        app:iconSpaceReserved="false"
 	    android:icon="@null"
         android:key="about_app"
         android:title="@string/preferences_about_app">
@@ -54,7 +50,6 @@
 
     <Preference
         android:layout="@layout/custom_pref_layout"
-        app:iconSpaceReserved="false"
         android:icon="@null"
         android:title="@string/preferences_licence" >
         <intent
@@ -64,7 +59,6 @@
 
     <Preference
         android:layout="@layout/custom_pref_layout"
-        app:iconSpaceReserved="false"
         android:icon="@null"
         android:title="@string/preferences_authors">
         <intent
@@ -74,7 +68,6 @@
 
     <Preference
         android:layout="@layout/custom_pref_layout"
-        app:iconSpaceReserved="false"
         android:icon="@null"
         android:title="@string/preferences_source_code">
         <intent
@@ -84,7 +77,6 @@
 
     <Preference
         android:layout="@layout/custom_pref_layout"
-        app:iconSpaceReserved="false"
         android:icon="@null"
         android:key="@string/pref_open_source_licenses_key"
         android:title="@string/about_open_source_licenses"
@@ -92,7 +84,6 @@
 
     <Preference
         android:layout="@layout/custom_pref_layout"
-        app:iconSpaceReserved="false"
         android:icon="@null"
         android:key="@string/pref_privacy_policy_key"
         android:title="@string/about_privacy_policy">
@@ -100,7 +91,6 @@
 
     <Preference
         android:layout="@layout/custom_pref_layout"
-        app:iconSpaceReserved="false"
         android:icon="@null"
         android:key="@string/pref_terms_of_service_key"
         android:title="@string/about_terms_of_service">
diff --git a/res/xml/preference_display_options.xml b/res/xml/preference_display_options.xml
index bdc36b8c4a..1b33295fb7 100644
--- a/res/xml/preference_display_options.xml
+++ b/res/xml/preference_display_options.xml
@@ -15,18 +15,15 @@
 -->
 
 <PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto" >
+    xmlns:android="http://schemas.android.com/apk/res/android" >
     <Preference
         android:layout="@layout/custom_pref_layout"
-        app:iconSpaceReserved="false"
         android:icon="@null"
         android:key="myInfo"
         android:title="@string/settings_my_info_title"/>
 
     <Preference
         android:layout="@layout/custom_pref_layout"
-        app:iconSpaceReserved="false"
         android:icon="@null"
         android:key="accounts"
         android:title="@string/settings_accounts">
@@ -34,7 +31,6 @@
 
     <com.android.contacts.preference.DefaultAccountPreference
         android:layout="@layout/custom_pref_layout"
-        app:iconSpaceReserved="false"
         android:icon="@null"
         android:key="defaultAccount"
         android:title="@string/default_editor_account"
@@ -42,14 +38,12 @@
 
     <Preference
         android:layout="@layout/custom_pref_layout"
-        app:iconSpaceReserved="false"
         android:icon="@null"
         android:key="customContactsFilter"
         android:title="@string/menu_contacts_filter"/>
 
     <com.android.contacts.preference.SortOrderPreference
         android:layout="@layout/custom_pref_layout"
-        app:iconSpaceReserved="false"
         android:icon="@null"
         android:key="sortOrder"
         android:title="@string/display_options_sort_list_by"
@@ -57,7 +51,6 @@
 
     <com.android.contacts.preference.DisplayOrderPreference
         android:layout="@layout/custom_pref_layout"
-        app:iconSpaceReserved="false"
         android:icon="@null"
         android:key="displayOrder"
         android:title="@string/display_options_view_names_as"
@@ -65,7 +58,6 @@
 
     <com.android.contacts.preference.PhoneticNameDisplayPreference
         android:layout="@layout/custom_pref_layout"
-        app:iconSpaceReserved="false"
         android:icon="@null"
         android:key="phoneticNameDisplay"
         android:title="@string/display_options_phonetic_name_fields"
@@ -73,28 +65,24 @@
 
     <Preference
         android:layout="@layout/custom_pref_layout"
-        app:iconSpaceReserved="false"
         android:icon="@null"
         android:key="import"
         android:title="@string/menu_import"/>
 
     <Preference
         android:layout="@layout/custom_pref_layout"
-        app:iconSpaceReserved="false"
         android:icon="@null"
         android:key="export"
         android:title="@string/menu_export"/>
 
     <Preference
         android:layout="@layout/custom_pref_layout"
-        app:iconSpaceReserved="false"
         android:icon="@null"
         android:key="blockedNumbers"
         android:title="@string/menu_blocked_numbers" />
 
     <Preference
         android:layout="@layout/custom_pref_layout"
-        app:iconSpaceReserved="false"
         android:icon="@null"
         android:key="about"
         android:title="@string/setting_about"
-- 
GitLab


From 15b5ab6f059ecd2d1328663da96f332a4c430734 Mon Sep 17 00:00:00 2001
From: Fahim <fahim.cse11@gmail.com>
Date: Mon, 9 Aug 2021 22:18:47 +0600
Subject: [PATCH 3/8] Fix preference issue

---
 res/xml/preference_about.xml           | 36 +++++++++++++++++++++
 res/xml/preference_display_options.xml | 44 ++++++++++++++++++++++++++
 2 files changed, 80 insertions(+)

diff --git a/res/xml/preference_about.xml b/res/xml/preference_about.xml
index 6fbc312fce..a9338625d5 100644
--- a/res/xml/preference_about.xml
+++ b/res/xml/preference_about.xml
@@ -18,6 +18,10 @@
     xmlns:android="http://schemas.android.com/apk/res/android" >
     
     <Preference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
         android:layout="@layout/custom_pref_layout"
 	    android:icon="@null"
         android:key="contacts_info"
@@ -25,6 +29,10 @@
         android:title="@string/preferences_app_info_title" />
 
     <Preference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
         android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="@string/pref_build_version_key"
@@ -37,6 +45,10 @@
     </Preference>
 
     <Preference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
         android:layout="@layout/custom_pref_layout"
 	    android:icon="@null"
         android:key="about_app"
@@ -49,6 +61,10 @@
     </Preference>
 
     <Preference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
         android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:title="@string/preferences_licence" >
@@ -58,6 +74,10 @@
     </Preference>
 
     <Preference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
         android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:title="@string/preferences_authors">
@@ -67,6 +87,10 @@
     </Preference>
 
     <Preference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
         android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:title="@string/preferences_source_code">
@@ -76,6 +100,10 @@
     </Preference>
 
     <Preference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
         android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="@string/pref_open_source_licenses_key"
@@ -83,6 +111,10 @@
         android:summary="@string/about_open_source_licenses_summary"/>
 
     <Preference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
         android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="@string/pref_privacy_policy_key"
@@ -90,6 +122,10 @@
     </Preference>
 
     <Preference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
         android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="@string/pref_terms_of_service_key"
diff --git a/res/xml/preference_display_options.xml b/res/xml/preference_display_options.xml
index 1b33295fb7..9081e84ecc 100644
--- a/res/xml/preference_display_options.xml
+++ b/res/xml/preference_display_options.xml
@@ -17,12 +17,20 @@
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android" >
     <Preference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
         android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="myInfo"
         android:title="@string/settings_my_info_title"/>
 
     <Preference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
         android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="accounts"
@@ -30,6 +38,10 @@
     </Preference>
 
     <com.android.contacts.preference.DefaultAccountPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
         android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="defaultAccount"
@@ -37,12 +49,20 @@
         android:dialogTitle="@string/default_editor_account" />
 
     <Preference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
         android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="customContactsFilter"
         android:title="@string/menu_contacts_filter"/>
 
     <com.android.contacts.preference.SortOrderPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
         android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="sortOrder"
@@ -50,6 +70,10 @@
         android:dialogTitle="@string/display_options_sort_list_by" />
 
     <com.android.contacts.preference.DisplayOrderPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
         android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="displayOrder"
@@ -57,6 +81,10 @@
         android:dialogTitle="@string/display_options_view_names_as" />
 
     <com.android.contacts.preference.PhoneticNameDisplayPreference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
         android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="phoneticNameDisplay"
@@ -64,24 +92,40 @@
         android:dialogTitle="@string/display_options_phonetic_name_fields"/>
 
     <Preference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
         android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="import"
         android:title="@string/menu_import"/>
 
     <Preference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
         android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="export"
         android:title="@string/menu_export"/>
 
     <Preference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
         android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="blockedNumbers"
         android:title="@string/menu_blocked_numbers" />
 
     <Preference
+        android:shouldDisableView="true"
+        android:enabled="true"
+        android:iconSpaceReserved="false"
+        android:selectable="true"
         android:layout="@layout/custom_pref_layout"
         android:icon="@null"
         android:key="about"
-- 
GitLab


From ab58db77a86574e93be366dc7774e9f21a0af2fe Mon Sep 17 00:00:00 2001
From: Fahim <fahim.cse11@gmail.com>
Date: Mon, 9 Aug 2021 22:48:51 +0600
Subject: [PATCH 4/8] Fix preference issue

---
 res/xml/preference_display_options.xml        | 16 +++++------
 .../contacts/preference/CustomPreference.java | 28 +++++++++++++++++++
 .../preference/DefaultAccountPreference.java  |  5 ++++
 .../preference/DisplayOrderPreference.java    |  5 ++++
 .../PhoneticNameDisplayPreference.java        |  5 ++++
 .../preference/SortOrderPreference.java       |  5 ++++
 6 files changed, 56 insertions(+), 8 deletions(-)
 create mode 100644 src/com/android/contacts/preference/CustomPreference.java

diff --git a/res/xml/preference_display_options.xml b/res/xml/preference_display_options.xml
index 9081e84ecc..31f2db7e1d 100644
--- a/res/xml/preference_display_options.xml
+++ b/res/xml/preference_display_options.xml
@@ -16,7 +16,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android" >
-    <Preference
+    <com.android.contacts.preference.CustomPreference
         android:shouldDisableView="true"
         android:enabled="true"
         android:iconSpaceReserved="false"
@@ -26,7 +26,7 @@
         android:key="myInfo"
         android:title="@string/settings_my_info_title"/>
 
-    <Preference
+    <com.android.contacts.preference.CustomPreference
         android:shouldDisableView="true"
         android:enabled="true"
         android:iconSpaceReserved="false"
@@ -35,7 +35,7 @@
         android:icon="@null"
         android:key="accounts"
         android:title="@string/settings_accounts">
-    </Preference>
+    </com.android.contacts.preference.CustomPreference>
 
     <com.android.contacts.preference.DefaultAccountPreference
         android:shouldDisableView="true"
@@ -48,7 +48,7 @@
         android:title="@string/default_editor_account"
         android:dialogTitle="@string/default_editor_account" />
 
-    <Preference
+    <com.android.contacts.preference.CustomPreference
         android:shouldDisableView="true"
         android:enabled="true"
         android:iconSpaceReserved="false"
@@ -91,7 +91,7 @@
         android:title="@string/display_options_phonetic_name_fields"
         android:dialogTitle="@string/display_options_phonetic_name_fields"/>
 
-    <Preference
+    <com.android.contacts.preference.CustomPreference
         android:shouldDisableView="true"
         android:enabled="true"
         android:iconSpaceReserved="false"
@@ -101,7 +101,7 @@
         android:key="import"
         android:title="@string/menu_import"/>
 
-    <Preference
+    <com.android.contacts.preference.CustomPreference
         android:shouldDisableView="true"
         android:enabled="true"
         android:iconSpaceReserved="false"
@@ -111,7 +111,7 @@
         android:key="export"
         android:title="@string/menu_export"/>
 
-    <Preference
+    <com.android.contacts.preference.CustomPreference
         android:shouldDisableView="true"
         android:enabled="true"
         android:iconSpaceReserved="false"
@@ -121,7 +121,7 @@
         android:key="blockedNumbers"
         android:title="@string/menu_blocked_numbers" />
 
-    <Preference
+    <com.android.contacts.preference.CustomPreference
         android:shouldDisableView="true"
         android:enabled="true"
         android:iconSpaceReserved="false"
diff --git a/src/com/android/contacts/preference/CustomPreference.java b/src/com/android/contacts/preference/CustomPreference.java
new file mode 100644
index 0000000000..1d9376259c
--- /dev/null
+++ b/src/com/android/contacts/preference/CustomPreference.java
@@ -0,0 +1,28 @@
+package com.android.contacts.preference;
+
+import android.content.Context;
+import android.preference.Preference;
+import android.util.AttributeSet;
+
+public class CustomPreference extends Preference {
+    public CustomPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    public CustomPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public CustomPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public CustomPreference(Context context) {
+        super(context);
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return true;
+    }
+}
diff --git a/src/com/android/contacts/preference/DefaultAccountPreference.java b/src/com/android/contacts/preference/DefaultAccountPreference.java
index d43b8d5748..1f983bf620 100644
--- a/src/com/android/contacts/preference/DefaultAccountPreference.java
+++ b/src/com/android/contacts/preference/DefaultAccountPreference.java
@@ -109,4 +109,9 @@ public class DefaultAccountPreference extends DialogPreference {
             }
         } // else the user dismissed this dialog so leave the preference unchanged.
     }
+
+    @Override
+    public boolean isEnabled() {
+        return true;
+    }
 }
diff --git a/src/com/android/contacts/preference/DisplayOrderPreference.java b/src/com/android/contacts/preference/DisplayOrderPreference.java
index 801bb248ad..1122d7bb88 100644
--- a/src/com/android/contacts/preference/DisplayOrderPreference.java
+++ b/src/com/android/contacts/preference/DisplayOrderPreference.java
@@ -87,4 +87,9 @@ public final class DisplayOrderPreference extends ListPreference {
         super.onPrepareDialogBuilder(builder);
         builder.setNegativeButton(null, null);
     }
+
+    @Override
+    public boolean isEnabled() {
+        return true;
+    }
 }
diff --git a/src/com/android/contacts/preference/PhoneticNameDisplayPreference.java b/src/com/android/contacts/preference/PhoneticNameDisplayPreference.java
index 42bbcc3ec0..ebe4932d96 100644
--- a/src/com/android/contacts/preference/PhoneticNameDisplayPreference.java
+++ b/src/com/android/contacts/preference/PhoneticNameDisplayPreference.java
@@ -90,4 +90,9 @@ public final class PhoneticNameDisplayPreference extends ListPreference {
         super.onPrepareDialogBuilder(builder);
         builder.setNegativeButton(null, null);
     }
+
+    @Override
+    public boolean isEnabled() {
+        return true;
+    }
 }
diff --git a/src/com/android/contacts/preference/SortOrderPreference.java b/src/com/android/contacts/preference/SortOrderPreference.java
index 387023112b..5909a9c844 100644
--- a/src/com/android/contacts/preference/SortOrderPreference.java
+++ b/src/com/android/contacts/preference/SortOrderPreference.java
@@ -87,4 +87,9 @@ public final class SortOrderPreference extends ListPreference {
         super.onPrepareDialogBuilder(builder);
         builder.setNegativeButton(null, null);
     }
+
+    @Override
+    public boolean isEnabled() {
+        return true;
+    }
 }
-- 
GitLab


From f5efca84daf75e21572474e843380cdf379e4560 Mon Sep 17 00:00:00 2001
From: Fahim <fahim.cse11@gmail.com>
Date: Mon, 9 Aug 2021 23:11:21 +0600
Subject: [PATCH 5/8] Fix preference issue

---
 .../contacts/preference/CustomPreference.java    | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/com/android/contacts/preference/CustomPreference.java b/src/com/android/contacts/preference/CustomPreference.java
index 1d9376259c..b9a4f688c5 100644
--- a/src/com/android/contacts/preference/CustomPreference.java
+++ b/src/com/android/contacts/preference/CustomPreference.java
@@ -3,6 +3,9 @@ package com.android.contacts.preference;
 import android.content.Context;
 import android.preference.Preference;
 import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
 
 public class CustomPreference extends Preference {
     public CustomPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
@@ -25,4 +28,17 @@ public class CustomPreference extends Preference {
     public boolean isEnabled() {
         return true;
     }
+
+    @Override
+    public View getView(View convertView, ViewGroup parent) {
+        View view = super.getView(convertView, parent);
+        view.setOnClickListener(v -> {
+            if (getOnPreferenceClickListener() == null) {
+                Toast.makeText(v.getContext(), "null click listener", Toast.LENGTH_SHORT).show();
+                return;
+            }
+            getOnPreferenceClickListener().onPreferenceClick(this);
+        });
+        return view;
+    }
 }
-- 
GitLab


From cfe81c50876b62da95a19a0f326597d27554f324 Mon Sep 17 00:00:00 2001
From: Fahim <fahim.cse11@gmail.com>
Date: Mon, 9 Aug 2021 23:29:56 +0600
Subject: [PATCH 6/8] Fix preference issue

---
 res/xml/preference_about.xml                  | 32 +++++++++----------
 .../contacts/preference/CustomPreference.java |  6 ++--
 .../preference/DefaultAccountPreference.java  | 12 +++++++
 .../preference/DisplayOrderPreference.java    | 13 ++++++++
 .../PhoneticNameDisplayPreference.java        | 13 ++++++++
 .../preference/SortOrderPreference.java       | 13 ++++++++
 6 files changed, 69 insertions(+), 20 deletions(-)

diff --git a/res/xml/preference_about.xml b/res/xml/preference_about.xml
index a9338625d5..fff936a54a 100644
--- a/res/xml/preference_about.xml
+++ b/res/xml/preference_about.xml
@@ -17,7 +17,7 @@
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android" >
     
-    <Preference
+    <com.android.contacts.preference.CustomPreference
         android:shouldDisableView="true"
         android:enabled="true"
         android:iconSpaceReserved="false"
@@ -28,7 +28,7 @@
         android:summary="@string/preferences_app_info"
         android:title="@string/preferences_app_info_title" />
 
-    <Preference
+    <com.android.contacts.preference.CustomPreference
         android:shouldDisableView="true"
         android:enabled="true"
         android:iconSpaceReserved="false"
@@ -42,9 +42,9 @@
             android:action="android.intent.action.VIEW"
 	    android:data="https://gitlab.e.foundation/e/os/android_packages_apps_Contacts/-/releases" />
 
-    </Preference>
+    </com.android.contacts.preference.CustomPreference>
 
-    <Preference
+    <com.android.contacts.preference.CustomPreference
         android:shouldDisableView="true"
         android:enabled="true"
         android:iconSpaceReserved="false"
@@ -58,9 +58,9 @@
             android:action="android.intent.action.VIEW"
             android:data="https://github.com/LineageOS/android_packages_apps_Contacts" />
 
-    </Preference>
+    </com.android.contacts.preference.CustomPreference>
 
-    <Preference
+    <com.android.contacts.preference.CustomPreference
         android:shouldDisableView="true"
         android:enabled="true"
         android:iconSpaceReserved="false"
@@ -71,9 +71,9 @@
         <intent
             android:action="android.intent.action.VIEW"
             android:data="https://gitlab.e.foundation/e/os/android_packages_apps_Contacts/-/blob/v1-oreo/NOTICE" />
-    </Preference>
+    </com.android.contacts.preference.CustomPreference>
 
-    <Preference
+    <com.android.contacts.preference.CustomPreference
         android:shouldDisableView="true"
         android:enabled="true"
         android:iconSpaceReserved="false"
@@ -84,9 +84,9 @@
         <intent
             android:action="android.intent.action.VIEW"
             android:data="https://gitlab.e.foundation/e/os/android_packages_apps_Contacts" />
-    </Preference>
+    </com.android.contacts.preference.CustomPreference>
 
-    <Preference
+    <com.android.contacts.preference.CustomPreference
         android:shouldDisableView="true"
         android:enabled="true"
         android:iconSpaceReserved="false"
@@ -97,9 +97,9 @@
         <intent
             android:action="android.intent.action.VIEW"
             android:data="https://gitlab.e.foundation/e/os/android_packages_apps_Contacts" />
-    </Preference>
+    </com.android.contacts.preference.CustomPreference>
 
-    <Preference
+    <com.android.contacts.preference.CustomPreference
         android:shouldDisableView="true"
         android:enabled="true"
         android:iconSpaceReserved="false"
@@ -110,7 +110,7 @@
         android:title="@string/about_open_source_licenses"
         android:summary="@string/about_open_source_licenses_summary"/>
 
-    <Preference
+    <com.android.contacts.preference.CustomPreference
         android:shouldDisableView="true"
         android:enabled="true"
         android:iconSpaceReserved="false"
@@ -119,9 +119,9 @@
         android:icon="@null"
         android:key="@string/pref_privacy_policy_key"
         android:title="@string/about_privacy_policy">
-    </Preference>
+    </com.android.contacts.preference.CustomPreference>
 
-    <Preference
+    <com.android.contacts.preference.CustomPreference
         android:shouldDisableView="true"
         android:enabled="true"
         android:iconSpaceReserved="false"
@@ -130,5 +130,5 @@
         android:icon="@null"
         android:key="@string/pref_terms_of_service_key"
         android:title="@string/about_terms_of_service">
-    </Preference>
+    </com.android.contacts.preference.CustomPreference>
 </PreferenceScreen>
diff --git a/src/com/android/contacts/preference/CustomPreference.java b/src/com/android/contacts/preference/CustomPreference.java
index b9a4f688c5..5e7add59c2 100644
--- a/src/com/android/contacts/preference/CustomPreference.java
+++ b/src/com/android/contacts/preference/CustomPreference.java
@@ -33,11 +33,9 @@ public class CustomPreference extends Preference {
     public View getView(View convertView, ViewGroup parent) {
         View view = super.getView(convertView, parent);
         view.setOnClickListener(v -> {
-            if (getOnPreferenceClickListener() == null) {
-                Toast.makeText(v.getContext(), "null click listener", Toast.LENGTH_SHORT).show();
-                return;
+            if (getOnPreferenceClickListener() != null) {
+                getOnPreferenceClickListener().onPreferenceClick(this);
             }
-            getOnPreferenceClickListener().onPreferenceClick(this);
         });
         return view;
     }
diff --git a/src/com/android/contacts/preference/DefaultAccountPreference.java b/src/com/android/contacts/preference/DefaultAccountPreference.java
index 1f983bf620..517a0ab794 100644
--- a/src/com/android/contacts/preference/DefaultAccountPreference.java
+++ b/src/com/android/contacts/preference/DefaultAccountPreference.java
@@ -22,6 +22,7 @@ import android.content.DialogInterface;
 import android.preference.DialogPreference;
 import android.util.AttributeSet;
 import android.view.View;
+import android.view.ViewGroup;
 
 import com.android.contacts.model.account.AccountInfo;
 import com.android.contacts.model.account.AccountWithDataSet;
@@ -114,4 +115,15 @@ public class DefaultAccountPreference extends DialogPreference {
     public boolean isEnabled() {
         return true;
     }
+
+    @Override
+    public View getView(View convertView, ViewGroup parent) {
+        View view = super.getView(convertView, parent);
+        view.setOnClickListener(v -> {
+            if (getOnPreferenceClickListener() != null) {
+                getOnPreferenceClickListener().onPreferenceClick(this);
+            }
+        });
+        return view;
+    }
 }
diff --git a/src/com/android/contacts/preference/DisplayOrderPreference.java b/src/com/android/contacts/preference/DisplayOrderPreference.java
index 1122d7bb88..7b3435fc64 100644
--- a/src/com/android/contacts/preference/DisplayOrderPreference.java
+++ b/src/com/android/contacts/preference/DisplayOrderPreference.java
@@ -20,6 +20,8 @@ import android.app.AlertDialog.Builder;
 import android.content.Context;
 import android.preference.ListPreference;
 import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
 
 import com.android.contacts.R;
 
@@ -92,4 +94,15 @@ public final class DisplayOrderPreference extends ListPreference {
     public boolean isEnabled() {
         return true;
     }
+
+    @Override
+    public View getView(View convertView, ViewGroup parent) {
+        View view = super.getView(convertView, parent);
+        view.setOnClickListener(v -> {
+            if (getOnPreferenceClickListener() != null) {
+                getOnPreferenceClickListener().onPreferenceClick(this);
+            }
+        });
+        return view;
+    }
 }
diff --git a/src/com/android/contacts/preference/PhoneticNameDisplayPreference.java b/src/com/android/contacts/preference/PhoneticNameDisplayPreference.java
index ebe4932d96..5b7163d3d2 100644
--- a/src/com/android/contacts/preference/PhoneticNameDisplayPreference.java
+++ b/src/com/android/contacts/preference/PhoneticNameDisplayPreference.java
@@ -20,6 +20,8 @@ import android.app.AlertDialog.Builder;
 import android.content.Context;
 import android.preference.ListPreference;
 import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
 
 import com.android.contacts.R;
 
@@ -95,4 +97,15 @@ public final class PhoneticNameDisplayPreference extends ListPreference {
     public boolean isEnabled() {
         return true;
     }
+
+    @Override
+    public View getView(View convertView, ViewGroup parent) {
+        View view = super.getView(convertView, parent);
+        view.setOnClickListener(v -> {
+            if (getOnPreferenceClickListener() != null) {
+                getOnPreferenceClickListener().onPreferenceClick(this);
+            }
+        });
+        return view;
+    }
 }
diff --git a/src/com/android/contacts/preference/SortOrderPreference.java b/src/com/android/contacts/preference/SortOrderPreference.java
index 5909a9c844..8b812c5a04 100644
--- a/src/com/android/contacts/preference/SortOrderPreference.java
+++ b/src/com/android/contacts/preference/SortOrderPreference.java
@@ -20,6 +20,8 @@ import android.app.AlertDialog.Builder;
 import android.content.Context;
 import android.preference.ListPreference;
 import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
 
 import com.android.contacts.R;
 
@@ -92,4 +94,15 @@ public final class SortOrderPreference extends ListPreference {
     public boolean isEnabled() {
         return true;
     }
+
+    @Override
+    public View getView(View convertView, ViewGroup parent) {
+        View view = super.getView(convertView, parent);
+        view.setOnClickListener(v -> {
+            if (getOnPreferenceClickListener() != null) {
+                getOnPreferenceClickListener().onPreferenceClick(this);
+            }
+        });
+        return view;
+    }
 }
-- 
GitLab


From bd8e7d80d98df198b5df6f924e662f59960aed81 Mon Sep 17 00:00:00 2001
From: Fahim <fahim.cse11@gmail.com>
Date: Tue, 10 Aug 2021 01:16:46 +0600
Subject: [PATCH 7/8] Fix attribute missing issue

---
 res/xml/preference_about.xml                  | 22 +------
 .../preference/AboutPreferenceFragment.java   | 62 +++++++++++++------
 .../contacts/preference/CustomPreference.java |  1 -
 .../preference/DefaultAccountPreference.java  |  6 +-
 .../preference/DisplayOrderPreference.java    |  6 +-
 .../PhoneticNameDisplayPreference.java        |  6 +-
 .../preference/SortOrderPreference.java       |  6 +-
 7 files changed, 49 insertions(+), 60 deletions(-)

diff --git a/res/xml/preference_about.xml b/res/xml/preference_about.xml
index fff936a54a..e86bac1683 100644
--- a/res/xml/preference_about.xml
+++ b/res/xml/preference_about.xml
@@ -37,11 +37,6 @@
         android:icon="@null"
         android:key="@string/pref_build_version_key"
         android:title="@string/about_build_version">
-	    
-        <intent
-            android:action="android.intent.action.VIEW"
-	    android:data="https://gitlab.e.foundation/e/os/android_packages_apps_Contacts/-/releases" />
-
     </com.android.contacts.preference.CustomPreference>
 
     <com.android.contacts.preference.CustomPreference
@@ -53,11 +48,6 @@
 	    android:icon="@null"
         android:key="about_app"
         android:title="@string/preferences_about_app">
-
-        <intent
-            android:action="android.intent.action.VIEW"
-            android:data="https://github.com/LineageOS/android_packages_apps_Contacts" />
-
     </com.android.contacts.preference.CustomPreference>
 
     <com.android.contacts.preference.CustomPreference
@@ -67,10 +57,8 @@
         android:selectable="true"
         android:layout="@layout/custom_pref_layout"
         android:icon="@null"
+        android:key="license"
         android:title="@string/preferences_licence" >
-        <intent
-            android:action="android.intent.action.VIEW"
-            android:data="https://gitlab.e.foundation/e/os/android_packages_apps_Contacts/-/blob/v1-oreo/NOTICE" />
     </com.android.contacts.preference.CustomPreference>
 
     <com.android.contacts.preference.CustomPreference
@@ -80,10 +68,8 @@
         android:selectable="true"
         android:layout="@layout/custom_pref_layout"
         android:icon="@null"
+        android:key="authors"
         android:title="@string/preferences_authors">
-        <intent
-            android:action="android.intent.action.VIEW"
-            android:data="https://gitlab.e.foundation/e/os/android_packages_apps_Contacts" />
     </com.android.contacts.preference.CustomPreference>
 
     <com.android.contacts.preference.CustomPreference
@@ -93,10 +79,8 @@
         android:selectable="true"
         android:layout="@layout/custom_pref_layout"
         android:icon="@null"
+        android:key="source_code"
         android:title="@string/preferences_source_code">
-        <intent
-            android:action="android.intent.action.VIEW"
-            android:data="https://gitlab.e.foundation/e/os/android_packages_apps_Contacts" />
     </com.android.contacts.preference.CustomPreference>
 
     <com.android.contacts.preference.CustomPreference
diff --git a/src/com/android/contacts/preference/AboutPreferenceFragment.java b/src/com/android/contacts/preference/AboutPreferenceFragment.java
index 62dcd76259..1c9fc0ca82 100644
--- a/src/com/android/contacts/preference/AboutPreferenceFragment.java
+++ b/src/com/android/contacts/preference/AboutPreferenceFragment.java
@@ -35,6 +35,11 @@ import com.android.contacts.activities.LicenseActivity;
  */
 public class AboutPreferenceFragment extends PreferenceFragment {
 
+    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-oreo/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/";
 
@@ -60,31 +65,48 @@ 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() {
-            @Override
-            public boolean onPreferenceClick(Preference preference) {
-                try {
-                    if (preference == privacyPolicyPreference) {
-                        startActivityForUrl(PRIVACY_POLICY_URL);
-                    } else if (preference == termsOfServicePreference) {
-                        startActivityForUrl(TERMS_OF_SERVICE_URL);
+                preference -> {
+                    try {
+                        if (preference == privacyPolicyPreference) {
+                            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),
+                                Toast.LENGTH_SHORT).show();
                     }
-                } catch (ActivityNotFoundException ex) {
-                    Toast.makeText(getContext(), getString(R.string.url_open_error_toast),
-                            Toast.LENGTH_SHORT).show();
-                }
-                return true;
-            }
-        };
-
+                    return true;
+                };
+
+        buildVersionPreference.setOnPreferenceClickListener(listener);
+        aboutAppPreference.setOnPreferenceClickListener(listener);
+        licensePreference.setOnPreferenceClickListener(listener);
+        authorsPreference.setOnPreferenceClickListener(listener);
+        sourceCodePreference.setOnPreferenceClickListener(listener);
+        openSourceLicensePreference.setOnPreferenceClickListener(listener);
         privacyPolicyPreference.setOnPreferenceClickListener(listener);
         termsOfServicePreference.setOnPreferenceClickListener(listener);
     }
diff --git a/src/com/android/contacts/preference/CustomPreference.java b/src/com/android/contacts/preference/CustomPreference.java
index 5e7add59c2..9727ac5e87 100644
--- a/src/com/android/contacts/preference/CustomPreference.java
+++ b/src/com/android/contacts/preference/CustomPreference.java
@@ -5,7 +5,6 @@ import android.preference.Preference;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Toast;
 
 public class CustomPreference extends Preference {
     public CustomPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
diff --git a/src/com/android/contacts/preference/DefaultAccountPreference.java b/src/com/android/contacts/preference/DefaultAccountPreference.java
index 517a0ab794..4160be27a2 100644
--- a/src/com/android/contacts/preference/DefaultAccountPreference.java
+++ b/src/com/android/contacts/preference/DefaultAccountPreference.java
@@ -119,11 +119,7 @@ public class DefaultAccountPreference extends DialogPreference {
     @Override
     public View getView(View convertView, ViewGroup parent) {
         View view = super.getView(convertView, parent);
-        view.setOnClickListener(v -> {
-            if (getOnPreferenceClickListener() != null) {
-                getOnPreferenceClickListener().onPreferenceClick(this);
-            }
-        });
+        view.setOnClickListener(v -> showDialog(null));
         return view;
     }
 }
diff --git a/src/com/android/contacts/preference/DisplayOrderPreference.java b/src/com/android/contacts/preference/DisplayOrderPreference.java
index 7b3435fc64..517793c1ba 100644
--- a/src/com/android/contacts/preference/DisplayOrderPreference.java
+++ b/src/com/android/contacts/preference/DisplayOrderPreference.java
@@ -98,11 +98,7 @@ public final class DisplayOrderPreference extends ListPreference {
     @Override
     public View getView(View convertView, ViewGroup parent) {
         View view = super.getView(convertView, parent);
-        view.setOnClickListener(v -> {
-            if (getOnPreferenceClickListener() != null) {
-                getOnPreferenceClickListener().onPreferenceClick(this);
-            }
-        });
+        view.setOnClickListener(v -> showDialog(null));
         return view;
     }
 }
diff --git a/src/com/android/contacts/preference/PhoneticNameDisplayPreference.java b/src/com/android/contacts/preference/PhoneticNameDisplayPreference.java
index 5b7163d3d2..ab7a3d9d48 100644
--- a/src/com/android/contacts/preference/PhoneticNameDisplayPreference.java
+++ b/src/com/android/contacts/preference/PhoneticNameDisplayPreference.java
@@ -101,11 +101,7 @@ public final class PhoneticNameDisplayPreference extends ListPreference {
     @Override
     public View getView(View convertView, ViewGroup parent) {
         View view = super.getView(convertView, parent);
-        view.setOnClickListener(v -> {
-            if (getOnPreferenceClickListener() != null) {
-                getOnPreferenceClickListener().onPreferenceClick(this);
-            }
-        });
+        view.setOnClickListener(v -> showDialog(null));
         return view;
     }
 }
diff --git a/src/com/android/contacts/preference/SortOrderPreference.java b/src/com/android/contacts/preference/SortOrderPreference.java
index 8b812c5a04..a6a252f459 100644
--- a/src/com/android/contacts/preference/SortOrderPreference.java
+++ b/src/com/android/contacts/preference/SortOrderPreference.java
@@ -98,11 +98,7 @@ public final class SortOrderPreference extends ListPreference {
     @Override
     public View getView(View convertView, ViewGroup parent) {
         View view = super.getView(convertView, parent);
-        view.setOnClickListener(v -> {
-            if (getOnPreferenceClickListener() != null) {
-                getOnPreferenceClickListener().onPreferenceClick(this);
-            }
-        });
+        view.setOnClickListener(v -> showDialog(null));
         return view;
     }
 }
-- 
GitLab


From 10c35a12bbc611f73501ea83bdd311dd678c1399 Mon Sep 17 00:00:00 2001
From: Fahim <fahim.cse11@gmail.com>
Date: Tue, 10 Aug 2021 01:50:03 +0600
Subject: [PATCH 8/8] Fix licensePage actionBar issue

---
 src/com/android/contacts/activities/LicenseActivity.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/com/android/contacts/activities/LicenseActivity.java b/src/com/android/contacts/activities/LicenseActivity.java
index 9d21a05dde..4ab02ec0ee 100644
--- a/src/com/android/contacts/activities/LicenseActivity.java
+++ b/src/com/android/contacts/activities/LicenseActivity.java
@@ -24,6 +24,7 @@ import android.view.MenuItem;
 import android.view.View;
 import android.webkit.WebView;
 import android.content.res.Configuration;
+import android.widget.TextView;
 
 import androidx.webkit.WebViewFeature;
 import androidx.webkit.WebSettingsCompat;
@@ -49,6 +50,11 @@ public class LicenseActivity extends AppCompatActivity {
         if (actionBar != null) {
             actionBar.setBackgroundDrawable(new ColorDrawable(getColor(R.color.primary_color_dark)));
             actionBar.setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP, ActionBar.DISPLAY_HOME_AS_UP);
+            actionBar.setDisplayShowCustomEnabled(true);
+            actionBar.setDisplayShowTitleEnabled(false);
+            actionBar.setCustomView(R.layout.custom_settings_toolbar);
+            TextView titleTextView = actionBar.getCustomView().findViewById(R.id.title);
+            titleTextView.setText(R.string.activity_title_licenses);
         }
         handleDayNightMode(mWebView);
     }
-- 
GitLab