From 337cda3be501cfd026df6b7a3bfa04fae2abbfe1 Mon Sep 17 00:00:00 2001
From: Fahim <fahim.cse11@gmail.com>
Date: Fri, 15 Oct 2021 11:38:30 +0600
Subject: [PATCH 1/4] 3943-P-alertDialog_background_color_issue

issue: https://gitlab.e.foundation/e/backlog/-/issues/3943
---
 res/values/colors.xml | 2 +-
 res/values/styles.xml | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/res/values/colors.xml b/res/values/colors.xml
index 12defa5a9e..f4f87d9686 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -260,7 +260,7 @@
     <color name="drawer_divider_color">@color/divider_line_color_light</color>
 
     <!-- Background color for the navigation drawer -->
-    <color name="navigation_drawer_background_color">@color/primary_color_dark</color>
+    <color name="navigation_drawer_background_color">@color/color_default_foreground</color>
 
     <!-- Background color for the current selected item in the navigation drawer -->
     <color name="drawer_selected_color">@color/selection_color</color>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index de524f5829..4e382d67f4 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -361,7 +361,9 @@
 
     <style name="NonPhoneActivityTheme" parent="@android:Theme.Translucent.NoTitleBar"></style>
 
-    <style name="NonPhoneDialogTheme" parent="@android:Theme.Material.Light.Dialog"></style>
+    <style name="NonPhoneDialogTheme" parent="@android:Theme.Material.Light.Dialog">
+        <item name="android:background">@color/color_default_foreground</item>
+    </style>
 
     <style name="ConfirmAddDetailDialogTheme" parent="@android:style/Theme.Material.Light.Dialog.MinWidth">
         <item name="android:windowCloseOnTouchOutside">true</item>
@@ -416,7 +418,7 @@
         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/accent</item>
-        <item name="android:background">@color/color_default_background</item>
+        <item name="android:background">@color/color_default_foreground</item>
         <item name="android:textColorPrimary">@color/color_default_primary_text</item>
         <item name="android:textColorSecondary">@color/color_default_secondary_text</item>
         <item name="android:colorPrimary">@color/primary_color</item>
@@ -428,7 +430,7 @@
     <style name="ContactsAlertDialogThemeAppCompat" parent="Theme.AppCompat.Light.Dialog.MinWidth">
         <item name="android:colorAccent">@color/accent</item>
         <item name="colorAccent">@color/accent</item>
-        <item name="android:background">@color/color_default_background</item>
+        <item name="android:background">@color/color_default_foreground</item>
         <item name="android:textColorPrimary">@color/color_default_primary_text</item>
         <item name="android:textColorSecondary">@color/color_default_secondary_text</item>
         <item name="android:colorPrimary">@color/primary_color</item>
-- 
GitLab


From 540225c2f315cffc1cba1afa2cfc72936aa705b5 Mon Sep 17 00:00:00 2001
From: Fahim <fahim.cse11@gmail.com>
Date: Tue, 19 Oct 2021 21:42:04 +0600
Subject: [PATCH 2/4] Fix account icon colors

---
 src/com/android/contacts/model/account/AccountType.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/com/android/contacts/model/account/AccountType.java b/src/com/android/contacts/model/account/AccountType.java
