From 4c6c1ca03c5fc22953824fff61e91e2590bf1ae8 Mon Sep 17 00:00:00 2001 From: Fahim Date: Fri, 2 Apr 2021 18:25:55 +0600 Subject: [PATCH 1/3] 2824-Q-Dark-mode implementation - enable dark-mode functionality - fix dark mode-mode colour issues --- Android.mk | 3 +- res/values-night-v27/styles.xml | 23 +++ res/values-night/colors.xml | 3 + res/values-v27/styles.xml | 132 ++---------------- res/values/styles.xml | 25 +++- .../android/contacts/ContactsApplication.java | 3 - .../activities/ContactEditorActivity.java | 8 -- .../activities/ContactSelectionActivity.java | 9 -- .../contacts/activities/LicenseActivity.java | 32 +++-- .../contacts/activities/PeopleActivity.java | 10 -- .../interactions/ExportDialogFragment.java | 4 +- .../interactions/ImportDialogFragment.java | 2 +- .../contacts/list/AccountFilterActivity.java | 8 -- .../list/CustomContactListFilterActivity.java | 8 -- .../ContactsPreferenceActivity.java | 8 -- 15 files changed, 87 insertions(+), 191 deletions(-) create mode 100644 res/values-night-v27/styles.xml diff --git a/Android.mk b/Android.mk index 7e0b1e4a5a..43fedb618c 100644 --- a/Android.mk +++ b/Android.mk @@ -21,7 +21,8 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \ androidx.cardview_cardview \ androidx.recyclerview_recyclerview \ androidx.palette_palette \ - androidx.legacy_legacy-support-v4 + androidx.legacy_legacy-support-v4 \ + androidx.webkit_webkit LOCAL_JAVA_LIBRARIES := voip-common diff --git a/res/values-night-v27/styles.xml b/res/values-night-v27/styles.xml new file mode 100644 index 0000000000..c8901e4e2b --- /dev/null +++ b/res/values-night-v27/styles.xml @@ -0,0 +1,23 @@ + + + + + + + + + + \ No newline at end of file diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml index e88ed65b73..57a3776896 100644 --- a/res/values-night/colors.xml +++ b/res/values-night/colors.xml @@ -9,4 +9,7 @@ #dadada + + + #1e1e1e diff --git a/res/values-v27/styles.xml b/res/values-v27/styles.xml index 5c25afdce8..d0e4dd4dc5 100644 --- a/res/values-v27/styles.xml +++ b/res/values-v27/styles.xml @@ -1,132 +1,24 @@ + - - - + + diff --git a/res/values/styles.xml b/res/values/styles.xml index 4f7511f14a..c452024524 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -40,7 +40,7 @@ - - - + @@ -278,10 +291,14 @@ - + + + + @@ -180,17 +181,18 @@ @style/PopupMenuStyleAppCompat @style/PopupMenuStyleAppCompat @color/navigation_drawer_background_color - @color/navigation_bar_divider + @color/primary_color_dark + @style/Toolbar.Button.Navigation.Tinted - - - @@ -288,13 +288,36 @@ @color/accent - + + + - @@ -471,12 +510,12 @@ background and text color. See also android:style/Widget.Holo.TextView.ListSepar - @@ -550,6 +591,11 @@ background and text color. See also android:style/Widget.Holo.TextView.ListSepar and exit animations --> true @color/contextual_selection_bar_status_bar_color + @color/accent + @color/primary_color + @color/primary_color_dark + @color/primary_text_color + @color/secondary_text_color @@ -631,5 +677,26 @@ background and text color. See also android:style/Widget.Holo.TextView.ListSepar match_parent - + + + + + + + + diff --git a/src/com/android/contacts/NonPhoneActivity.java b/src/com/android/contacts/NonPhoneActivity.java index ba56d70908..6bf7930092 100644 --- a/src/com/android/contacts/NonPhoneActivity.java +++ b/src/com/android/contacts/NonPhoneActivity.java @@ -73,7 +73,7 @@ public class NonPhoneActivity extends ContactsActivity { @Override public Dialog onCreateDialog(Bundle savedInstanceState) { final AlertDialog alertDialog; - alertDialog = new AlertDialog.Builder(getActivity(), R.style.NonPhoneDialogTheme) + alertDialog = new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme) .create(); alertDialog.setTitle(R.string.non_phone_caption); alertDialog.setMessage(getArgumentPhoneNumber()); diff --git a/src/com/android/contacts/activities/ActionBarAdapter.java b/src/com/android/contacts/activities/ActionBarAdapter.java index 3b862e4b8e..fce6659e18 100644 --- a/src/com/android/contacts/activities/ActionBarAdapter.java +++ b/src/com/android/contacts/activities/ActionBarAdapter.java @@ -466,7 +466,7 @@ public class ActionBarAdapter implements OnCloseListener { R.color.actionbar_color_grey_solid); } else { iconColor = mActivity.getResources().getColor( - R.color.color_default_blue1); + R.color.accent); } overflow.setImageTintList(ColorStateList.valueOf(iconColor)); } 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/ContactSelectionActivity.java b/src/com/android/contacts/activities/ContactSelectionActivity.java index 12573ff83a..a9c56afe6a 100644 --- a/src/com/android/contacts/activities/ContactSelectionActivity.java +++ b/src/com/android/contacts/activities/ContactSelectionActivity.java @@ -692,7 +692,7 @@ public class ContactSelectionActivity extends AppCompatContactsActivity implemen final Drawable searchIcon = searchItem.getIcon(); if (searchIcon != null) { searchIcon.mutate().setColorFilter(ContextCompat.getColor(this, - R.color.color_default_blue1), PorterDuff.Mode.SRC_ATOP); + R.color.accent), PorterDuff.Mode.SRC_ATOP); } return true; } diff --git a/src/com/android/contacts/activities/LicenseActivity.java b/src/com/android/contacts/activities/LicenseActivity.java index a8cd96bc86..9d21a05dde 100644 --- a/src/com/android/contacts/activities/LicenseActivity.java +++ b/src/com/android/contacts/activities/LicenseActivity.java @@ -15,6 +15,7 @@ */ package com.android.contacts.activities; +import android.graphics.drawable.ColorDrawable; import android.os.Build; import android.os.Bundle; import androidx.appcompat.app.ActionBar; @@ -46,6 +47,7 @@ public class LicenseActivity extends AppCompatActivity { mWebView.loadUrl(LICENSE_FILE); final ActionBar actionBar = getSupportActionBar(); 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); } handleDayNightMode(mWebView); diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java index 4e306b8c5d..6f4078b9c5 100644 --- a/src/com/android/contacts/activities/PeopleActivity.java +++ b/src/com/android/contacts/activities/PeopleActivity.java @@ -196,7 +196,6 @@ public class PeopleActivity extends AppCompatContactsActivity implements private ContactsActionBarDrawerToggle mToggle; private Toolbar mToolbar; - public static int color_default_blue1; public static int color_default_primary_text; @@ -393,7 +392,7 @@ public class PeopleActivity extends AppCompatContactsActivity implements mToggle = new ContactsActionBarDrawerToggle(this, mDrawerLayout, mToolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close); mDrawerLayout.setDrawerListener(mToggle); - mToggle.getDrawerArrowDrawable().setColor(getResources().getColor(R.color.color_default_blue1)); + mToggle.getDrawerArrowDrawable().setColor(getResources().getColor(R.color.accent)); // Set fallback handler for when drawer is disabled. mToggle.setToolbarNavigationClickListener(new View.OnClickListener() { @Override @@ -653,7 +652,7 @@ public class PeopleActivity extends AppCompatContactsActivity implements LocalBroadcastManager.getInstance(this).registerReceiver(mSaveServiceListener, new IntentFilter(ContactSaveService.BROADCAST_GROUP_DELETED)); - mToggle.getDrawerArrowDrawable().setColor(getResources().getColor(R.color.color_default_blue1)); + mToggle.getDrawerArrowDrawable().setColor(getResources().getColor(R.color.accent)); } public void updateStatusBarBackground() { @@ -1325,7 +1324,6 @@ public class PeopleActivity extends AppCompatContactsActivity implements int color=getResources().getColor(R.color.accent); color_default_primary_text=getResources().getColor(R.color.color_default_primary_text); - color_default_blue1=getResources().getColor(R.color.color_default_blue1); getSupportActionBar().getThemedContext(); mToolbar.setTitleTextColor(color_default_primary_text); 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/detail/ContactDisplayUtils.java b/src/com/android/contacts/detail/ContactDisplayUtils.java index ef9124aed2..edf01d4ce8 100644 --- a/src/com/android/contacts/detail/ContactDisplayUtils.java +++ b/src/com/android/contacts/detail/ContactDisplayUtils.java @@ -160,8 +160,8 @@ public class ContactDisplayUtils { if (!isDirectoryEntry && !isUserProfile) { starredMenuItem.setVisible(true); final int resId = isStarred - ? R.drawable.quantum_ic_star_vd_theme_24 - : R.drawable.quantum_ic_star_border_vd_theme_24; + ? R.drawable.quantum_ic_star_white_vd_theme_24 + : R.drawable.quantum_ic_star_border_white_vd_theme_24; starredMenuItem.setIcon(resId); starredMenuItem.setChecked(isStarred); starredMenuItem.setTitle(isStarred ? R.string.menu_removeStar : R.string.menu_addStar); 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/drawer/DrawerAdapter.java b/src/com/android/contacts/drawer/DrawerAdapter.java index ad0d551f86..1806ce49cc 100644 --- a/src/com/android/contacts/drawer/DrawerAdapter.java +++ b/src/com/android/contacts/drawer/DrawerAdapter.java @@ -17,6 +17,7 @@ package com.android.contacts.drawer; import android.app.Activity; +import android.graphics.Color; import android.graphics.PorterDuff; import android.net.Uri; import android.provider.ContactsContract.DisplayNameSources; @@ -135,7 +136,7 @@ public class DrawerAdapter extends BaseAdapter { // Misc Items mMiscItems.add(new DividerItem()); mMiscItems.add(new MiscItem(R.id.nav_settings, R.string.menu_settings, - lineageos.platform.R.drawable.ic_settings)); + R.drawable.quantum_ic_settings_vd_theme_24)); if (HelpUtils.isHelpAndFeedbackAvailable()) { mMiscItems.add(new MiscItem(R.id.nav_help, R.string.menu_help, R.drawable.quantum_ic_help_vd_theme_24)); @@ -388,7 +389,9 @@ public class DrawerAdapter extends BaseAdapter { final ImageView iconView = (ImageView) result.findViewById(R.id.icon); iconView.setImageResource(item.icon); // iconView.setColorFilter(mActivity.getResources().getColor(R.color.color_default_light_grey)); - iconView.setColorFilter(mActivity.getResources().getColor(R.color.color_default_light_grey), android.graphics.PorterDuff.Mode.MULTIPLY); + if (item.viewType != VIEW_TYPE_ACCOUNT_ENTRY) { + iconView.setColorFilter(mActivity.getResources().getColor(R.color.accent, null), PorterDuff.Mode.SRC_ATOP); + } result.setId(item.id); updateSelectedStatus(textView, iconView, false); diff --git a/src/com/android/contacts/editor/CancelEditDialogFragment.java b/src/com/android/contacts/editor/CancelEditDialogFragment.java index 7f398577cb..9852267179 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/PhotoSourceDialogFragment.java b/src/com/android/contacts/editor/PhotoSourceDialogFragment.java index 4ca4d30d03..c2a6b603ee 100644 --- a/src/com/android/contacts/editor/PhotoSourceDialogFragment.java +++ b/src/com/android/contacts/editor/PhotoSourceDialogFragment.java @@ -72,30 +72,27 @@ public class PhotoSourceDialogFragment extends DialogFragment { for (int i = 0; i < items.length; i++) { items[i] = choices.get(i).toString(); } - final OnClickListener clickListener = new OnClickListener() { - @Override - public void onClick(DialogInterface dialogInterface, int which) { - final Listener listener = (Listener) getActivity(); - final ChoiceListItem choice = choices.get(which); - switch (choice.getId()) { - case ChoiceListItem.ID_REMOVE: - listener.onRemovePictureChosen(); - break; - case ChoiceListItem.ID_TAKE_PHOTO: - listener.onTakePhotoChosen(); - break; - case ChoiceListItem.ID_PICK_PHOTO: - listener.onPickFromGalleryChosen(); - break; - } - dismiss(); + final OnClickListener clickListener = (dialogInterface, which) -> { + final Listener listener = (Listener) getActivity(); + final ChoiceListItem choice = choices.get(which); + switch (choice.getId()) { + case ChoiceListItem.ID_REMOVE: + listener.onRemovePictureChosen(); + break; + case ChoiceListItem.ID_TAKE_PHOTO: + listener.onTakePhotoChosen(); + break; + case ChoiceListItem.ID_PICK_PHOTO: + listener.onPickFromGalleryChosen(); + break; } + dismiss(); }; // Build the AlertDialog final TextView title = (TextView) View.inflate(getActivity(), R.layout.dialog_title, null); title.setText(R.string.menu_change_photo); - final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); + final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme); builder.setCustomTitle(title); builder.setItems(items, clickListener); builder.setNegativeButton(android.R.string.cancel, /* listener =*/ null); 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 df2277315a..32b0823f5c 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/group/GroupNameEditDialogFragment.java b/src/com/android/contacts/group/GroupNameEditDialogFragment.java index 392bf249c5..498d5fa6e9 100644 --- a/src/com/android/contacts/group/GroupNameEditDialogFragment.java +++ b/src/com/android/contacts/group/GroupNameEditDialogFragment.java @@ -143,7 +143,7 @@ public final class GroupNameEditDialogFragment extends DialogFragment implements title.setText(mIsInsert ? R.string.group_name_dialog_insert_title : R.string.group_name_dialog_update_title); - final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), getTheme()) + final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme) .setCustomTitle(title) .setView(R.layout.group_name_edit_dialog) .setNegativeButton(android.R.string.cancel, new OnClickListener() { @@ -162,48 +162,45 @@ public final class GroupNameEditDialogFragment extends DialogFragment implements final AlertDialog alertDialog = builder.create(); alertDialog.getWindow().setSoftInputMode( WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE); - alertDialog.setOnShowListener(new DialogInterface.OnShowListener() { - @Override - public void onShow(DialogInterface dialog) { - mGroupNameEditText = (EditText) alertDialog.findViewById(android.R.id.text1); - mGroupNameTextLayout = - (TextInputLayout) alertDialog.findViewById(R.id.text_input_layout); - if (!TextUtils.isEmpty(mGroupName)) { - mGroupNameEditText.setText(mGroupName); - // Guard against already created group names that are longer than the max - final int maxLength = getResources().getInteger( - R.integer.group_name_max_length); - mGroupNameEditText.setSelection( - mGroupName.length() > maxLength ? maxLength : mGroupName.length()); - } - showInputMethod(mGroupNameEditText); + alertDialog.setOnShowListener((DialogInterface.OnShowListener) dialog -> { + mGroupNameEditText = (EditText) alertDialog.findViewById(android.R.id.text1); + mGroupNameTextLayout = + (TextInputLayout) alertDialog.findViewById(R.id.text_input_layout); + if (!TextUtils.isEmpty(mGroupName)) { + mGroupNameEditText.setText(mGroupName); + // Guard against already created group names that are longer than the max + final int maxLength = getResources().getInteger( + R.integer.group_name_max_length); + mGroupNameEditText.setSelection( + mGroupName.length() > maxLength ? maxLength : mGroupName.length()); + } + showInputMethod(mGroupNameEditText); - final Button createButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE); - createButton.setEnabled(!TextUtils.isEmpty(getGroupName())); + final Button createButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE); + createButton.setEnabled(!TextUtils.isEmpty(getGroupName())); - // Override the click listener to prevent dismissal if creating a duplicate group. - createButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - maybePersistCurrentGroupName(v); - } - }); - mGroupNameEditText.addTextChangedListener(new TextWatcher() { - @Override - public void beforeTextChanged(CharSequence s, int start, int count, int after) { - } + // Override the click listener to prevent dismissal if creating a duplicate group. + createButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + maybePersistCurrentGroupName(v); + } + }); + mGroupNameEditText.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + } - @Override - public void onTextChanged(CharSequence s, int start, int before, int count) { - } + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + } - @Override - public void afterTextChanged(Editable s) { - mGroupNameTextLayout.setError(null); - createButton.setEnabled(!TextUtils.isEmpty(s)); - } - }); - } + @Override + public void afterTextChanged(Editable s) { + mGroupNameTextLayout.setError(null); + createButton.setEnabled(!TextUtils.isEmpty(s)); + } + }); }); return alertDialog; 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 efd1f081cd..926ce9acf0 100644 --- a/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java +++ b/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java @@ -270,34 +270,23 @@ 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) .setPositiveButton(positiveButtonId, - new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int whichButton) { - doDeleteContact(contactIds, namesArray); - } - } + (dialog, whichButton) -> doDeleteContact(contactIds, namesArray) ) .create(); - mDialog.setOnDismissListener(new OnDismissListener() { - @Override - public void onDismiss(DialogInterface dialog) { - mIsLoaderActive = false; - mDialog = null; - } + mDialog.setOnDismissListener(dialog -> { + mIsLoaderActive = false; + mDialog = null; }); - mDialog.setOnShowListener( new DialogInterface.OnShowListener() { - @Override - public void onShow(DialogInterface arg0) { - mDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(getResources().getColor(R.color.color_default_blue1)); - mDialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(getResources().getColor(R.color.color_default_blue1)); - } + mDialog.setOnShowListener(arg0 -> { + mDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(getResources().getColor(R.color.accent)); + mDialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(getResources().getColor(R.color.accent)); }); mDialog.show(); 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/interactions/ImportDialogFragment.java b/src/com/android/contacts/interactions/ImportDialogFragment.java index 7f2159997f..bf99f49358 100644 --- a/src/com/android/contacts/interactions/ImportDialogFragment.java +++ b/src/com/android/contacts/interactions/ImportDialogFragment.java @@ -207,7 +207,7 @@ public class ImportDialogFragment extends DialogFragment { } }; - final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()) + final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme) .setTitle(R.string.dialog_import) .setNegativeButton(android.R.string.cancel, null); if (adapter.isEmpty()) { @@ -220,8 +220,8 @@ public class ImportDialogFragment extends DialogFragment { dialog.setOnShowListener( new DialogInterface.OnShowListener() { @Override public void onShow(DialogInterface arg0) { - dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(getResources().getColor(R.color.color_default_blue1)); - //dialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(getResources().getColor(R.color.color_default_blue1)); + dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(getResources().getColor(R.color.accent)); + //dialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(getResources().getColor(R.color.accent)); } }); diff --git a/src/com/android/contacts/list/AccountFilterActivity.java b/src/com/android/contacts/list/AccountFilterActivity.java index a88ca60e11..6b2f755e4a 100644 --- a/src/com/android/contacts/list/AccountFilterActivity.java +++ b/src/com/android/contacts/list/AccountFilterActivity.java @@ -74,7 +74,7 @@ public class AccountFilterActivity extends Activity implements AdapterView.OnIte int resINT = getResources().getIdentifier(resName, "drawable", getPackageName()); final Drawable upArrow = getResources().getDrawable(resINT); - upArrow.setColorFilter(getResources().getColor(R.color.color_default_blue1), PorterDuff.Mode.SRC_ATOP); + upArrow.setColorFilter(getResources().getColor(R.color.accent), PorterDuff.Mode.SRC_ATOP); actionBar.setHomeAsUpIndicator(upArrow); actionBar.setDisplayHomeAsUpEnabled(true); diff --git a/src/com/android/contacts/list/ContactListItemView.java b/src/com/android/contacts/list/ContactListItemView.java index aafe5b188d..3575a92cef 100644 --- a/src/com/android/contacts/list/ContactListItemView.java +++ b/src/com/android/contacts/list/ContactListItemView.java @@ -1157,7 +1157,7 @@ public class ContactListItemView extends ViewGroup mNameTextView.setSingleLine(true); mNameTextView.setEllipsize(getTextEllipsis()); mNameTextView.setTextColor(ResourcesCompat.getColorStateList(getResources(), - R.color.contact_list_name_text_color, getContext().getTheme())); + R.color.color_default_primary_text, getContext().getTheme())); mNameTextView.setTextSize(TypedValue.COMPLEX_UNIT_PX, mNameTextViewTextSize); // Manually call setActivated() since this view may be added after the first // setActivated() call toward this whole item view. diff --git a/src/com/android/contacts/list/CustomContactListFilterActivity.java b/src/com/android/contacts/list/CustomContactListFilterActivity.java index 757f4f22e2..4ba748cfc1 100644 --- a/src/com/android/contacts/list/CustomContactListFilterActivity.java +++ b/src/com/android/contacts/list/CustomContactListFilterActivity.java @@ -137,7 +137,7 @@ public class CustomContactListFilterActivity extends Activity implements int resINT = getResources().getIdentifier(resName, "drawable", getPackageName()); final Drawable upArrow = getResources().getDrawable(resINT); - upArrow.setColorFilter(getResources().getColor(R.color.color_default_blue1), PorterDuff.Mode.SRC_ATOP); + upArrow.setColorFilter(getResources().getColor(R.color.accent), PorterDuff.Mode.SRC_ATOP); actionBar.setHomeAsUpIndicator(upArrow); // android.R.id.home will be triggered in onOptionsItemSelected() @@ -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); @@ -1000,7 +1000,7 @@ public class CustomContactListFilterActivity extends Activity implements @Override public Dialog onCreateDialog(Bundle savedInstanceState) { - return new AlertDialog.Builder(getActivity(), getTheme()) + return new AlertDialog.Builder(getActivity(), R.style.ContactsAlertDialogTheme) .setMessage(R.string.leave_customize_confirmation_dialog_message) .setNegativeButton(android.R.string.no, null) .setPositiveButton(android.R.string.yes, this) diff --git a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java index bb553ad66f..f153db74a4 100644 --- a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java +++ b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java @@ -1004,7 +1004,7 @@ public class DefaultContactBrowseListFragment extends ContactBrowseListFragment if (searchIcon != null) { searchIcon.mutate().setColorFilter(ContextCompat.getColor(mActivity, - R.color.color_default_blue1), PorterDuff.Mode.SRC_ATOP); + R.color.accent), PorterDuff.Mode.SRC_ATOP); } } @@ -1036,7 +1036,7 @@ public class DefaultContactBrowseListFragment extends ContactBrowseListFragment final Drawable icon = menu.getItem(i).getIcon(); if (icon != null && !isSearchOrSelectionMode) { icon.mutate().setColorFilter(ContextCompat.getColor(getContext(), - R.color.color_default_blue1), PorterDuff.Mode.SRC_ATOP); + R.color.accent), PorterDuff.Mode.SRC_ATOP); } } } 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/preference/ContactsPreferenceActivity.java b/src/com/android/contacts/preference/ContactsPreferenceActivity.java index 1c8e0072a5..c153cc7bff 100644 --- a/src/com/android/contacts/preference/ContactsPreferenceActivity.java +++ b/src/com/android/contacts/preference/ContactsPreferenceActivity.java @@ -18,6 +18,7 @@ package com.android.contacts.preference; import android.content.res.Configuration; import android.database.Cursor; +import android.graphics.drawable.ColorDrawable; import android.os.Build; import android.os.Bundle; import android.preference.PreferenceActivity; @@ -76,6 +77,7 @@ 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.setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP, ActionBar.DISPLAY_HOME_AS_UP); } @@ -199,10 +201,11 @@ public final class ContactsPreferenceActivity extends PreferenceActivity private void setActivityTitle(@StringRes int res) { 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(Html.fromHtml(""+title+" ")); + actionBar.setTitle(title); } } diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java index 1952d50f90..56d8c09f3b 100644 --- a/src/com/android/contacts/quickcontact/QuickContactActivity.java +++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java @@ -17,6 +17,7 @@ package com.android.contacts.quickcontact; +import androidx.core.content.ContextCompat; import android.accounts.Account; import android.animation.ArgbEvaluator; import android.animation.ObjectAnimator; @@ -1187,6 +1188,8 @@ public class QuickContactActivity extends ContactsActivity { private void initializeNoContactDetailCard(boolean areAllRawContactsSimAccounts) { final Drawable phoneIcon = ResourcesCompat.getDrawable(getResources(), lineageos.platform.R.drawable.ic_phone, null).mutate(); + phoneIcon.setColorFilter(ContextCompat.getColor(this, R.color.accent), + PorterDuff.Mode.SRC_ATOP); final Entry phonePromptEntry = new Entry(CARD_ENTRY_ID_EDIT_CONTACT, phoneIcon, getString(R.string.quickcontact_add_phone_number), /* subHeader = */ null, /* subHeaderIcon = */ null, /* text = */ null, @@ -1209,6 +1212,8 @@ public class QuickContactActivity extends ContactsActivity { if (!areAllRawContactsSimAccounts) { final Drawable emailIcon = ResourcesCompat.getDrawable(getResources(), R.drawable.quantum_ic_email_vd_theme_24, null).mutate(); + emailIcon.setColorFilter(ContextCompat.getColor(this, R.color.accent), + PorterDuff.Mode.SRC_ATOP); final Entry emailPromptEntry = new Entry(CARD_ENTRY_ID_EDIT_CONTACT, emailIcon, getString(R.string.quickcontact_add_email), /* subHeader = */ null, /* subHeaderIcon = */ null, @@ -1228,8 +1233,10 @@ public class QuickContactActivity extends ContactsActivity { final int subHeaderTextColor = getResources().getColor( R.color.quickcontact_entry_sub_header_text_color); - final PorterDuffColorFilter greyColorFilter = - new PorterDuffColorFilter(subHeaderTextColor, PorterDuff.Mode.SRC_ATOP); + final int accentColor = getResources().getColor( + R.color.accent); + final PorterDuffColorFilter accentColorFilter = + new PorterDuffColorFilter(accentColor, PorterDuff.Mode.SRC_ATOP); mNoContactDetailsCard.initialize(promptEntries, 2, /* isExpanded = */ true, /* isAlwaysExpanded = */ true, mExpandingEntryCardViewListener, mScroller); if (mNoContactDetailsCard.getVisibility() == View.GONE && mShouldLog) { @@ -1238,7 +1245,7 @@ public class QuickContactActivity extends ContactsActivity { } mNoContactDetailsCard.setVisibility(View.VISIBLE); mNoContactDetailsCard.setEntryHeaderColor(subHeaderTextColor); - mNoContactDetailsCard.setColorAndFilter(subHeaderTextColor, greyColorFilter); + mNoContactDetailsCard.setColorAndFilter(subHeaderTextColor, accentColorFilter); } /** @@ -2047,14 +2054,14 @@ public class QuickContactActivity extends ContactsActivity { } private void setThemeColor(MaterialPalette palette) { - // If the color is invalid, use the predefined default + // If the color is invalid, use the predefined mColorFilterColor = palette.mPrimaryColor; mScroller.setHeaderTintColor(mColorFilterColor); mStatusBarColor = palette.mSecondaryColor; updateStatusBarColor(); - mColorFilter = new PorterDuffColorFilter(mColorFilterColor, PorterDuff.Mode.SRC_ATOP); + mContactCard.setColorAndFilter(mColorFilterColor, mColorFilter); mAboutCard.setColorAndFilter(mColorFilterColor, mColorFilter); } @@ -2353,10 +2360,10 @@ public class QuickContactActivity extends ContactsActivity { editMenuItem.setVisible(true); if (DirectoryContactUtil.isDirectoryContact(mContactData) || InvisibleContactUtil .isInvisibleAndAddable(mContactData, this)) { - editMenuItem.setIcon(R.drawable.quantum_ic_person_add_vd_theme_24); + editMenuItem.setIcon(R.drawable.quantum_ic_person_add_white_vd_theme_24); editMenuItem.setTitle(R.string.menu_add_contact); } else if (isContactEditable()) { - editMenuItem.setIcon(R.drawable.quantum_ic_create_vd_theme_24); + editMenuItem.setIcon(R.drawable.quantum_ic_create_white_vd_theme_24); editMenuItem.setTitle(R.string.menu_editContact); } else { editMenuItem.setVisible(false); @@ -2399,6 +2406,14 @@ public class QuickContactActivity extends ContactsActivity { final MenuItem helpMenu = menu.findItem(R.id.menu_help); helpMenu.setVisible(HelpUtils.isHelpAndFeedbackAvailable()); + for (int i = 0; i < menu.size(); ++i) { + final Drawable icon = menu.getItem(i).getIcon(); + if (icon != null) { + icon.mutate().setColorFilter(ContextCompat.getColor(this, + android.R.color.white), PorterDuff.Mode.SRC_ATOP); + } + } + return true; } return false; 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/util/MaterialColorMapUtils.java b/src/com/android/contacts/util/MaterialColorMapUtils.java index c1616cec7d..4e4ab5c408 100644 --- a/src/com/android/contacts/util/MaterialColorMapUtils.java +++ b/src/com/android/contacts/util/MaterialColorMapUtils.java @@ -200,6 +200,6 @@ public class MaterialColorMapUtils { && ((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.primary_color_dark); } } 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, diff --git a/tests/res/layout/fill_call_log_test.xml b/tests/res/layout/fill_call_log_test.xml index 51a97a8b95..9568db5459 100644 --- a/tests/res/layout/fill_call_log_test.xml +++ b/tests/res/layout/fill_call_log_test.xml @@ -38,7 +38,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/useRandomNumbers" - android:buttonTint="@color/color_default_blue1" + android:buttonTint="@color/accent" />