index dd351f2ef2..b244f8daeb 100644
--- a/src/com/android/contacts/model/account/AccountType.java
+++ b/src/com/android/contacts/model/account/AccountType.java
@@ -276,10 +276,7 @@ public abstract class AccountType {
     }
 
     public Drawable getDisplayIcon(Context context) {
-        Drawable icon = getDisplayIcon(context, titleRes, iconRes, syncAdapterPackageName);
-        icon.mutate().setColorFilter(ContextCompat.getColor(context, R.color.accent),
-                PorterDuff.Mode.MULTIPLY);
-        return icon;
+        return getDisplayIcon(context, titleRes, iconRes, syncAdapterPackageName);
     }
 
     public static Drawable getDisplayIcon(Context context, int titleRes, int iconRes,
-- 
GitLab


From 88634acb291074f904f2643f9144f1505197900a Mon Sep 17 00:00:00 2001
From: Fahim <fahim.cse11@gmail.com>
Date: Tue, 19 Oct 2021 22:10:48 +0600
Subject: [PATCH 3/4] Add dialog style to all alertDialogs

---
 .../activities/ContactEditorAccountsChangedActivity.java      | 2 +-
 src/com/android/contacts/activities/ShowOrCreateActivity.java | 2 +-
 src/com/android/contacts/dialog/ClearFrequentsDialog.java     | 2 +-
 src/com/android/contacts/editor/CancelEditDialogFragment.java | 2 +-
 .../editor/JoinContactConfirmationDialogFragment.java         | 2 +-
 src/com/android/contacts/editor/LabeledEditorView.java        | 2 +-
 .../android/contacts/editor/PickRawContactDialogFragment.java | 2 +-
 .../android/contacts/editor/SelectAccountDialogFragment.java  | 2 +-
 .../editor/SplitContactConfirmationDialogFragment.java        | 2 +-
 .../editor/SuggestionEditConfirmationDialogFragment.java      | 2 +-
 .../contacts/interactions/ContactDeletionInteraction.java     | 2 +-
 .../interactions/ContactMultiDeletionInteraction.java         | 2 +-
 .../android/contacts/interactions/ExportDialogFragment.java   | 2 +-
 .../contacts/interactions/GroupDeletionDialogFragment.java    | 2 +-
 .../contacts/list/CustomContactListFilterActivity.java        | 2 +-
 .../android/contacts/list/EnableGlobalSyncDialogFragment.java | 2 +-
 src/com/android/contacts/util/AccountSelectionUtil.java       | 2 +-
 src/com/android/contacts/vcard/CancelActivity.java            | 4 ++--
 src/com/android/contacts/vcard/ExportVCardActivity.java       | 2 +-
 src/com/android/contacts/vcard/ImportVCardActivity.java       | 2 +-
 src/com/android/contacts/vcard/ImportVCardDialogFragment.java | 2 +-
 .../contacts/widget/SelectPhoneAccountDialogFragment.java     | 2 +-
 22 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java b/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java
index dea134b5f5..f0117eeabe 100644
--- a/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java
+++ b/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java
@@ -203,7 +203,7 @@ public class ContactEditorAccountsChangedActivity extends Activity
         if (mDialog != null && mDialog.isShowing()) {
             mDialog.dismiss();
         }
-        mDialog = new AlertDialog.Builder(this)
+        mDialog = new AlertDialog.Builder(this, R.style.ContactsAlertDialogTheme)
                 .setView(view)
                 .setOnCancelListener(new DialogInterface.OnCancelListener() {
                     @Override
diff --git a/src/com/android/contacts/activities/ShowOrCreateActivity.java b/src/com/android/contacts/activities/ShowOrCreateActivity.java
index 8c943640e0..634dd589c6 100755
--- a/src/com/android/contacts/activities/ShowOrCreateActivity.java
+++ b/src/com/android/contacts/activities/ShowOrCreateActivity.java
@@ -219,7 +219,7 @@ public final class ShowOrCreateActivity extends ContactsActivity
                 final CharSequence message = getResources().getString(
                         R.string.add_contact_dlg_message_fmt, mCreateDescrip);
 
-                return new AlertDialog.Builder(this)
+                return new AlertDialog.Builder(this, R.style.ContactsAlertDialogTheme)
                         .setMessage(message)
                         .setPositiveButton(android.R.string.ok,
                                 new IntentClickListener(this, createIntent))
diff --git a/src/com/android/contacts/dialog/ClearFrequentsDialog.java b/src/com/android/contacts/dialog/ClearFrequentsDialog.java
index 7591de3ff7..bf012e067f 100644
--- a/src/com/android/contacts/dialog/ClearFrequentsDialog.java
+++ b/src/com/android/contacts/dialog/ClearFrequentsDialog.java
@@ -70,7 +70,7 @@ public class ClearFrequentsDialog extends DialogFragment {
                 task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
             }
         };
-        return new AlertDialog.Builder(getActivity())
+        return new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme)
             .setTitle(R.string.clearFrequentsConfirmation_title)
             .setMessage(R.string.clearFrequentsConfirmation)
             .setNegativeButton(android.R.string.cancel, null)
diff --git a/src/com/android/contacts/editor/CancelEditDialogFragment.java b/src/com/android/contacts/editor/CancelEditDialogFragment.java
index 48cedff868..b974a6a9a2 100644
--- a/src/com/android/contacts/editor/CancelEditDialogFragment.java
+++ b/src/com/android/contacts/editor/CancelEditDialogFragment.java
@@ -43,7 +43,7 @@ public class CancelEditDialogFragment extends DialogFragment {
 
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        return new AlertDialog.Builder(getActivity())
+        return new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme)
                 .setIconAttribute(android.R.attr.alertDialogIcon)
                 .setMessage(R.string.cancel_confirmation_dialog_message)
                 .setPositiveButton(R.string.cancel_confirmation_dialog_cancel_editing_button,
diff --git a/src/com/android/contacts/editor/JoinContactConfirmationDialogFragment.java b/src/com/android/contacts/editor/JoinContactConfirmationDialogFragment.java
index d238c384c5..3a7bc8907b 100644
--- a/src/com/android/contacts/editor/JoinContactConfirmationDialogFragment.java
+++ b/src/com/android/contacts/editor/JoinContactConfirmationDialogFragment.java
@@ -69,7 +69,7 @@ public class JoinContactConfirmationDialogFragment extends DialogFragment {
 
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme);
         builder.setMessage(R.string.joinConfirmation);
         builder.setPositiveButton(R.string.joinConfirmation_positive_button,
                 new DialogInterface.OnClickListener() {
diff --git a/src/com/android/contacts/editor/LabeledEditorView.java b/src/com/android/contacts/editor/LabeledEditorView.java
index df4c5f9924..00e5187dc1 100644
--- a/src/com/android/contacts/editor/LabeledEditorView.java
+++ b/src/com/android/contacts/editor/LabeledEditorView.java
@@ -439,7 +439,7 @@ public abstract class LabeledEditorView extends LinearLayout implements Editor,
      * no empty text is allowed in any custom label.
      */
     private Dialog createCustomDialog() {
-        final AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+        final AlertDialog.Builder builder = new AlertDialog.Builder(getContext(), R.style.ContactsAlertDialogTheme);
         final LayoutInflater layoutInflater = LayoutInflater.from(builder.getContext());
         builder.setTitle(R.string.customLabelPickerTitle);
 
diff --git a/src/com/android/contacts/editor/PickRawContactDialogFragment.java b/src/com/android/contacts/editor/PickRawContactDialogFragment.java
index 5a9c9fd07f..2efd6fbc94 100644
--- a/src/com/android/contacts/editor/PickRawContactDialogFragment.java
+++ b/src/com/android/contacts/editor/PickRawContactDialogFragment.java
@@ -176,7 +176,7 @@ public class PickRawContactDialogFragment extends DialogFragment {
             throw new IllegalArgumentException("Dialog created with null RawContactsMetadata");
         }
 
-        final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme);
         mAdapter = new RawContactAccountListAdapter(getContext(), metadata);
         if (metadata.showReadOnly) {
             builder.setTitle(R.string.contact_editor_pick_linked_contact_dialog_title);
diff --git a/src/com/android/contacts/editor/SelectAccountDialogFragment.java b/src/com/android/contacts/editor/SelectAccountDialogFragment.java
index 3b41c86ade..71e2b6aab0 100644
--- a/src/com/android/contacts/editor/SelectAccountDialogFragment.java
+++ b/src/com/android/contacts/editor/SelectAccountDialogFragment.java
@@ -90,7 +90,7 @@ public final class SelectAccountDialogFragment extends DialogFragment
 
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme);
         final Bundle args = getArguments();
 
         mAccountsAdapter = new AccountsListAdapter(builder.getContext());
diff --git a/src/com/android/contacts/editor/SplitContactConfirmationDialogFragment.java b/src/com/android/contacts/editor/SplitContactConfirmationDialogFragment.java
index 9b4e2348cc..6bda7f1de4 100644
--- a/src/com/android/contacts/editor/SplitContactConfirmationDialogFragment.java
+++ b/src/com/android/contacts/editor/SplitContactConfirmationDialogFragment.java
@@ -77,7 +77,7 @@ public class SplitContactConfirmationDialogFragment extends DialogFragment {
 
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme);
         builder.setMessage(mHasPendingChanges
                 ? R.string.splitConfirmationWithPendingChanges
                 : R.string.splitConfirmation);
diff --git a/src/com/android/contacts/editor/SuggestionEditConfirmationDialogFragment.java b/src/com/android/contacts/editor/SuggestionEditConfirmationDialogFragment.java
index 487a5eee93..b218aef170 100644
--- a/src/com/android/contacts/editor/SuggestionEditConfirmationDialogFragment.java
+++ b/src/com/android/contacts/editor/SuggestionEditConfirmationDialogFragment.java
@@ -44,7 +44,7 @@ public class SuggestionEditConfirmationDialogFragment extends DialogFragment {
 
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        return new AlertDialog.Builder(getActivity())
+        return new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme)
                 .setIconAttribute(android.R.attr.alertDialogIcon)
                 .setMessage(R.string.aggregation_suggestion_edit_dialog_message)
                 .setPositiveButton(android.R.string.yes,
diff --git a/src/com/android/contacts/interactions/ContactDeletionInteraction.java b/src/com/android/contacts/interactions/ContactDeletionInteraction.java
index 240588bd17..5a8b0543bb 100644
--- a/src/com/android/contacts/interactions/ContactDeletionInteraction.java
+++ b/src/com/android/contacts/interactions/ContactDeletionInteraction.java
@@ -302,7 +302,7 @@ public class ContactDeletionInteraction extends Fragment
     }
 
     private void showDialog(int messageId, int positiveButtonId, final Uri contactUri) {
-        mDialog = new AlertDialog.Builder(getActivity())
+        mDialog = new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme)
                 .setIconAttribute(android.R.attr.alertDialogIcon)
                 .setMessage(messageId)
                 .setNegativeButton(android.R.string.cancel, null)
diff --git a/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java b/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java
index c5696732bc..807bb1b4b4 100644
--- a/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java
+++ b/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java
@@ -271,7 +271,7 @@ public class ContactMultiDeletionInteraction extends Fragment
 
     private void showDialog(int messageId, int positiveButtonId, final long[] contactIds,
             final String[] namesArray) {
-        mDialog = new AlertDialog.Builder(getActivity())
+        mDialog = new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme)
                 .setIconAttribute(android.R.attr.alertDialogIcon)
                 .setMessage(messageId)
                 .setNegativeButton(android.R.string.cancel, null)
diff --git a/src/com/android/contacts/interactions/ExportDialogFragment.java b/src/com/android/contacts/interactions/ExportDialogFragment.java
index c9b469c473..104b984426 100644
--- a/src/com/android/contacts/interactions/ExportDialogFragment.java
+++ b/src/com/android/contacts/interactions/ExportDialogFragment.java
@@ -160,7 +160,7 @@ public class ExportDialogFragment extends DialogFragment {
                 }
             }
         };
-        return new AlertDialog.Builder(getActivity())
+        return new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme)
                 .setTitle(R.string.dialog_export)
                 .setSingleChoiceItems(adapter, -1, clickListener)
                 .create();
diff --git a/src/com/android/contacts/interactions/GroupDeletionDialogFragment.java b/src/com/android/contacts/interactions/GroupDeletionDialogFragment.java
index 01361b2a37..c686da5872 100644
--- a/src/com/android/contacts/interactions/GroupDeletionDialogFragment.java
+++ b/src/com/android/contacts/interactions/GroupDeletionDialogFragment.java
@@ -48,7 +48,7 @@ public class GroupDeletionDialogFragment extends DialogFragment {
         String label = getArguments().getString(ARG_LABEL);
         String message = getActivity().getString(R.string.delete_group_dialog_message, label);
 
-        return new AlertDialog.Builder(getActivity())
+        return new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme)
                 .setIconAttribute(android.R.attr.alertDialogIcon)
                 .setMessage(message)
                 .setPositiveButton(android.R.string.ok,
diff --git a/src/com/android/contacts/list/CustomContactListFilterActivity.java b/src/com/android/contacts/list/CustomContactListFilterActivity.java
index 15e9527023..69f1685ffa 100644
--- a/src/com/android/contacts/list/CustomContactListFilterActivity.java
+++ b/src/com/android/contacts/list/CustomContactListFilterActivity.java
@@ -808,7 +808,7 @@ public class CustomContactListFilterActivity extends Activity implements
         if (syncMode == SYNC_MODE_EVERYTHING && shouldSyncUngrouped
                 && !child.equals(account.mUngrouped)) {
             // Warn before removing this group when it would cause ungrouped to stop syncing
-            final AlertDialog.Builder builder = new AlertDialog.Builder(this);
+            final AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.ContactsAlertDialogTheme);
             final CharSequence removeMessage = this.getString(
                     R.string.display_warn_remove_ungrouped, title);
             builder.setTitle(R.string.menu_sync_remove);
diff --git a/src/com/android/contacts/list/EnableGlobalSyncDialogFragment.java b/src/com/android/contacts/list/EnableGlobalSyncDialogFragment.java
index 08822d10c6..7be9fc8899 100644
--- a/src/com/android/contacts/list/EnableGlobalSyncDialogFragment.java
+++ b/src/com/android/contacts/list/EnableGlobalSyncDialogFragment.java
@@ -65,7 +65,7 @@ public class EnableGlobalSyncDialogFragment extends DialogFragment{
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         final Listener targetListener = (Listener) getTargetFragment();
-        final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme);
         builder.setTitle(R.string.turn_auto_sync_on_dialog_title)
                 .setMessage(R.string.turn_auto_sync_on_dialog_body)
                 .setPositiveButton(R.string.turn_auto_sync_on_dialog_confirm_btn,
diff --git a/src/com/android/contacts/util/AccountSelectionUtil.java b/src/com/android/contacts/util/AccountSelectionUtil.java
index 2b226d0a10..24f9a465fd 100644
--- a/src/com/android/contacts/util/AccountSelectionUtil.java
+++ b/src/com/android/contacts/util/AccountSelectionUtil.java
@@ -146,7 +146,7 @@ public class AccountSelectionUtil {
                 }
             };
         }
-        final AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+        final AlertDialog.Builder builder = new AlertDialog.Builder(activity, R.style.ContactsAlertDialogTheme);
         final TextView title = (TextView) View.inflate(activity, R.layout.dialog_title, null);
         title.setText(R.string.dialog_new_contact_account);
         builder.setCustomTitle(title);
diff --git a/src/com/android/contacts/vcard/CancelActivity.java b/src/com/android/contacts/vcard/CancelActivity.java
index a6b58cc86b..33c65ceb0f 100644
--- a/src/com/android/contacts/vcard/CancelActivity.java
+++ b/src/com/android/contacts/vcard/CancelActivity.java
@@ -89,14 +89,14 @@ public class CancelActivity extends Activity implements ServiceConnection {
             } else {
                 message = getString(R.string.cancel_export_confirmation_message, mDisplayName);
             }
-            final AlertDialog.Builder builder = new AlertDialog.Builder(this)
+            final AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.ContactsAlertDialogTheme)
                     .setMessage(message)
                     .setPositiveButton(R.string.yes_button, new RequestCancelListener())
                     .setOnCancelListener(mCancelListener)
                     .setNegativeButton(R.string.no_button, mCancelListener);
             return builder.create();
         } else if (id == R.id.dialog_cancel_failed) {
-            final AlertDialog.Builder builder = new AlertDialog.Builder(this)
+            final AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.ContactsAlertDialogTheme)
                     .setTitle(R.string.cancel_vcard_import_or_export_failed)
                     .setIconAttribute(android.R.attr.alertDialogIcon)
                     .setMessage(getString(R.string.fail_reason_unknown))
diff --git a/src/com/android/contacts/vcard/ExportVCardActivity.java b/src/com/android/contacts/vcard/ExportVCardActivity.java
index 690f2070c2..05818603c0 100644
--- a/src/com/android/contacts/vcard/ExportVCardActivity.java
+++ b/src/com/android/contacts/vcard/ExportVCardActivity.java
@@ -178,7 +178,7 @@ public class ExportVCardActivity extends Activity implements ServiceConnection,
     protected Dialog onCreateDialog(int id, Bundle bundle) {
         if (id == R.id.dialog_fail_to_export_with_reason) {
             mProcessOngoing = false;
-            return new AlertDialog.Builder(this)
+            return new AlertDialog.Builder(this, R.style.ContactsAlertDialogTheme)
                     .setTitle(R.string.exporting_contact_failed_title)
                     .setMessage(getString(R.string.exporting_contact_failed_message,
                             mErrorReason != null ? mErrorReason :
diff --git a/src/com/android/contacts/vcard/ImportVCardActivity.java b/src/com/android/contacts/vcard/ImportVCardActivity.java
index 2c69cdfd69..257bb23b37 100644
--- a/src/com/android/contacts/vcard/ImportVCardActivity.java
+++ b/src/com/android/contacts/vcard/ImportVCardActivity.java
@@ -759,7 +759,7 @@ public class ImportVCardActivity extends Activity implements ImportVCardDialogFr
                 Log.e(LOG_TAG, "Error message is null while it must not.");
                 message = getString(R.string.fail_reason_unknown);
             }
-            final AlertDialog.Builder builder = new AlertDialog.Builder(this)
+            final AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.ContactsAlertDialogTheme)
                 .setTitle(getString(R.string.reading_vcard_failed_title))
                 .setIconAttribute(android.R.attr.alertDialogIcon)
                 .setMessage(message)
diff --git a/src/com/android/contacts/vcard/ImportVCardDialogFragment.java b/src/com/android/contacts/vcard/ImportVCardDialogFragment.java
index 521a610dda..339e674160 100644
--- a/src/com/android/contacts/vcard/ImportVCardDialogFragment.java
+++ b/src/com/android/contacts/vcard/ImportVCardDialogFragment.java
@@ -65,7 +65,7 @@ public class ImportVCardDialogFragment extends DialogFragment {
         final Uri sourceUri = getArguments().getParcelable(ARG_SOURCE_URI);
         final String sourceDisplayName = getArguments().getString(ARG_SOURCE_DISPLAY_NAME);
 
-        return new AlertDialog.Builder(getActivity())
+        return new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme)
                 .setIconAttribute(android.R.attr.alertDialogIcon)
                 .setMessage(R.string.import_from_vcf_file_confirmation_message)
                 .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
diff --git a/src/com/android/contacts/widget/SelectPhoneAccountDialogFragment.java b/src/com/android/contacts/widget/SelectPhoneAccountDialogFragment.java
index da2b468da6..242a3e52fb 100644
--- a/src/com/android/contacts/widget/SelectPhoneAccountDialogFragment.java
+++ b/src/com/android/contacts/widget/SelectPhoneAccountDialogFragment.java
@@ -185,7 +185,7 @@ public class SelectPhoneAccountDialogFragment extends DialogFragment {
             }
         };
 
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme);
         ListAdapter selectAccountListAdapter = new SelectAccountListAdapter(
                 builder.getContext(),
                 R.layout.select_account_list_item,
-- 
GitLab


From 1e356817159ad9dfa7018945a758730065037dbb Mon Sep 17 00:00:00 2001
From: Fahim <fahim.cse11@gmail.com>
Date: Tue, 19 Oct 2021 22:23:58 +0600
Subject: [PATCH 4/4] Fix alert account list background color issue

---
 res/layout/account_selector_list_item_condensed.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/res/layout/account_selector_list_item_condensed.xml b/res/layout/account_selector_list_item_condensed.xml
index d43a3af37d..d3129eb53c 100644
--- a/res/layout/account_selector_list_item_condensed.xml
+++ b/res/layout/account_selector_list_item_condensed.xml
@@ -17,6 +17,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="72dp"
+    android:background="@color/color_default_foreground"
     android:orientation="horizontal">
     <ImageView android:id="@android:id/icon"
         android:layout_width="@dimen/detail_network_icon_size"
@@ -49,7 +50,7 @@
             android:layout_marginEnd="24dp"
             android:textSize="14sp"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:attr/textColorSecondary"
+            android:textColor="@color/secondary_text_color"
             android:singleLine="true"
             android:ellipsize="end"/>
 
-- 
GitLab