From e8b9f81c98fb98e11a297acdadf5341779f65db5 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Thu, 27 Jul 2017 17:26:39 -0400 Subject: [PATCH 01/34] remove useless no-op privacy policy / terms of use --- res/xml/preference_about.xml | 12 -------- .../preference/AboutPreferenceFragment.java | 28 ------------------- 2 files changed, 40 deletions(-) diff --git a/res/xml/preference_about.xml b/res/xml/preference_about.xml index a109db68ed..6b31d238f0 100644 --- a/res/xml/preference_about.xml +++ b/res/xml/preference_about.xml @@ -25,16 +25,4 @@ android:key="@string/pref_open_source_licenses_key" android:title="@string/about_open_source_licenses" android:summary="@string/about_open_source_licenses_summary"/> - - - - - - diff --git a/src/com/android/contacts/preference/AboutPreferenceFragment.java b/src/com/android/contacts/preference/AboutPreferenceFragment.java index 378948033a..721ab0460a 100644 --- a/src/com/android/contacts/preference/AboutPreferenceFragment.java +++ b/src/com/android/contacts/preference/AboutPreferenceFragment.java @@ -34,10 +34,6 @@ * This fragment shows the preferences for "about". */ public class AboutPreferenceFragment extends PreferenceFragment { - - public static final String PRIVACY_POLICY_URL = "http://www.google.com/policies/privacy"; - public static final String TERMS_OF_SERVICE_URL = "http://www.google.com/policies/terms"; - public static AboutPreferenceFragment newInstance() { return new AboutPreferenceFragment(); } @@ -63,30 +59,6 @@ public void onCreate(Bundle savedInstanceState) { final Preference licensePreference = findPreference( getString(R.string.pref_open_source_licenses_key)); licensePreference.setIntent(new Intent(getActivity(), LicenseActivity.class)); - - final Preference privacyPolicyPreference = findPreference("pref_privacy_policy"); - final Preference termsOfServicePreference = findPreference("pref_terms_of_service"); - - 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); - } - } catch (ActivityNotFoundException ex) { - Toast.makeText(getContext(), getString(R.string.url_open_error_toast), - Toast.LENGTH_SHORT).show(); - } - return true; - } - }; - - privacyPolicyPreference.setOnPreferenceClickListener(listener); - termsOfServicePreference.setOnPreferenceClickListener(listener); } @Override From bf1f247d537fb949cff5c951f9c5090a2cc7731a Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Tue, 22 Aug 2017 02:51:36 -0400 Subject: [PATCH 02/34] remove 'to Google' from Contacts backup notice --- res/values-en-rAU/strings.xml | 2 +- res/values-en-rGB/strings.xml | 2 +- res/values-en-rIN/strings.xml | 2 +- res/values/strings.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml index e4d3500f18..0a38c53f72 100644 --- a/res/values-en-rAU/strings.xml +++ b/res/values-en-rAU/strings.xml @@ -176,7 +176,7 @@ "Remove contacts" "My local profile" "My %1$s profile" - "Take a moment to add an account that will back up your contacts to Google." + "Take a moment to add an account that will back up your contacts." "New contacts will be saved to %1$s." "Choose a default account for new contacts:" "Create new contact" diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index e4d3500f18..0a38c53f72 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -176,7 +176,7 @@ "Remove contacts" "My local profile" "My %1$s profile" - "Take a moment to add an account that will back up your contacts to Google." + "Take a moment to add an account that will back up your contacts." "New contacts will be saved to %1$s." "Choose a default account for new contacts:" "Create new contact" diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml index e4d3500f18..0a38c53f72 100644 --- a/res/values-en-rIN/strings.xml +++ b/res/values-en-rIN/strings.xml @@ -176,7 +176,7 @@ "Remove contacts" "My local profile" "My %1$s profile" - "Take a moment to add an account that will back up your contacts to Google." + "Take a moment to add an account that will back up your contacts." "New contacts will be saved to %1$s." "Choose a default account for new contacts:" "Create new contact" diff --git a/res/values/strings.xml b/res/values/strings.xml index fc24b1089e..2d9a185223 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -549,7 +549,7 @@ My %1$s profile - Take a minute to add an account that will back up your contacts to Google. + Take a minute to add an account that will back up your contacts. New contacts will be saved to %1$s. From e8dde89b6826b8f87eee546b28be1ac630da1892 Mon Sep 17 00:00:00 2001 From: Joey Date: Thu, 25 Jan 2018 12:23:13 +0100 Subject: [PATCH 03/34] Contacts: define app category Change-Id: I54fd9b2bc0d1beb4885d5dd5cb59c93a34f4bb7d Signed-off-by: Joey --- AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 66d5767f14..543f937575 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -69,6 +69,7 @@ android:hardwareAccelerated="true" android:icon="@mipmap/ic_contacts_launcher" android:label="@string/applicationLabel" + android:appCategory="social" android:supportsRtl="true" android:taskAffinity="android.task.contacts" android:usesCleartextTraffic="false"> From 2145715aa1717029c93b9d65848746354cf43c41 Mon Sep 17 00:00:00 2001 From: flawedworld Date: Sat, 5 Feb 2022 16:37:24 +0000 Subject: [PATCH 04/34] Add GrapheneOS icon --- AndroidManifest.xml | 3 ++- res/drawable/ic_launcher_foreground.xml | 27 +++++++++++++++++++++++++ res/mipmap-anydpi/ic_launcher.xml | 5 +++++ res/mipmap-anydpi/ic_launcher_round.xml | 5 +++++ res/values/ic_launcher_background.xml | 4 ++++ 5 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 res/drawable/ic_launcher_foreground.xml create mode 100644 res/mipmap-anydpi/ic_launcher.xml create mode 100644 res/mipmap-anydpi/ic_launcher_round.xml create mode 100644 res/values/ic_launcher_background.xml diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 543f937575..bb12c7d1ee 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -67,7 +67,8 @@ + + + + + diff --git a/res/mipmap-anydpi/ic_launcher.xml b/res/mipmap-anydpi/ic_launcher.xml new file mode 100644 index 0000000000..a8a8fa5518 --- /dev/null +++ b/res/mipmap-anydpi/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/res/mipmap-anydpi/ic_launcher_round.xml b/res/mipmap-anydpi/ic_launcher_round.xml new file mode 100644 index 0000000000..a8a8fa5518 --- /dev/null +++ b/res/mipmap-anydpi/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/res/values/ic_launcher_background.xml b/res/values/ic_launcher_background.xml new file mode 100644 index 0000000000..f42ada656e --- /dev/null +++ b/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + From 5bb29eee0ba6b044a8ddf7871ec84d48ed206f67 Mon Sep 17 00:00:00 2001 From: smdyv <88971341+smdyv@users.noreply.github.com> Date: Wed, 9 Feb 2022 11:29:05 +0100 Subject: [PATCH 05/34] Replace launcher icon --- res/drawable/ic_launcher_foreground.xml | 31 ++++++++++++++----------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/res/drawable/ic_launcher_foreground.xml b/res/drawable/ic_launcher_foreground.xml index 2d27b83fc7..05c3b3047c 100644 --- a/res/drawable/ic_launcher_foreground.xml +++ b/res/drawable/ic_launcher_foreground.xml @@ -1,27 +1,30 @@ - - - - + + + + From 6b913994dce4014290bf2b93539b255ede92bbf5 Mon Sep 17 00:00:00 2001 From: June Date: Sat, 19 Feb 2022 06:53:03 +0000 Subject: [PATCH 06/34] Add basic support for vCard 4.0 Signed-off-by: June --- .../contacts/vcard/ImportProcessor.java | 14 +++++--- .../contacts/vcard/ImportVCardActivity.java | 34 +++++++++++++++++-- .../vcard/NfcImportVCardActivity.java | 18 ++++++++-- 3 files changed, 57 insertions(+), 9 deletions(-) diff --git a/src/com/android/contacts/vcard/ImportProcessor.java b/src/com/android/contacts/vcard/ImportProcessor.java index c6fcccb8c2..8eff2cc963 100644 --- a/src/com/android/contacts/vcard/ImportProcessor.java +++ b/src/com/android/contacts/vcard/ImportProcessor.java @@ -30,6 +30,7 @@ import com.android.vcard.VCardParser; import com.android.vcard.VCardParser_V21; import com.android.vcard.VCardParser_V30; +import com.android.vcard.VCardParser_V40; import com.android.vcard.exception.VCardException; import com.android.vcard.exception.VCardNotSupportedException; import com.android.vcard.exception.VCardVersionException; @@ -135,7 +136,8 @@ private void runInternal() { */ possibleVCardVersions = new int[] { ImportVCardActivity.VCARD_VERSION_V21, - ImportVCardActivity.VCARD_VERSION_V30 + ImportVCardActivity.VCARD_VERSION_V30, + ImportVCardActivity.VCARD_VERSION_V40 }; } else { possibleVCardVersions = new int[] { @@ -231,9 +233,13 @@ private boolean readOneVCard(InputStream is, int vcardType, String charset, // In the worst case, a user may call cancel() just before creating // mVCardParser. synchronized (this) { - mVCardParser = (vcardVersion == ImportVCardActivity.VCARD_VERSION_V30 ? - new VCardParser_V30(vcardType) : - new VCardParser_V21(vcardType)); + if (vcardVersion == ImportVCardActivity.VCARD_VERSION_V30) { + mVCardParser = new VCardParser_V30(vcardType); + } else if (vcardVersion == ImportVCardActivity.VCARD_VERSION_V40) { + mVCardParser = new VCardParser_V40(vcardType); + } else { + mVCardParser = new VCardParser_V21(vcardType); + } if (isCancelled()) { Log.i(LOG_TAG, "ImportProcessor already recieves cancel request, so " + "send cancel request to vCard parser too."); diff --git a/src/com/android/contacts/vcard/ImportVCardActivity.java b/src/com/android/contacts/vcard/ImportVCardActivity.java index 3eb7bdbe31..5696224320 100644 --- a/src/com/android/contacts/vcard/ImportVCardActivity.java +++ b/src/com/android/contacts/vcard/ImportVCardActivity.java @@ -49,6 +49,7 @@ import com.android.vcard.VCardParser; import com.android.vcard.VCardParser_V21; import com.android.vcard.VCardParser_V30; +import com.android.vcard.VCardParser_V40; import com.android.vcard.VCardSourceDetector; import com.android.vcard.exception.VCardException; import com.android.vcard.exception.VCardNestedException; @@ -83,6 +84,7 @@ public class ImportVCardActivity extends Activity implements ImportVCardDialogFr /* package */ final static int VCARD_VERSION_AUTO_DETECT = 0; /* package */ final static int VCARD_VERSION_V21 = 1; /* package */ final static int VCARD_VERSION_V30 = 2; + /* package */ final static int VCARD_VERSION_V40 = 3; private static final int REQUEST_OPEN_DOCUMENT = 100; @@ -321,6 +323,7 @@ private ImportRequest constructImportRequest(final byte[] data, int vcardVersion = VCARD_VERSION_V21; try { boolean shouldUseV30 = false; + boolean shouldUseV40 = false; InputStream is; if (data != null) { is = new ByteArrayInputStream(data); @@ -354,7 +357,28 @@ private ImportRequest constructImportRequest(final byte[] data, mVCardParser.addInterpreter(detector); mVCardParser.parse(is); } catch (VCardVersionException e2) { - throw new VCardException("vCard with unspported version."); + try { + is.close(); + } catch (IOException e) { + } + + shouldUseV30 = false; + shouldUseV40 = true; + if (data != null) { + is = new ByteArrayInputStream(data); + } else { + is = resolver.openInputStream(localDataUri); + } + mVCardParser = new VCardParser_V40(); + try { + counter = new VCardEntryCounter(); + detector = new VCardSourceDetector(); + mVCardParser.addInterpreter(counter); + mVCardParser.addInterpreter(detector); + mVCardParser.parse(is); + } catch (VCardVersionException e3) { + throw new VCardException("vCard with unspported version."); + } } } finally { if (is != null) { @@ -365,7 +389,13 @@ private ImportRequest constructImportRequest(final byte[] data, } } - vcardVersion = shouldUseV30 ? VCARD_VERSION_V30 : VCARD_VERSION_V21; + if (shouldUseV30) { + vcardVersion = VCARD_VERSION_V30; + } else if (shouldUseV40) { + vcardVersion = VCARD_VERSION_V40; + } else { + vcardVersion = VCARD_VERSION_V21; + } } catch (VCardNestedException e) { Log.w(LOG_TAG, "Nested Exception is found (it may be false-positive)."); // Go through without throwing the Exception, as we may be able to detect the diff --git a/src/com/android/contacts/vcard/NfcImportVCardActivity.java b/src/com/android/contacts/vcard/NfcImportVCardActivity.java index 88fa760356..f41e564463 100644 --- a/src/com/android/contacts/vcard/NfcImportVCardActivity.java +++ b/src/com/android/contacts/vcard/NfcImportVCardActivity.java @@ -46,6 +46,7 @@ import com.android.vcard.VCardParser; import com.android.vcard.VCardParser_V21; import com.android.vcard.VCardParser_V30; +import com.android.vcard.VCardParser_V40; import com.android.vcard.VCardSourceDetector; import com.android.vcard.exception.VCardException; import com.android.vcard.exception.VCardNestedException; @@ -126,9 +127,20 @@ public void onPostExecute(ImportRequest request) { parser.addInterpreter(detector); parser.parse(is); } catch (VCardVersionException e2) { - FeedbackHelper.sendFeedback(this, TAG, "vcard with unsupported version", e2); - showFailureNotification(R.string.fail_reason_not_supported); - return null; + is.reset(); + vcardVersion = ImportVCardActivity.VCARD_VERSION_V40; + parser = new VCardParser_V40(); + try { + counter = new VCardEntryCounter(); + detector = new VCardSourceDetector(); + parser.addInterpreter(counter); + parser.addInterpreter(detector); + parser.parse(is); + } catch (VCardVersionException e3) { + FeedbackHelper.sendFeedback(this, TAG, "vcard with unsupported version", e2); + showFailureNotification(R.string.fail_reason_not_supported); + return null; + } } } finally { try { From d6a3d6d5c17346db761ad9f7480afd76459eaebc Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Wed, 25 May 2022 23:59:57 +0100 Subject: [PATCH 07/34] Don't prompt to add account when creating a contact --- .../ContactEditorAccountsChangedActivity.java | 33 +++---------------- 1 file changed, 5 insertions(+), 28 deletions(-) diff --git a/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java b/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java index 8f0509baba..1ae79a8bb4 100644 --- a/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java +++ b/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java @@ -171,34 +171,11 @@ public void onClick(View v) { } }); } else { - // If the user has 0 writable accounts, we will just show the user a message with 2 - // possible action buttons. - view = View.inflate(this, - R.layout.contact_editor_accounts_changed_activity_with_text, null); - - final TextView textView = (TextView) view.findViewById(R.id.text); - final Button leftButton = (Button) view.findViewById(R.id.left_button); - final Button rightButton = (Button) view.findViewById(R.id.right_button); - - textView.setText(getString(R.string.contact_editor_prompt_zero_accounts)); - - // This button allows the user to continue editing the contact as a phone-only - // local contact. - leftButton.setText(getString(android.R.string.cancel)); - leftButton.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - // Remember that the user wants to create local contacts, so the user is not - // prompted again with this activity. - saveAccountAndReturnResult(AccountWithDataSet.getNullAccount()); - finish(); - } - }); - - // This button allows the user to add a new account to the device and return to - // this app afterwards. - rightButton.setText(getString(R.string.add_account)); - rightButton.setOnClickListener(mAddAccountClickListener); + view = null; // Only to make the compiler happy + // If the user has 0 writable accounts, don't bother, let them continue editing + // the contact as a phone-only local contact. + saveAccountAndReturnResult(AccountWithDataSet.getNullAccount()); + finish(); } if (mDialog != null && mDialog.isShowing()) { From 6bfb303fb35506fa5a0dbeb7536c494c6c2195d1 Mon Sep 17 00:00:00 2001 From: flawedworld Date: Wed, 25 May 2022 23:47:12 +0100 Subject: [PATCH 08/34] Use common intent for directions instead of Google Maps URL --- src/com/android/contacts/util/StructuredPostalUtils.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/com/android/contacts/util/StructuredPostalUtils.java b/src/com/android/contacts/util/StructuredPostalUtils.java index 6e46176ca8..f5f454948e 100644 --- a/src/com/android/contacts/util/StructuredPostalUtils.java +++ b/src/com/android/contacts/util/StructuredPostalUtils.java @@ -32,10 +32,6 @@ public static Uri getPostalAddressUri(String postalAddress) { } public static Intent getViewPostalAddressDirectionsIntent(String postalAddress) { - return new Intent(Intent.ACTION_VIEW, getPostalAddressDirectionsUri(postalAddress)); - } - - public static Uri getPostalAddressDirectionsUri(String postalAddress) { - return Uri.parse("https://maps.google.com/maps?daddr=" + Uri.encode(postalAddress)); + return new Intent(Intent.ACTION_VIEW, getPostalAddressUri(postalAddress)); } } From e5dab08f54971ad30c0d6e4f5e70ac2037eb7847 Mon Sep 17 00:00:00 2001 From: Dmitry Muhomor Date: Wed, 24 Aug 2022 20:31:48 +0300 Subject: [PATCH 09/34] don't hide empty local contact storage when a Google account is present --- .../contacts/model/DeviceLocalAccountLocator.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/com/android/contacts/model/DeviceLocalAccountLocator.java b/src/com/android/contacts/model/DeviceLocalAccountLocator.java index e8a2ba0ffe..9a70ef0dc5 100644 --- a/src/com/android/contacts/model/DeviceLocalAccountLocator.java +++ b/src/com/android/contacts/model/DeviceLocalAccountLocator.java @@ -45,13 +45,6 @@ public DeviceLocalAccountLocator(Context context, AccountManager accountManager) * Returns a list of device local accounts */ public List getDeviceLocalAccounts() { - @SuppressWarnings("MissingPermission") final Account[] accounts = mAccountManager - .getAccountsByType(GoogleAccountType.ACCOUNT_TYPE); - - if (accounts.length > 0 && !mLocalAccount.get(0).hasData(mContext)) { - return Collections.emptyList(); - } else { - return mLocalAccount; - } + return mLocalAccount; } } From 2c1ee15446ed0aedb59ea92ad35094dfa84c89fc Mon Sep 17 00:00:00 2001 From: Pratyush Date: Tue, 13 Sep 2022 16:59:16 +0530 Subject: [PATCH 10/34] add monochrome icon --- res/mipmap-anydpi/ic_launcher.xml | 1 + res/mipmap-anydpi/ic_launcher_round.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/res/mipmap-anydpi/ic_launcher.xml b/res/mipmap-anydpi/ic_launcher.xml index a8a8fa5518..5c84730caa 100644 --- a/res/mipmap-anydpi/ic_launcher.xml +++ b/res/mipmap-anydpi/ic_launcher.xml @@ -2,4 +2,5 @@ + diff --git a/res/mipmap-anydpi/ic_launcher_round.xml b/res/mipmap-anydpi/ic_launcher_round.xml index a8a8fa5518..5c84730caa 100644 --- a/res/mipmap-anydpi/ic_launcher_round.xml +++ b/res/mipmap-anydpi/ic_launcher_round.xml @@ -2,4 +2,5 @@ + From 2e0e357b8f10448e8f8a45db89d977ae0f8f647a Mon Sep 17 00:00:00 2001 From: Pratyush Date: Thu, 24 Nov 2022 14:52:04 +0530 Subject: [PATCH 11/34] added color for night theme --- res/values-night/colors.xml | 262 ++++++++++++++++++++++++++++++++++++ res/values/colors.xml | 3 + 2 files changed, 265 insertions(+) create mode 100644 res/values-night/colors.xml diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml new file mode 100644 index 0000000000..1f132888e9 --- /dev/null +++ b/res/values-night/colors.xml @@ -0,0 +1,262 @@ + + + + #191919 + + + #DDFFFFFF + + + #D9FFFFFF + + + #61FFFFFF + + #B4B4B4 + #D6D6D6 + + #CC2A56C6 + + #99FFFFFF + + #000000 + + @color/primary_color + + #060606 + + #5B5B5B + + #1c3aa9 + #2a56c6 + + #546E7A + #607D8B + + + #000000 + + @color/contacts_accent_color + + + #525252 + + + @android:color/white + + + #000000 + + + #252323 + + #2aad6f + #ff2e58 + + + @color/background_primary + + + #BEBDBD + + + #40B0AEAE + + + #40CBCBCB + + + #26C1C1C1 + + + #4DC6C6C6 + + + #343434 + + + #0f9d58 + #dd4b37 + #4285f4 + #f4b400 + + + #A0000000 + + + #CBCACA + + @color/dialtacts_secondary_text_color + + + @color/dialtacts_theme_color + + + #C9C9C9 + + + #2a56c6 + + + #393838 + + + #D5D5D5 + + + #C8C8C8 + + #7FFFFFFF + + #060606 + #FFF + + + + #DB4437 + #E91E63 + #9C27B0 + #673AB7 + #3F51B5 + #4285F4 + #039BE5 + #0097A7 + #009688 + #0F9D58 + #689F38 + #EF6C00 + #FF5722 + #757575 + + + + + #C53929 + #C2185B + #7B1FA2 + #512DA8 + #303F9F + #3367D6 + #0277BD + #006064 + #00796B + #0B8043 + #33691E + #E65100 + #E64A19 + #424242 + + + + #607D8B + + #455A64 + + + #4B4B4B + + #000000 + + + #000000 + + + @color/actionbar_background_color + + + #000000 + + #8CFFFFFF + + #DFFFFFFF + + #C8C7C7 + + + #FFFFFF + + #000000 + + #66FFFFFF + + @color/dialtacts_theme_color + + + #181717 + #2C2C2C + + + #d1041c + + + #FFFFFF + + + #414141 + + + #8000C853 + + + #000000 + @color/searchbox_hint_text_color + + + #000000 + + #9C9C9C + + + @color/actionbar_text_color_black + #444444 + + #80F50057 + + + #EAEAEA + + + #7f7f7f + + + #585858 + + + #252424 + + + #181717 + + + #1F1F1F + + + #1AFFFFFF + + @android:color/black + @android:color/black + @color/background_primary + diff --git a/res/values/colors.xml b/res/values/colors.xml index aeba877162..f64268f044 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -256,4 +256,7 @@ #1A000000 + @android:color/white + @android:color/white + @android:color/transparent From 394d997dfb863dadd83de3c7b988cb28c281c1ea Mon Sep 17 00:00:00 2001 From: Pratyush Date: Thu, 24 Nov 2022 14:54:34 +0530 Subject: [PATCH 12/34] replace/remove hardcoded color with attribute color/ res reference --- res/drawable-sw600dp/quantum_launchscreen_contacts.xml | 2 +- res/drawable/floating_action_button.xml | 2 +- res/drawable/item_background_material_dark.xml | 2 +- res/drawable/quantum_ic_account_circle_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_add_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_arrow_back_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_arrow_drop_down_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_assistant_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_business_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_call_received_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_camera_alt_vd_theme_24.xml | 4 ++-- res/drawable/quantum_ic_cancel_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_circles_ext_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_close_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_content_copy_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_create_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_delete_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_dialer_sip_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_directions_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_done_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_email_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_error_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_event_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_expand_less_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_expand_more_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_hangout_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_hangout_video_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_help_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_history_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_insert_comment_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_label_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_link_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_menu_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_message_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_mic_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_more_vert_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_perm_phone_msg_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_person_add_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_person_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_phone_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_place_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_public_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_search_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_settings_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_share_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_sim_card_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_smartphone_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_star_border_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_star_vd_theme_24.xml | 2 +- res/drawable/quantum_ic_videocam_vd_theme_24.xml | 2 +- res/drawable/quantum_launchscreen_contacts.xml | 2 +- res/layout/contact_list_content.xml | 1 - res/layout/drawer_primary_item.xml | 2 +- res/layout/empty_account_view.xml | 1 - res/layout/empty_group_view.xml | 1 - res/layout/fragment_sim_import.xml | 2 +- res/layout/photo_editor_view.xml | 2 +- res/values/styles.xml | 2 +- 58 files changed, 56 insertions(+), 59 deletions(-) diff --git a/res/drawable-sw600dp/quantum_launchscreen_contacts.xml b/res/drawable-sw600dp/quantum_launchscreen_contacts.xml index 0272a01c33..7da5bca3fd 100755 --- a/res/drawable-sw600dp/quantum_launchscreen_contacts.xml +++ b/res/drawable-sw600dp/quantum_launchscreen_contacts.xml @@ -16,7 +16,7 @@ - + diff --git a/res/drawable/floating_action_button.xml b/res/drawable/floating_action_button.xml index 796920e204..3d88ffc346 100644 --- a/res/drawable/floating_action_button.xml +++ b/res/drawable/floating_action_button.xml @@ -18,7 +18,7 @@ android:color="@color/contacts_accent_color"> - + \ No newline at end of file diff --git a/res/drawable/item_background_material_dark.xml b/res/drawable/item_background_material_dark.xml index 87b1e17471..ebbc6f1668 100644 --- a/res/drawable/item_background_material_dark.xml +++ b/res/drawable/item_background_material_dark.xml @@ -18,6 +18,6 @@ - + \ No newline at end of file diff --git a/res/drawable/quantum_ic_account_circle_vd_theme_24.xml b/res/drawable/quantum_ic_account_circle_vd_theme_24.xml index df2f6e7a63..afadabb9c5 100644 --- a/res/drawable/quantum_ic_account_circle_vd_theme_24.xml +++ b/res/drawable/quantum_ic_account_circle_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_add_vd_theme_24.xml b/res/drawable/quantum_ic_add_vd_theme_24.xml index 167dafee63..d2d9d37a8f 100644 --- a/res/drawable/quantum_ic_add_vd_theme_24.xml +++ b/res/drawable/quantum_ic_add_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_arrow_back_vd_theme_24.xml b/res/drawable/quantum_ic_arrow_back_vd_theme_24.xml index 174cf12fba..158febd6dc 100644 --- a/res/drawable/quantum_ic_arrow_back_vd_theme_24.xml +++ b/res/drawable/quantum_ic_arrow_back_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_arrow_drop_down_vd_theme_24.xml b/res/drawable/quantum_ic_arrow_drop_down_vd_theme_24.xml index 87c39de0b6..f3b75b1e97 100644 --- a/res/drawable/quantum_ic_arrow_drop_down_vd_theme_24.xml +++ b/res/drawable/quantum_ic_arrow_drop_down_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_assistant_vd_theme_24.xml b/res/drawable/quantum_ic_assistant_vd_theme_24.xml index 2d5135bda9..3f45f6877c 100644 --- a/res/drawable/quantum_ic_assistant_vd_theme_24.xml +++ b/res/drawable/quantum_ic_assistant_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_business_vd_theme_24.xml b/res/drawable/quantum_ic_business_vd_theme_24.xml index 684265b4f4..f58a9dfce8 100644 --- a/res/drawable/quantum_ic_business_vd_theme_24.xml +++ b/res/drawable/quantum_ic_business_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> \ No newline at end of file diff --git a/res/drawable/quantum_ic_call_received_vd_theme_24.xml b/res/drawable/quantum_ic_call_received_vd_theme_24.xml index 3793f74b73..b74b63ce8b 100644 --- a/res/drawable/quantum_ic_call_received_vd_theme_24.xml +++ b/res/drawable/quantum_ic_call_received_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> \ No newline at end of file diff --git a/res/drawable/quantum_ic_camera_alt_vd_theme_24.xml b/res/drawable/quantum_ic_camera_alt_vd_theme_24.xml index 07ed76be11..49a16e74bb 100644 --- a/res/drawable/quantum_ic_camera_alt_vd_theme_24.xml +++ b/res/drawable/quantum_ic_camera_alt_vd_theme_24.xml @@ -21,9 +21,9 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_cancel_vd_theme_24.xml b/res/drawable/quantum_ic_cancel_vd_theme_24.xml index 409ba75eb2..59acf99ce0 100644 --- a/res/drawable/quantum_ic_cancel_vd_theme_24.xml +++ b/res/drawable/quantum_ic_cancel_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_circles_ext_vd_theme_24.xml b/res/drawable/quantum_ic_circles_ext_vd_theme_24.xml index 73baff2682..527b636d9d 100644 --- a/res/drawable/quantum_ic_circles_ext_vd_theme_24.xml +++ b/res/drawable/quantum_ic_circles_ext_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_close_vd_theme_24.xml b/res/drawable/quantum_ic_close_vd_theme_24.xml index 0aafe4b5a1..f677bdfc06 100644 --- a/res/drawable/quantum_ic_close_vd_theme_24.xml +++ b/res/drawable/quantum_ic_close_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_content_copy_vd_theme_24.xml b/res/drawable/quantum_ic_content_copy_vd_theme_24.xml index b43eb4aada..754d2307c1 100644 --- a/res/drawable/quantum_ic_content_copy_vd_theme_24.xml +++ b/res/drawable/quantum_ic_content_copy_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_create_vd_theme_24.xml b/res/drawable/quantum_ic_create_vd_theme_24.xml index 8f161bc438..e35194688c 100644 --- a/res/drawable/quantum_ic_create_vd_theme_24.xml +++ b/res/drawable/quantum_ic_create_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_delete_vd_theme_24.xml b/res/drawable/quantum_ic_delete_vd_theme_24.xml index 698a0bcfed..0a5742721a 100644 --- a/res/drawable/quantum_ic_delete_vd_theme_24.xml +++ b/res/drawable/quantum_ic_delete_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_dialer_sip_vd_theme_24.xml b/res/drawable/quantum_ic_dialer_sip_vd_theme_24.xml index 6ef33dbd0d..094721c81c 100644 --- a/res/drawable/quantum_ic_dialer_sip_vd_theme_24.xml +++ b/res/drawable/quantum_ic_dialer_sip_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_directions_vd_theme_24.xml b/res/drawable/quantum_ic_directions_vd_theme_24.xml index 7da99e052f..9a02be6bf3 100644 --- a/res/drawable/quantum_ic_directions_vd_theme_24.xml +++ b/res/drawable/quantum_ic_directions_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> \ No newline at end of file diff --git a/res/drawable/quantum_ic_done_vd_theme_24.xml b/res/drawable/quantum_ic_done_vd_theme_24.xml index 0c810e80e4..51918f96cc 100644 --- a/res/drawable/quantum_ic_done_vd_theme_24.xml +++ b/res/drawable/quantum_ic_done_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_email_vd_theme_24.xml b/res/drawable/quantum_ic_email_vd_theme_24.xml index 724f45a770..7b3f6a39eb 100644 --- a/res/drawable/quantum_ic_email_vd_theme_24.xml +++ b/res/drawable/quantum_ic_email_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_error_vd_theme_24.xml b/res/drawable/quantum_ic_error_vd_theme_24.xml index b9dbeb41db..8715a1f7fc 100644 --- a/res/drawable/quantum_ic_error_vd_theme_24.xml +++ b/res/drawable/quantum_ic_error_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_event_vd_theme_24.xml b/res/drawable/quantum_ic_event_vd_theme_24.xml index e0107b1231..880b6c19e8 100644 --- a/res/drawable/quantum_ic_event_vd_theme_24.xml +++ b/res/drawable/quantum_ic_event_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_expand_less_vd_theme_24.xml b/res/drawable/quantum_ic_expand_less_vd_theme_24.xml index 2f60a68c04..df768ca301 100644 --- a/res/drawable/quantum_ic_expand_less_vd_theme_24.xml +++ b/res/drawable/quantum_ic_expand_less_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_expand_more_vd_theme_24.xml b/res/drawable/quantum_ic_expand_more_vd_theme_24.xml index 9fbfe48ec3..9ef3c337c7 100644 --- a/res/drawable/quantum_ic_expand_more_vd_theme_24.xml +++ b/res/drawable/quantum_ic_expand_more_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_hangout_vd_theme_24.xml b/res/drawable/quantum_ic_hangout_vd_theme_24.xml index ab07ba8fd0..83c94da19f 100644 --- a/res/drawable/quantum_ic_hangout_vd_theme_24.xml +++ b/res/drawable/quantum_ic_hangout_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_hangout_video_vd_theme_24.xml b/res/drawable/quantum_ic_hangout_video_vd_theme_24.xml index 1ce818a97d..38359c81f6 100644 --- a/res/drawable/quantum_ic_hangout_video_vd_theme_24.xml +++ b/res/drawable/quantum_ic_hangout_video_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_help_vd_theme_24.xml b/res/drawable/quantum_ic_help_vd_theme_24.xml index 385d7204c9..a3113c6aa8 100644 --- a/res/drawable/quantum_ic_help_vd_theme_24.xml +++ b/res/drawable/quantum_ic_help_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_history_vd_theme_24.xml b/res/drawable/quantum_ic_history_vd_theme_24.xml index 51621fd908..6ab16a34fb 100644 --- a/res/drawable/quantum_ic_history_vd_theme_24.xml +++ b/res/drawable/quantum_ic_history_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_insert_comment_vd_theme_24.xml b/res/drawable/quantum_ic_insert_comment_vd_theme_24.xml index 247cb1bead..acce87077d 100644 --- a/res/drawable/quantum_ic_insert_comment_vd_theme_24.xml +++ b/res/drawable/quantum_ic_insert_comment_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_label_vd_theme_24.xml b/res/drawable/quantum_ic_label_vd_theme_24.xml index 5630805057..bdad914e07 100644 --- a/res/drawable/quantum_ic_label_vd_theme_24.xml +++ b/res/drawable/quantum_ic_label_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_link_vd_theme_24.xml b/res/drawable/quantum_ic_link_vd_theme_24.xml index 67a167ebab..6a2cf120d8 100644 --- a/res/drawable/quantum_ic_link_vd_theme_24.xml +++ b/res/drawable/quantum_ic_link_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_menu_vd_theme_24.xml b/res/drawable/quantum_ic_menu_vd_theme_24.xml index ba6adcbc42..5d9f8645cc 100644 --- a/res/drawable/quantum_ic_menu_vd_theme_24.xml +++ b/res/drawable/quantum_ic_menu_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_message_vd_theme_24.xml b/res/drawable/quantum_ic_message_vd_theme_24.xml index a06a1da6ef..5ed19af5ef 100644 --- a/res/drawable/quantum_ic_message_vd_theme_24.xml +++ b/res/drawable/quantum_ic_message_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_mic_vd_theme_24.xml b/res/drawable/quantum_ic_mic_vd_theme_24.xml index ea4bef41bd..0cc9ad8fb4 100644 --- a/res/drawable/quantum_ic_mic_vd_theme_24.xml +++ b/res/drawable/quantum_ic_mic_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_more_vert_vd_theme_24.xml b/res/drawable/quantum_ic_more_vert_vd_theme_24.xml index 442451fe1c..638f50aae9 100644 --- a/res/drawable/quantum_ic_more_vert_vd_theme_24.xml +++ b/res/drawable/quantum_ic_more_vert_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_perm_phone_msg_vd_theme_24.xml b/res/drawable/quantum_ic_perm_phone_msg_vd_theme_24.xml index d7e0fb430c..b6dcab5019 100644 --- a/res/drawable/quantum_ic_perm_phone_msg_vd_theme_24.xml +++ b/res/drawable/quantum_ic_perm_phone_msg_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_person_add_vd_theme_24.xml b/res/drawable/quantum_ic_person_add_vd_theme_24.xml index 48a017f334..1ae6abb0a0 100644 --- a/res/drawable/quantum_ic_person_add_vd_theme_24.xml +++ b/res/drawable/quantum_ic_person_add_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_person_vd_theme_24.xml b/res/drawable/quantum_ic_person_vd_theme_24.xml index a5d9c8c063..2674d25725 100644 --- a/res/drawable/quantum_ic_person_vd_theme_24.xml +++ b/res/drawable/quantum_ic_person_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_phone_vd_theme_24.xml b/res/drawable/quantum_ic_phone_vd_theme_24.xml index 8d37e2bfed..e60f4ab035 100644 --- a/res/drawable/quantum_ic_phone_vd_theme_24.xml +++ b/res/drawable/quantum_ic_phone_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_place_vd_theme_24.xml b/res/drawable/quantum_ic_place_vd_theme_24.xml index 4276861aa7..ad5f075259 100644 --- a/res/drawable/quantum_ic_place_vd_theme_24.xml +++ b/res/drawable/quantum_ic_place_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_public_vd_theme_24.xml b/res/drawable/quantum_ic_public_vd_theme_24.xml index 6dffe5ce23..972f994cf0 100644 --- a/res/drawable/quantum_ic_public_vd_theme_24.xml +++ b/res/drawable/quantum_ic_public_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_search_vd_theme_24.xml b/res/drawable/quantum_ic_search_vd_theme_24.xml index 5c5632a84b..97a63c2e25 100644 --- a/res/drawable/quantum_ic_search_vd_theme_24.xml +++ b/res/drawable/quantum_ic_search_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_settings_vd_theme_24.xml b/res/drawable/quantum_ic_settings_vd_theme_24.xml index 1867c79553..032d2e34f8 100644 --- a/res/drawable/quantum_ic_settings_vd_theme_24.xml +++ b/res/drawable/quantum_ic_settings_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_share_vd_theme_24.xml b/res/drawable/quantum_ic_share_vd_theme_24.xml index f024a22efd..f07bcf3e12 100644 --- a/res/drawable/quantum_ic_share_vd_theme_24.xml +++ b/res/drawable/quantum_ic_share_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_sim_card_vd_theme_24.xml b/res/drawable/quantum_ic_sim_card_vd_theme_24.xml index 2bc9387f6a..b4d0dffa18 100644 --- a/res/drawable/quantum_ic_sim_card_vd_theme_24.xml +++ b/res/drawable/quantum_ic_sim_card_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_smartphone_vd_theme_24.xml b/res/drawable/quantum_ic_smartphone_vd_theme_24.xml index 9f987e75cb..dd89af92c4 100644 --- a/res/drawable/quantum_ic_smartphone_vd_theme_24.xml +++ b/res/drawable/quantum_ic_smartphone_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_star_border_vd_theme_24.xml b/res/drawable/quantum_ic_star_border_vd_theme_24.xml index e266072cde..cb8dd01403 100644 --- a/res/drawable/quantum_ic_star_border_vd_theme_24.xml +++ b/res/drawable/quantum_ic_star_border_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_star_vd_theme_24.xml b/res/drawable/quantum_ic_star_vd_theme_24.xml index f5a93c6f03..be5f05802d 100644 --- a/res/drawable/quantum_ic_star_vd_theme_24.xml +++ b/res/drawable/quantum_ic_star_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_ic_videocam_vd_theme_24.xml b/res/drawable/quantum_ic_videocam_vd_theme_24.xml index 87408576b6..09969480f4 100644 --- a/res/drawable/quantum_ic_videocam_vd_theme_24.xml +++ b/res/drawable/quantum_ic_videocam_vd_theme_24.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/quantum_launchscreen_contacts.xml b/res/drawable/quantum_launchscreen_contacts.xml index 276b2da337..b64cfa81fb 100755 --- a/res/drawable/quantum_launchscreen_contacts.xml +++ b/res/drawable/quantum_launchscreen_contacts.xml @@ -16,7 +16,7 @@ - + diff --git a/res/layout/contact_list_content.xml b/res/layout/contact_list_content.xml index 901e04c661..5694f89761 100644 --- a/res/layout/contact_list_content.xml +++ b/res/layout/contact_list_content.xml @@ -45,7 +45,6 @@ android:paddingTop="16dp" android:paddingBottom="16dp" android:layout_weight="1" - android:textColor="@android:color/black" android:textSize="16sp"/> \ No newline at end of file diff --git a/res/layout/empty_account_view.xml b/res/layout/empty_account_view.xml index 2de0212e25..7eeea0a8af 100644 --- a/res/layout/empty_account_view.xml +++ b/res/layout/empty_account_view.xml @@ -5,7 +5,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:background="@color/empty_state_background" android:visibility="gone"> From 737abc51dc8ccd36056f617cf05cf999ad6445c9 Mon Sep 17 00:00:00 2001 From: Pratyush Date: Thu, 24 Nov 2022 14:58:18 +0530 Subject: [PATCH 13/34] remove extra '>' symbol --- res/layout/quickcontact_collapsed_suggestion_card.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/layout/quickcontact_collapsed_suggestion_card.xml b/res/layout/quickcontact_collapsed_suggestion_card.xml index ac2ec499c2..92e8b1e9c7 100644 --- a/res/layout/quickcontact_collapsed_suggestion_card.xml +++ b/res/layout/quickcontact_collapsed_suggestion_card.xml @@ -59,6 +59,6 @@ android:paddingEnd="@dimen/editor_round_button_padding_right" android:paddingTop="@dimen/editor_round_button_padding_top" android:paddingBottom="@dimen/editor_round_button_padding_bottom"/> - > + \ No newline at end of file From b7b3dcfa7f221366687690bc46e3ebdba1979275 Mon Sep 17 00:00:00 2001 From: Pratyush Date: Thu, 24 Nov 2022 19:22:17 +0530 Subject: [PATCH 14/34] replace Light theme with DayNight theme --- res/values/styles.xml | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/res/values/styles.xml b/res/values/styles.xml index 569876901a..28a32b75fa 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -39,7 +39,7 @@ - - - - - @@ -451,13 +454,13 @@ background and text color. See also android:style/Widget.Holo.TextView.ListSepar #737373 - - @@ -467,7 +470,7 @@ background and text color. See also android:style/Widget.Holo.TextView.ListSepar match_parent - - - diff --git a/src/com/android/contacts/list/AccountFilterActivity.java b/src/com/android/contacts/list/AccountFilterActivity.java index 6559489fd6..711a838769 100644 --- a/src/com/android/contacts/list/AccountFilterActivity.java +++ b/src/com/android/contacts/list/AccountFilterActivity.java @@ -16,7 +16,6 @@ package com.android.contacts.list; -import android.app.ActionBar; import android.app.Activity; import android.content.Context; import android.content.Intent; @@ -29,6 +28,8 @@ import android.widget.BaseAdapter; import android.widget.ListView; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import com.android.contacts.R; import com.android.contacts.model.AccountTypeManager; @@ -39,7 +40,7 @@ * Shows a list of all available accounts, letting the user select under which account to view * contacts. */ -public class AccountFilterActivity extends Activity implements AdapterView.OnItemClickListener { +public class AccountFilterActivity extends AppCompatActivity implements AdapterView.OnItemClickListener { private static final int SUBACTIVITY_CUSTOMIZE_FILTER = 0; @@ -63,7 +64,7 @@ protected void onCreate(Bundle icicle) { mListView = (ListView) findViewById(android.R.id.list); mListView.setOnItemClickListener(this); - ActionBar actionBar = getActionBar(); + ActionBar actionBar = getSupportActionBar(); if (actionBar != null) { actionBar.setDisplayHomeAsUpEnabled(true); } diff --git a/src/com/android/contacts/list/CustomContactListFilterActivity.java b/src/com/android/contacts/list/CustomContactListFilterActivity.java index 5bc3c3508a..876e4b26fa 100644 --- a/src/com/android/contacts/list/CustomContactListFilterActivity.java +++ b/src/com/android/contacts/list/CustomContactListFilterActivity.java @@ -16,7 +16,6 @@ package com.android.contacts.list; -import android.app.ActionBar; import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; @@ -56,6 +55,9 @@ import android.widget.ExpandableListView.ExpandableListContextMenuInfo; import android.widget.TextView; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; + import com.android.contacts.R; import com.android.contacts.model.AccountTypeManager; import com.android.contacts.model.ValuesDelta; @@ -84,7 +86,7 @@ * Shows a list of all available {@link Groups} available, letting the user * select which ones they want to be visible. */ -public class CustomContactListFilterActivity extends Activity implements +public class CustomContactListFilterActivity extends AppCompatActivity implements ExpandableListView.OnChildClickListener, LoaderCallbacks { private static final String TAG = "CustomContactListFilter"; @@ -125,7 +127,8 @@ public void onLayoutChange(final View v, final int left, final int top, final in mList.setAdapter(mAdapter); - ActionBar actionBar = getActionBar(); + + ActionBar actionBar = getSupportActionBar(); if (actionBar != null) { // android.R.id.home will be triggered in onOptionsItemSelected() actionBar.setDisplayHomeAsUpEnabled(true); From 4f9faed90bdb0d959d8434ebcf3fee81bb48b063 Mon Sep 17 00:00:00 2001 From: Pratyush Date: Thu, 24 Nov 2022 21:23:12 +0530 Subject: [PATCH 17/34] change color name rename color based what it being used for, i.e "quantum_black" gives impression like it is a black color but depending on theme it could be black or white. --- .../ic_add_contact_shortcut.xml | 2 +- res/drawable/ic_add_circle_24dp.xml | 2 +- res/drawable/ic_add_contact_shortcut.xml | 2 +- res/layout/edit_delete_button.xml | 2 +- res/layout/editor_account_header.xml | 2 +- res/layout/name_edit_expansion_view.xml | 2 +- res/layout/raw_contact_list_item.xml | 4 ++-- res/layout/search_bar_expanded.xml | 2 +- res/layout/selection_bar.xml | 2 +- res/values-night/colors.xml | 14 ++++---------- res/values/colors.xml | 14 ++++---------- res/values/styles.xml | 4 ++-- 12 files changed, 20 insertions(+), 32 deletions(-) diff --git a/res/drawable-anydpi-v26/ic_add_contact_shortcut.xml b/res/drawable-anydpi-v26/ic_add_contact_shortcut.xml index fbd7a09a9a..3d39d4c3b7 100644 --- a/res/drawable-anydpi-v26/ic_add_contact_shortcut.xml +++ b/res/drawable-anydpi-v26/ic_add_contact_shortcut.xml @@ -14,6 +14,6 @@ limitations under the License. --> - + \ No newline at end of file diff --git a/res/drawable/ic_add_circle_24dp.xml b/res/drawable/ic_add_circle_24dp.xml index ebaab3498f..22a40d5f87 100644 --- a/res/drawable/ic_add_circle_24dp.xml +++ b/res/drawable/ic_add_circle_24dp.xml @@ -20,7 +20,7 @@ android:width="24dp" android:viewportHeight="192.0" android:viewportWidth="192.0"> - diff --git a/res/drawable/ic_add_contact_shortcut.xml b/res/drawable/ic_add_contact_shortcut.xml index 85a7e61bd7..b995d42e36 100644 --- a/res/drawable/ic_add_contact_shortcut.xml +++ b/res/drawable/ic_add_contact_shortcut.xml @@ -20,7 +20,7 @@ android:width="24dp" android:viewportHeight="192.0" android:viewportWidth="192.0"> - diff --git a/res/layout/edit_delete_button.xml b/res/layout/edit_delete_button.xml index 2eea95057b..4f80eb4a63 100644 --- a/res/layout/edit_delete_button.xml +++ b/res/layout/edit_delete_button.xml @@ -30,7 +30,7 @@ android:duplicateParentState="true" android:background="?android:attr/selectableItemBackground" android:src="@drawable/quantum_ic_close_vd_theme_24" - android:tint="@color/quantum_black_hint_text" + android:tint="@color/hint_text_color" android:paddingLeft="@dimen/editor_round_button_padding_left" android:paddingRight="@dimen/editor_round_button_padding_right" android:paddingStart="@dimen/editor_round_button_padding_left" diff --git a/res/layout/editor_account_header.xml b/res/layout/editor_account_header.xml index 9a4ed803b4..db2a29150f 100644 --- a/res/layout/editor_account_header.xml +++ b/res/layout/editor_account_header.xml @@ -67,7 +67,7 @@ @@ -63,7 +63,7 @@ diff --git a/res/layout/selection_bar.xml b/res/layout/selection_bar.xml index 272a2fcf9d..c4b2b103c0 100644 --- a/res/layout/selection_bar.xml +++ b/res/layout/selection_bar.xml @@ -25,7 +25,7 @@ android:layout_width="@dimen/selection_bar_close_icon_size" android:layout_height="@dimen/selection_bar_close_icon_size" android:layout_gravity="center_vertical|start" - android:tint="@color/quantum_black_secondary_text" + android:tint="@color/text_color_secondary" android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/action_menu_back_from_edit_select" android:src="@drawable/quantum_ic_close_vd_theme_24"/> diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml index 1f132888e9..96291c65fd 100644 --- a/res/values-night/colors.xml +++ b/res/values-night/colors.xml @@ -14,16 +14,10 @@ limitations under the License. --> - #191919 - - - #DDFFFFFF - - - #D9FFFFFF - - - #61FFFFFF + #191919 + #DDFFFFFF + #D9FFFFFF + #61FFFFFF #B4B4B4 #D6D6D6 diff --git a/res/values/colors.xml b/res/values/colors.xml index f64268f044..635e08a0f3 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -14,16 +14,10 @@ limitations under the License. --> - #F5F5F5 - - - #dd000000 - - - #89000000 - - - #61000000 + #F5F5F5 + #dd000000 + #89000000 + #61000000 #737373 #202020 diff --git a/res/values/styles.xml b/res/values/styles.xml index 4f1e9a0892..709c333814 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -576,7 +576,7 @@ background and text color. See also android:style/Widget.Holo.TextView.ListSepar @@ -584,7 +584,7 @@ background and text color. See also android:style/Widget.Holo.TextView.ListSepar center_vertical|start 12dp 12dp - @color/quantum_black_secondary_text + @color/text_color_secondary 14sp From 0b5d68a325573fa61eeb3e0a5a5026cf86cfb473 Mon Sep 17 00:00:00 2001 From: Pratyush Date: Thu, 24 Nov 2022 23:07:21 +0530 Subject: [PATCH 18/34] migrate dialog to androidx dialog --- src/com/android/contacts/NonPhoneActivity.java | 2 +- .../activities/ContactEditorAccountsChangedActivity.java | 2 +- src/com/android/contacts/activities/ShowOrCreateActivity.java | 2 +- src/com/android/contacts/datepicker/DatePickerDialog.java | 2 +- src/com/android/contacts/dialog/ClearFrequentsDialog.java | 2 +- .../contacts/editor/JoinContactConfirmationDialogFragment.java | 2 +- src/com/android/contacts/editor/LabeledEditorView.java | 2 +- .../android/contacts/editor/PickRawContactDialogFragment.java | 2 +- .../android/contacts/editor/SelectAccountDialogFragment.java | 2 +- .../contacts/editor/SplitContactConfirmationDialogFragment.java | 2 +- .../contacts/interactions/ContactDeletionInteraction.java | 2 +- .../contacts/interactions/ContactMultiDeletionInteraction.java | 2 +- src/com/android/contacts/interactions/ExportDialogFragment.java | 2 +- .../contacts/interactions/GroupDeletionDialogFragment.java | 2 +- src/com/android/contacts/interactions/ImportDialogFragment.java | 2 +- .../android/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 | 2 +- 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 +- .../contacts/tests/allintents/SelectAccountDialogFragment.java | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/com/android/contacts/NonPhoneActivity.java b/src/com/android/contacts/NonPhoneActivity.java index ba56d70908..41766480fe 100644 --- a/src/com/android/contacts/NonPhoneActivity.java +++ b/src/com/android/contacts/NonPhoneActivity.java @@ -17,7 +17,7 @@ package com.android.contacts; import android.app.Activity; -import android.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.app.Dialog; import android.app.DialogFragment; import android.content.DialogInterface; diff --git a/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java b/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java index 1ae79a8bb4..67d0cfa931 100644 --- a/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java +++ b/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java @@ -17,7 +17,7 @@ package com.android.contacts.activities; import android.app.Activity; -import android.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; diff --git a/src/com/android/contacts/activities/ShowOrCreateActivity.java b/src/com/android/contacts/activities/ShowOrCreateActivity.java index 8c943640e0..2f229f021a 100755 --- a/src/com/android/contacts/activities/ShowOrCreateActivity.java +++ b/src/com/android/contacts/activities/ShowOrCreateActivity.java @@ -17,7 +17,7 @@ package com.android.contacts.activities; import android.app.Activity; -import android.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.app.Dialog; import android.content.ComponentName; import android.content.DialogInterface; diff --git a/src/com/android/contacts/datepicker/DatePickerDialog.java b/src/com/android/contacts/datepicker/DatePickerDialog.java index de04af92f8..c1161201d7 100644 --- a/src/com/android/contacts/datepicker/DatePickerDialog.java +++ b/src/com/android/contacts/datepicker/DatePickerDialog.java @@ -19,7 +19,7 @@ // This is a fork of the standard Android DatePicker that additionally allows toggling the year // on/off. -import android.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; diff --git a/src/com/android/contacts/dialog/ClearFrequentsDialog.java b/src/com/android/contacts/dialog/ClearFrequentsDialog.java index 7591de3ff7..9b74501169 100644 --- a/src/com/android/contacts/dialog/ClearFrequentsDialog.java +++ b/src/com/android/contacts/dialog/ClearFrequentsDialog.java @@ -16,7 +16,7 @@ package com.android.contacts.dialog; -import android.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.app.Dialog; import android.app.DialogFragment; import android.app.FragmentManager; diff --git a/src/com/android/contacts/editor/JoinContactConfirmationDialogFragment.java b/src/com/android/contacts/editor/JoinContactConfirmationDialogFragment.java index d238c384c5..983ca72b80 100644 --- a/src/com/android/contacts/editor/JoinContactConfirmationDialogFragment.java +++ b/src/com/android/contacts/editor/JoinContactConfirmationDialogFragment.java @@ -16,7 +16,7 @@ package com.android.contacts.editor; -import android.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.app.Dialog; import android.app.DialogFragment; import android.content.DialogInterface; diff --git a/src/com/android/contacts/editor/LabeledEditorView.java b/src/com/android/contacts/editor/LabeledEditorView.java index 3df322285a..9957ce3754 100644 --- a/src/com/android/contacts/editor/LabeledEditorView.java +++ b/src/com/android/contacts/editor/LabeledEditorView.java @@ -16,7 +16,7 @@ package com.android.contacts.editor; -import android.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; diff --git a/src/com/android/contacts/editor/PickRawContactDialogFragment.java b/src/com/android/contacts/editor/PickRawContactDialogFragment.java index 5a9c9fd07f..7af2b24737 100644 --- a/src/com/android/contacts/editor/PickRawContactDialogFragment.java +++ b/src/com/android/contacts/editor/PickRawContactDialogFragment.java @@ -1,6 +1,6 @@ package com.android.contacts.editor; -import android.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.app.Dialog; import android.app.DialogFragment; import android.content.Context; diff --git a/src/com/android/contacts/editor/SelectAccountDialogFragment.java b/src/com/android/contacts/editor/SelectAccountDialogFragment.java index 3b41c86ade..dfe0d3783b 100644 --- a/src/com/android/contacts/editor/SelectAccountDialogFragment.java +++ b/src/com/android/contacts/editor/SelectAccountDialogFragment.java @@ -17,7 +17,7 @@ package com.android.contacts.editor; import android.app.Activity; -import android.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.app.Dialog; import android.app.DialogFragment; import android.app.FragmentManager; diff --git a/src/com/android/contacts/editor/SplitContactConfirmationDialogFragment.java b/src/com/android/contacts/editor/SplitContactConfirmationDialogFragment.java index 9b4e2348cc..7816e063a2 100644 --- a/src/com/android/contacts/editor/SplitContactConfirmationDialogFragment.java +++ b/src/com/android/contacts/editor/SplitContactConfirmationDialogFragment.java @@ -16,7 +16,7 @@ package com.android.contacts.editor; -import android.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.app.Dialog; import android.app.DialogFragment; import android.app.Fragment; diff --git a/src/com/android/contacts/interactions/ContactDeletionInteraction.java b/src/com/android/contacts/interactions/ContactDeletionInteraction.java index 7438f0df38..335eb244ba 100644 --- a/src/com/android/contacts/interactions/ContactDeletionInteraction.java +++ b/src/com/android/contacts/interactions/ContactDeletionInteraction.java @@ -17,7 +17,6 @@ package com.android.contacts.interactions; import android.app.Activity; -import android.app.AlertDialog; import android.app.Fragment; import android.app.FragmentManager; import android.app.LoaderManager; @@ -36,6 +35,7 @@ import android.text.TextUtils; import android.util.Log; import android.widget.Toast; +import androidx.appcompat.app.AlertDialog; import com.android.contacts.ContactSaveService; import com.android.contacts.R; diff --git a/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java b/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java index 47b76a5399..2d2f62b8f8 100644 --- a/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java +++ b/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java @@ -17,7 +17,7 @@ package com.android.contacts.interactions; import android.app.Activity; -import android.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.app.Fragment; import android.app.FragmentManager; import android.app.LoaderManager.LoaderCallbacks; diff --git a/src/com/android/contacts/interactions/ExportDialogFragment.java b/src/com/android/contacts/interactions/ExportDialogFragment.java index c7ce072302..44a34a9b72 100644 --- a/src/com/android/contacts/interactions/ExportDialogFragment.java +++ b/src/com/android/contacts/interactions/ExportDialogFragment.java @@ -17,7 +17,7 @@ package com.android.contacts.interactions; import android.app.Activity; -import android.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.app.Dialog; import android.app.DialogFragment; import android.app.FragmentManager; diff --git a/src/com/android/contacts/interactions/GroupDeletionDialogFragment.java b/src/com/android/contacts/interactions/GroupDeletionDialogFragment.java index 01361b2a37..32898cc32b 100644 --- a/src/com/android/contacts/interactions/GroupDeletionDialogFragment.java +++ b/src/com/android/contacts/interactions/GroupDeletionDialogFragment.java @@ -15,7 +15,7 @@ */ package com.android.contacts.interactions; -import android.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.app.Dialog; import android.app.DialogFragment; import android.app.FragmentManager; diff --git a/src/com/android/contacts/interactions/ImportDialogFragment.java b/src/com/android/contacts/interactions/ImportDialogFragment.java index 693536a9bc..74f313b379 100644 --- a/src/com/android/contacts/interactions/ImportDialogFragment.java +++ b/src/com/android/contacts/interactions/ImportDialogFragment.java @@ -17,7 +17,7 @@ package com.android.contacts.interactions; import android.app.Activity; -import android.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.app.Dialog; import android.app.DialogFragment; import android.app.FragmentManager; diff --git a/src/com/android/contacts/list/CustomContactListFilterActivity.java b/src/com/android/contacts/list/CustomContactListFilterActivity.java index 876e4b26fa..ad5ddd7b5e 100644 --- a/src/com/android/contacts/list/CustomContactListFilterActivity.java +++ b/src/com/android/contacts/list/CustomContactListFilterActivity.java @@ -17,7 +17,7 @@ package com.android.contacts.list; import android.app.Activity; -import android.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.app.Dialog; import android.app.DialogFragment; import android.app.LoaderManager.LoaderCallbacks; diff --git a/src/com/android/contacts/list/EnableGlobalSyncDialogFragment.java b/src/com/android/contacts/list/EnableGlobalSyncDialogFragment.java index 08822d10c6..bf537bd0d6 100644 --- a/src/com/android/contacts/list/EnableGlobalSyncDialogFragment.java +++ b/src/com/android/contacts/list/EnableGlobalSyncDialogFragment.java @@ -16,7 +16,7 @@ package com.android.contacts.list; -import android.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.app.Dialog; import android.app.DialogFragment; import android.content.DialogInterface; diff --git a/src/com/android/contacts/util/AccountSelectionUtil.java b/src/com/android/contacts/util/AccountSelectionUtil.java index bfe8a08b30..e1444e5061 100644 --- a/src/com/android/contacts/util/AccountSelectionUtil.java +++ b/src/com/android/contacts/util/AccountSelectionUtil.java @@ -17,7 +17,7 @@ package com.android.contacts.util; import android.app.Activity; -import android.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; diff --git a/src/com/android/contacts/vcard/CancelActivity.java b/src/com/android/contacts/vcard/CancelActivity.java index a6b58cc86b..0dd691a252 100644 --- a/src/com/android/contacts/vcard/CancelActivity.java +++ b/src/com/android/contacts/vcard/CancelActivity.java @@ -16,7 +16,7 @@ package com.android.contacts.vcard; import android.app.Activity; -import android.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.app.Dialog; import android.content.ComponentName; import android.content.Context; diff --git a/src/com/android/contacts/vcard/ExportVCardActivity.java b/src/com/android/contacts/vcard/ExportVCardActivity.java index 87a1eb1d55..0c029db763 100755 --- a/src/com/android/contacts/vcard/ExportVCardActivity.java +++ b/src/com/android/contacts/vcard/ExportVCardActivity.java @@ -16,7 +16,7 @@ package com.android.contacts.vcard; import android.app.Activity; -import android.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.app.Dialog; import android.content.ComponentName; import android.content.Context; diff --git a/src/com/android/contacts/vcard/ImportVCardActivity.java b/src/com/android/contacts/vcard/ImportVCardActivity.java index 5696224320..24c00f8fe1 100644 --- a/src/com/android/contacts/vcard/ImportVCardActivity.java +++ b/src/com/android/contacts/vcard/ImportVCardActivity.java @@ -17,7 +17,7 @@ package com.android.contacts.vcard; import android.app.Activity; -import android.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.app.Dialog; import android.app.Notification; import android.app.NotificationManager; diff --git a/src/com/android/contacts/vcard/ImportVCardDialogFragment.java b/src/com/android/contacts/vcard/ImportVCardDialogFragment.java index 7ad67d1356..021cfb4efb 100644 --- a/src/com/android/contacts/vcard/ImportVCardDialogFragment.java +++ b/src/com/android/contacts/vcard/ImportVCardDialogFragment.java @@ -16,7 +16,7 @@ package com.android.contacts.vcard; import android.app.Activity; -import android.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.app.Dialog; import android.app.DialogFragment; import android.content.DialogInterface; diff --git a/src/com/android/contacts/widget/SelectPhoneAccountDialogFragment.java b/src/com/android/contacts/widget/SelectPhoneAccountDialogFragment.java index da2b468da6..0735c92ba8 100644 --- a/src/com/android/contacts/widget/SelectPhoneAccountDialogFragment.java +++ b/src/com/android/contacts/widget/SelectPhoneAccountDialogFragment.java @@ -16,7 +16,7 @@ package com.android.contacts.widget; -import android.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.app.Dialog; import android.app.DialogFragment; import android.content.Context; diff --git a/tests/src/com/android/contacts/tests/allintents/SelectAccountDialogFragment.java b/tests/src/com/android/contacts/tests/allintents/SelectAccountDialogFragment.java index 10661db8b8..41442329f7 100644 --- a/tests/src/com/android/contacts/tests/allintents/SelectAccountDialogFragment.java +++ b/tests/src/com/android/contacts/tests/allintents/SelectAccountDialogFragment.java @@ -18,7 +18,7 @@ import android.accounts.Account; import android.accounts.AccountManager; -import android.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.app.Dialog; import android.app.DialogFragment; import android.content.DialogInterface; From a15f70a9110efd3146afc848001fe38cd4de40d5 Mon Sep 17 00:00:00 2001 From: Pratyush Date: Sun, 9 Apr 2023 16:16:32 +0530 Subject: [PATCH 19/34] bug fixes: use appCompat theme while creating appcompat alertdialog --- src/com/android/contacts/activities/ShowOrCreateActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/contacts/activities/ShowOrCreateActivity.java b/src/com/android/contacts/activities/ShowOrCreateActivity.java index 2f229f021a..086565b83e 100755 --- a/src/com/android/contacts/activities/ShowOrCreateActivity.java +++ b/src/com/android/contacts/activities/ShowOrCreateActivity.java @@ -219,7 +219,7 @@ protected Dialog onCreateDialog(int id) { 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.Theme_AppCompat_DayNight_Dialog_Alert) .setMessage(message) .setPositiveButton(android.R.string.ok, new IntentClickListener(this, createIntent)) From 994aa98e626ad069726c1e581fb266118f08e6b5 Mon Sep 17 00:00:00 2001 From: Dmitry Muhomor Date: Mon, 15 May 2023 15:28:02 +0300 Subject: [PATCH 20/34] bugfix: finish activity when "Back" is triggered after ACTION_VIEW_GROUP Triggering "Back" action opened the list of all contacts, instead of taking the user back to the caller activity. --- .../contacts/activities/PeopleActivity.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java index ceb3d59e91..fc908f350a 100644 --- a/src/com/android/contacts/activities/PeopleActivity.java +++ b/src/com/android/contacts/activities/PeopleActivity.java @@ -521,7 +521,11 @@ private boolean processIntent(boolean forNewIntent) { onCreateGroupMenuItemClicked(); return true; } - case ContactsRequest.ACTION_VIEW_GROUP: + case ContactsRequest.ACTION_VIEW_GROUP: { + mShouldSwitchToGroupView = true; + mIsLaunchedIntoGroupView = true; + return true; + } case ContactsRequest.ACTION_EDIT_GROUP: { mShouldSwitchToGroupView = true; return true; @@ -801,6 +805,10 @@ public void onBackPressed() { closeDrawer(); return; } + if (mIsLaunchedIntoGroupView) { + finish(); + return; + } // Handle the back event in "second level". if (isGroupView()) { @@ -906,12 +914,17 @@ protected void onSaveInstanceState(Bundle outState) { } outState.putInt(KEY_CONTACTS_VIEW, mCurrentView.ordinal()); outState.putParcelable(KEY_GROUP_URI, mGroupUri); + outState.putBoolean(KEY_LAUNCHED_INTO_GROUP_VIEW, mIsLaunchedIntoGroupView); } + private static final String KEY_LAUNCHED_INTO_GROUP_VIEW = "isLaunchedIntoGroupView"; + private boolean mIsLaunchedIntoGroupView; + @Override protected void onRestoreInstanceState(Bundle savedInstanceState) { super.onRestoreInstanceState(savedInstanceState); mGroupUri = savedInstanceState.getParcelable(KEY_GROUP_URI); + mIsLaunchedIntoGroupView = savedInstanceState.getBoolean(KEY_LAUNCHED_INTO_GROUP_VIEW, false); } private void onGroupDeleted(final Intent intent) { From a95c804ad2d09d4093f336532cc024dfc8a23e40 Mon Sep 17 00:00:00 2001 From: Dmitry Muhomor Date: Thu, 18 May 2023 13:08:13 +0300 Subject: [PATCH 21/34] support EXTRA_ALLOW_MULTIPLE in phone number and email pickers This lets the caller ask for multiple items by passing the EXTRA_ALLOW_MULTIPLE intent extra. --- res/values/strings.xml | 2 + .../contacts/list/ContactsIntentResolver.java | 12 +++++- .../list/MultiSelectContactsListFragment.java | 42 +++++++++++++++++++ ...MultiSelectEmailAddressesListFragment.java | 11 +++++ .../MultiSelectPhoneNumbersListFragment.java | 11 +++++ 5 files changed, 76 insertions(+), 2 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 2d9a185223..0890232806 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1555,4 +1555,6 @@ Carrier service numbers + Select + \ No newline at end of file diff --git a/src/com/android/contacts/list/ContactsIntentResolver.java b/src/com/android/contacts/list/ContactsIntentResolver.java index 7cf9f5ad49..e5f4df127d 100644 --- a/src/com/android/contacts/list/ContactsIntentResolver.java +++ b/src/com/android/contacts/list/ContactsIntentResolver.java @@ -89,7 +89,11 @@ public ContactsRequest resolveIntent(Intent intent) { request.setActionCode(ContactsRequest.ACTION_PICK_CONTACT); request.setLegacyCompatibilityMode(true); } else if (Phone.CONTENT_TYPE.equals(resolvedType)) { - request.setActionCode(ContactsRequest.ACTION_PICK_PHONE); + if (intent.getBooleanExtra(Intent.EXTRA_ALLOW_MULTIPLE, false)) { + request.setActionCode(ContactsRequest.ACTION_PICK_PHONES); + } else { + request.setActionCode(ContactsRequest.ACTION_PICK_PHONE); + } } else if (Phones.CONTENT_TYPE.equals(resolvedType)) { request.setActionCode(ContactsRequest.ACTION_PICK_PHONE); request.setLegacyCompatibilityMode(true); @@ -99,7 +103,11 @@ public ContactsRequest resolveIntent(Intent intent) { request.setActionCode(ContactsRequest.ACTION_PICK_POSTAL); request.setLegacyCompatibilityMode(true); } else if (Email.CONTENT_TYPE.equals(resolvedType)) { - request.setActionCode(ContactsRequest.ACTION_PICK_EMAIL); + if (intent.getBooleanExtra(Intent.EXTRA_ALLOW_MULTIPLE, false)) { + request.setActionCode(ContactsRequest.ACTION_PICK_EMAILS); + } else { + request.setActionCode(ContactsRequest.ACTION_PICK_EMAIL); + } } else if (Groups.CONTENT_TYPE.equals(resolvedType)) { request.setActionCode(ContactsRequest.ACTION_PICK_GROUP_MEMBERS); request.setAccountWithDataSet(new AccountWithDataSet( diff --git a/src/com/android/contacts/list/MultiSelectContactsListFragment.java b/src/com/android/contacts/list/MultiSelectContactsListFragment.java index 83b1ec910b..691e4f68e1 100644 --- a/src/com/android/contacts/list/MultiSelectContactsListFragment.java +++ b/src/com/android/contacts/list/MultiSelectContactsListFragment.java @@ -16,15 +16,19 @@ package com.android.contacts.list; +import android.content.ClipData; import android.content.Context; +import android.content.Intent; import android.database.Cursor; import android.graphics.drawable.Drawable; import android.icu.text.MessageFormat; +import android.net.Uri; import android.os.Bundle; import android.provider.ContactsContract; import androidx.core.view.ViewCompat; import android.util.Log; import android.view.LayoutInflater; +import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.view.accessibility.AccessibilityEvent; @@ -36,6 +40,7 @@ import com.android.contacts.R; import com.android.contacts.activities.ActionBarAdapter; +import com.android.contacts.activities.ContactSelectionActivity; import com.android.contacts.group.GroupMembersFragment; import com.android.contacts.list.MultiSelectEntryContactListAdapter.SelectedContactsListener; import com.android.contacts.logging.ListEvent.ActionType; @@ -51,6 +56,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Objects; import java.util.TreeSet; /** @@ -447,4 +453,40 @@ private void setListViewPaddingTop(View listView, int paddingTop) { public ActionBarAdapter getActionBarAdapter() { return null; } + + protected boolean isLaunchedForPickerIntent() { + return getArguments().getBoolean(Intent.EXTRA_ALLOW_MULTIPLE, false); + } + + protected void maybeUpdateMenuItemSendForPickerIntent(MenuItem item) { + if (isLaunchedForPickerIntent()) { + updateMenuItemSendForPickerIntent(item); + } + } + + protected void updateMenuItemSendForPickerIntent(MenuItem item) { + ((TextView) item.getActionView()).setText(R.string.multi_picker_select_action); + item.setTitle(R.string.multi_picker_select_action); + } + + protected void setResultAndFinish(long[] itemIds, Uri baseUri, String itemMimeType) { + var activity = (ContactSelectionActivity) getActivity(); + + ClipData cd = null; + for (long itemId : itemIds) { + Uri uri = baseUri.buildUpon().appendPath(Long.toString(itemId)).build(); + var cdi = new ClipData.Item(uri); + if (cd == null) { + String[] mimes = { itemMimeType }; + cd = new ClipData("", mimes, cdi); + } else { + cd.addItem(cdi); + } + } + + var i = new Intent(); + i.setClipData(Objects.requireNonNull(cd)); + + activity.returnPickerResult(i); + } } diff --git a/src/com/android/contacts/list/MultiSelectEmailAddressesListFragment.java b/src/com/android/contacts/list/MultiSelectEmailAddressesListFragment.java index 6f6a3c7ea2..6492193c3a 100644 --- a/src/com/android/contacts/list/MultiSelectEmailAddressesListFragment.java +++ b/src/com/android/contacts/list/MultiSelectEmailAddressesListFragment.java @@ -17,6 +17,7 @@ import android.content.Intent; import android.os.Bundle; +import android.provider.ContactsContract; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.Menu; @@ -68,6 +69,8 @@ public void onClick(View v) { onOptionsItemSelected(item); } }); + + maybeUpdateMenuItemSendForPickerIntent(item); } @Override @@ -78,6 +81,14 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) { @Override public boolean onOptionsItemSelected(MenuItem item) { if (item.getItemId() == R.id.menu_send) { + + if (isLaunchedForPickerIntent()) { + setResultAndFinish(getSelectedContactIdsArray(), + ContactsContract.CommonDataKinds.Email.CONTENT_URI, + ContactsContract.CommonDataKinds.Email.CONTENT_ITEM_TYPE); + return true; + } + final String scheme = getActivity().getIntent().getStringExtra( UiIntentActions.SELECTION_SEND_SCHEME); final String title = getActivity().getIntent().getStringExtra( diff --git a/src/com/android/contacts/list/MultiSelectPhoneNumbersListFragment.java b/src/com/android/contacts/list/MultiSelectPhoneNumbersListFragment.java index 2b7021e2e3..b7fda5c7a0 100644 --- a/src/com/android/contacts/list/MultiSelectPhoneNumbersListFragment.java +++ b/src/com/android/contacts/list/MultiSelectPhoneNumbersListFragment.java @@ -17,6 +17,7 @@ import android.content.Intent; import android.os.Bundle; +import android.provider.ContactsContract; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.Menu; @@ -68,6 +69,8 @@ public void onClick(View v) { onOptionsItemSelected(item); } }); + + maybeUpdateMenuItemSendForPickerIntent(item); } @Override @@ -78,6 +81,14 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) { @Override public boolean onOptionsItemSelected(MenuItem item) { if (item.getItemId() == R.id.menu_send) { + + if (isLaunchedForPickerIntent()) { + setResultAndFinish(getSelectedContactIdsArray(), + ContactsContract.CommonDataKinds.Phone.CONTENT_URI, + ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE); + return true; + } + final String scheme = getActivity().getIntent().getStringExtra( UiIntentActions.SELECTION_SEND_SCHEME); final String title = getActivity().getIntent().getStringExtra( From 5688abf8045ddb920d758dbc1c1dfbe13d85a7fa Mon Sep 17 00:00:00 2001 From: Dmitry Muhomor Date: Thu, 18 May 2023 13:08:41 +0300 Subject: [PATCH 22/34] support search in phone number and email pickers --- .../android/contacts/activities/ContactSelectionActivity.java | 2 -- .../contacts/list/MultiSelectEmailAddressesListFragment.java | 1 - .../contacts/list/MultiSelectPhoneNumbersListFragment.java | 1 - 3 files changed, 4 deletions(-) diff --git a/src/com/android/contacts/activities/ContactSelectionActivity.java b/src/com/android/contacts/activities/ContactSelectionActivity.java index 9273c612fa..73a95b3e70 100644 --- a/src/com/android/contacts/activities/ContactSelectionActivity.java +++ b/src/com/android/contacts/activities/ContactSelectionActivity.java @@ -159,8 +159,6 @@ private void prepareSearchViewAndActionBar(Bundle savedState) { // Postal address pickers (and legacy pickers) don't support search, so just show // "HomeAsUp" button and title. mIsSearchSupported = mRequest.getActionCode() != ContactsRequest.ACTION_PICK_POSTAL - && mRequest.getActionCode() != ContactsRequest.ACTION_PICK_EMAILS - && mRequest.getActionCode() != ContactsRequest.ACTION_PICK_PHONES && !mRequest.isLegacyCompatibilityMode(); configureSearchMode(); } diff --git a/src/com/android/contacts/list/MultiSelectEmailAddressesListFragment.java b/src/com/android/contacts/list/MultiSelectEmailAddressesListFragment.java index 6492193c3a..62e6cb8731 100644 --- a/src/com/android/contacts/list/MultiSelectEmailAddressesListFragment.java +++ b/src/com/android/contacts/list/MultiSelectEmailAddressesListFragment.java @@ -40,7 +40,6 @@ public class MultiSelectEmailAddressesListFragment public MultiSelectEmailAddressesListFragment() { setPhotoLoaderEnabled(true); setSectionHeaderDisplayEnabled(false); - setSearchMode(false); setHasOptionsMenu(true); setListType(ListEvent.ListType.PICK_EMAIL); } diff --git a/src/com/android/contacts/list/MultiSelectPhoneNumbersListFragment.java b/src/com/android/contacts/list/MultiSelectPhoneNumbersListFragment.java index b7fda5c7a0..4c9cc2a968 100644 --- a/src/com/android/contacts/list/MultiSelectPhoneNumbersListFragment.java +++ b/src/com/android/contacts/list/MultiSelectPhoneNumbersListFragment.java @@ -40,7 +40,6 @@ public class MultiSelectPhoneNumbersListFragment public MultiSelectPhoneNumbersListFragment() { setPhotoLoaderEnabled(true); setSectionHeaderDisplayEnabled(false); - setSearchMode(false); setHasOptionsMenu(true); setListType(ListEvent.ListType.PICK_PHONE); } From 8dba6c95a3cf3495961911f15641067d19cdcd15 Mon Sep 17 00:00:00 2001 From: Dmitry Muhomor Date: Thu, 18 May 2023 13:09:53 +0300 Subject: [PATCH 23/34] support EXTRA_ALLOW_MULTIPLE in contact picker This lets the caller ask for multiple contacts by passing the EXTRA_ALLOW_MULTIPLE intent extra. --- .../activities/ContactSelectionActivity.java | 13 ++++ .../contacts/list/ContactsIntentResolver.java | 6 +- .../contacts/list/ContactsRequest.java | 1 + .../list/MultiContactsPickerFragment.java | 73 +++++++++++++++++++ 4 files changed, 92 insertions(+), 1 deletion(-) create mode 100644 src/com/android/contacts/list/MultiContactsPickerFragment.java diff --git a/src/com/android/contacts/activities/ContactSelectionActivity.java b/src/com/android/contacts/activities/ContactSelectionActivity.java index 73a95b3e70..c65ab61296 100644 --- a/src/com/android/contacts/activities/ContactSelectionActivity.java +++ b/src/com/android/contacts/activities/ContactSelectionActivity.java @@ -49,6 +49,7 @@ import com.android.contacts.list.GroupMemberPickerFragment; import com.android.contacts.list.JoinContactListFragment; import com.android.contacts.list.LegacyPhoneNumberPickerFragment; +import com.android.contacts.list.MultiContactsPickerFragment; import com.android.contacts.list.MultiSelectContactsListFragment; import com.android.contacts.list.MultiSelectContactsListFragment.OnCheckBoxListActionListener; import com.android.contacts.list.MultiSelectEmailAddressesListFragment; @@ -209,6 +210,10 @@ private void configureActivityTitle() { titleResId = R.string.contactPickerActivityTitle; break; } + case ContactsRequest.ACTION_PICK_CONTACTS: { + titleResId = R.string.pickerSelectContactsActivityTitle; + break; + } case ContactsRequest.ACTION_PICK_OR_CREATE_CONTACT: { titleResId = R.string.contactPickerActivityTitle; break; @@ -283,6 +288,12 @@ public void configureListFragment() { break; } + case ContactsRequest.ACTION_PICK_CONTACTS: { + var fragment = new MultiContactsPickerFragment(); + mListFragment = fragment; + break; + } + case ContactsRequest.ACTION_PICK_OR_CREATE_CONTACT: { ContactPickerFragment fragment = new ContactPickerFragment(); fragment.setCreateContactEnabled(!mRequest.isSearchMode()); @@ -416,6 +427,8 @@ public void setupActionListener() { ((GroupMemberPickerFragment) mListFragment).setListener( new GroupMemberPickerListener()); getMultiSelectListFragment().setCheckBoxListListener(this); + } else if (mListFragment instanceof MultiContactsPickerFragment) { + getMultiSelectListFragment().setCheckBoxListListener(this); } else { throw new IllegalStateException("Unsupported list fragment type: " + mListFragment); } diff --git a/src/com/android/contacts/list/ContactsIntentResolver.java b/src/com/android/contacts/list/ContactsIntentResolver.java index e5f4df127d..5299f3df25 100644 --- a/src/com/android/contacts/list/ContactsIntentResolver.java +++ b/src/com/android/contacts/list/ContactsIntentResolver.java @@ -84,7 +84,11 @@ public ContactsRequest resolveIntent(Intent intent) { } else if (Intent.ACTION_PICK.equals(action)) { final String resolvedType = intent.resolveType(mContext); if (Contacts.CONTENT_TYPE.equals(resolvedType)) { - request.setActionCode(ContactsRequest.ACTION_PICK_CONTACT); + if (intent.getBooleanExtra(Intent.EXTRA_ALLOW_MULTIPLE, false)) { + request.setActionCode(ContactsRequest.ACTION_PICK_CONTACTS); + } else { + request.setActionCode(ContactsRequest.ACTION_PICK_CONTACT); + } } else if (People.CONTENT_TYPE.equals(resolvedType)) { request.setActionCode(ContactsRequest.ACTION_PICK_CONTACT); request.setLegacyCompatibilityMode(true); diff --git a/src/com/android/contacts/list/ContactsRequest.java b/src/com/android/contacts/list/ContactsRequest.java index f581b0a850..1482df2b35 100644 --- a/src/com/android/contacts/list/ContactsRequest.java +++ b/src/com/android/contacts/list/ContactsRequest.java @@ -62,6 +62,7 @@ public class ContactsRequest { /** Show all contacts and pick them when clicking */ public static final int ACTION_PICK_CONTACT = 60; + public static final int ACTION_PICK_CONTACTS = 61; /** Show all contacts as well as the option to create a new one */ public static final int ACTION_PICK_OR_CREATE_CONTACT = 70; diff --git a/src/com/android/contacts/list/MultiContactsPickerFragment.java b/src/com/android/contacts/list/MultiContactsPickerFragment.java new file mode 100644 index 0000000000..ccd3c46daf --- /dev/null +++ b/src/com/android/contacts/list/MultiContactsPickerFragment.java @@ -0,0 +1,73 @@ +package com.android.contacts.list; + +import android.provider.ContactsContract.Contacts; +import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; +import android.view.View; +import android.view.ViewGroup; + +import com.android.contacts.R; + +public class MultiContactsPickerFragment extends + MultiSelectContactsListFragment { + + public static final String TAG = MultiContactsPickerFragment.class.getSimpleName(); + + public MultiContactsPickerFragment() { + setPhotoLoaderEnabled(true); + setSectionHeaderDisplayEnabled(true); + setHasOptionsMenu(true); + } + + @Override + protected View inflateView(LayoutInflater inflater, ViewGroup container) { + return inflater.inflate(R.layout.contact_list_content, null); + } + + @Override + protected DefaultContactListAdapter createListAdapter() { + var adapter = new DefaultContactListAdapter(getActivity()); + adapter.setSectionHeaderDisplayEnabled(true); + adapter.setDisplayPhotos(true); + return adapter; + } + + @Override + public void onCreateOptionsMenu(Menu menu, MenuInflater menuInflater) { + super.onCreateOptionsMenu(menu, menuInflater); + menuInflater.inflate(R.menu.items_multi_select, menu); + } + + @Override + public void onPrepareOptionsMenu(Menu menu) { + final MenuItem item = menu.findItem(R.id.menu_send); + item.setVisible(getAdapter().hasSelectedItems()); + item.getActionView().setOnClickListener(v -> onOptionsItemSelected(item)); + + updateMenuItemSendForPickerIntent(item);; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + if (item.getItemId() == R.id.menu_send) { + setResultAndFinish(getSelectedContactIdsArray(), + Contacts.CONTENT_URI, Contacts.CONTENT_ITEM_TYPE); + return true; + } + + return super.onOptionsItemSelected(item); + } + + @Override + protected boolean onItemLongClick(int position, long id) { + return true; + } + + @Override + public void onStart() { + super.onStart(); + displayCheckBoxes(true); + } +} From 8d9cbe621cca14c31f428013f33ef0fb06b86aa5 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Mon, 30 Sep 2024 16:02:28 -0400 Subject: [PATCH 24/34] fix file permissions --- src/com/android/contacts/ContactSaveService.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 src/com/android/contacts/ContactSaveService.java diff --git a/src/com/android/contacts/ContactSaveService.java b/src/com/android/contacts/ContactSaveService.java old mode 100755 new mode 100644 From fb68fc8795b56cc4a5121f59c95be41fc195c28f Mon Sep 17 00:00:00 2001 From: Dmitry Muhomor Date: Thu, 19 Dec 2024 16:08:01 +0200 Subject: [PATCH 25/34] add AOSP dependencies as git submodules --- .gitmodules | 16 ++++++++++++++++ lib/platform_external_libphonenumber | 1 + lib/platform_frameworks_ex | 1 + lib/platform_frameworks_opt_vcard | 1 + lib/platform_packages_apps_PhoneCommon | 1 + 5 files changed, 20 insertions(+) create mode 100644 .gitmodules create mode 160000 lib/platform_external_libphonenumber create mode 160000 lib/platform_frameworks_ex create mode 160000 lib/platform_frameworks_opt_vcard create mode 160000 lib/platform_packages_apps_PhoneCommon diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000..9c342a49f9 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,16 @@ +[submodule "lib/platform_external_libphonenumber"] + path = lib/platform_external_libphonenumber + url = https://github.com/GrapheneOS/platform_external_libphonenumber + branch = main +[submodule "lib/platform_frameworks_ex"] + path = lib/platform_frameworks_ex + url = https://github.com/GrapheneOS/platform_frameworks_ex + branch = main +[submodule "lib/platform_frameworks_opt_vcard"] + path = lib/platform_frameworks_opt_vcard + url = https://github.com/GrapheneOS/platform_frameworks_opt_vcard + branch = main +[submodule "lib/platform_packages_apps_PhoneCommon"] + path = lib/platform_packages_apps_PhoneCommon + url = https://github.com/GrapheneOS/platform_packages_apps_PhoneCommon + branch = main diff --git a/lib/platform_external_libphonenumber b/lib/platform_external_libphonenumber new file mode 160000 index 0000000000..17c10656eb --- /dev/null +++ b/lib/platform_external_libphonenumber @@ -0,0 +1 @@ +Subproject commit 17c10656ebd38235f36a762f2f362a8011028ada diff --git a/lib/platform_frameworks_ex b/lib/platform_frameworks_ex new file mode 160000 index 0000000000..dbacb84fe6 --- /dev/null +++ b/lib/platform_frameworks_ex @@ -0,0 +1 @@ +Subproject commit dbacb84fe6e498775194b6e2cdc3e09d8ce25ab8 diff --git a/lib/platform_frameworks_opt_vcard b/lib/platform_frameworks_opt_vcard new file mode 160000 index 0000000000..274080f626 --- /dev/null +++ b/lib/platform_frameworks_opt_vcard @@ -0,0 +1 @@ +Subproject commit 274080f626ebfee216f926c5a8e2a932cb2b01dd diff --git a/lib/platform_packages_apps_PhoneCommon b/lib/platform_packages_apps_PhoneCommon new file mode 160000 index 0000000000..0f8bb7daab --- /dev/null +++ b/lib/platform_packages_apps_PhoneCommon @@ -0,0 +1 @@ +Subproject commit 0f8bb7daabecebdc56c2114f112ff229b17d19f1 From 0ef012f61a62e97427c11d1b5d646a9d1ca0760f Mon Sep 17 00:00:00 2001 From: Dmitry Muhomor Date: Thu, 19 Dec 2024 16:11:01 +0200 Subject: [PATCH 26/34] add Gradle build support --- .gitignore | 17 ++ .idea/.gitignore | 3 + .idea/compiler.xml | 6 + .idea/deploymentTargetSelector.xml | 10 + .idea/gradle.xml | 25 +++ .idea/kotlinc.xml | 6 + .idea/migrations.xml | 10 + .idea/misc.xml | 10 + .idea/runConfigurations.xml | 17 ++ .idea/vcs.xml | 15 ++ AndroidManifest.xml | 1 - app/.gitignore | 1 + app/build.gradle.kts | 52 +++++ build.gradle.kts | 4 + gradle.properties | 2 + gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 8 + gradlew | 252 +++++++++++++++++++++++ gradlew.bat | 94 +++++++++ settings.gradle.kts | 19 ++ 20 files changed, 551 insertions(+), 1 deletion(-) create mode 100644 .gitignore create mode 100644 .idea/.gitignore create mode 100644 .idea/compiler.xml create mode 100644 .idea/deploymentTargetSelector.xml create mode 100644 .idea/gradle.xml create mode 100644 .idea/kotlinc.xml create mode 100644 .idea/migrations.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/runConfigurations.xml create mode 100644 .idea/vcs.xml create mode 100644 app/.gitignore create mode 100644 app/build.gradle.kts create mode 100644 build.gradle.kts create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle.kts diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..1ca9b25469 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +/.idea/deploymentTargetDropDown.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +keystore.properties +*.keystore +local.properties diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000000..26d33521af --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000000..b589d56e9f --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml new file mode 100644 index 0000000000..b268ef36cd --- /dev/null +++ b/.idea/deploymentTargetSelector.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000000..d7b4d00e2d --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,25 @@ + + + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 0000000000..c224ad564b --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/migrations.xml b/.idea/migrations.xml new file mode 100644 index 0000000000..f8051a6f97 --- /dev/null +++ b/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000000..3b0be22846 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000000..16660f1d80 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000000..77ec63edf2 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/AndroidManifest.xml b/AndroidManifest.xml index bb12c7d1ee..efd0c2edec 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -15,7 +15,6 @@ --> diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000000..796b96d1c4 --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 0000000000..e1712ceb8e --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,52 @@ +plugins { + id("com.android.application") + kotlin("android") +} + +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(17)) + } +} + +android { + compileSdk = 35 + buildToolsVersion = "35.0.0" + + namespace = "com.android.contacts" + + defaultConfig { + minSdk = 34 + //noinspection OldTargetApi + targetSdk = 34 + } + + buildTypes { + getByName("debug") { + applicationIdSuffix = ".debug" + val selfPkgName = android.namespace + applicationIdSuffix + resValue("string", "applicationLabel", "Contacts d") + resValue("string", "contacts_file_provider_authority", "$selfPkgName.files") + resValue("string", "contacts_sdn_provider_authority", "$selfPkgName.sdn") + } + } + + sourceSets.getByName("main") { + manifest.srcFile("../AndroidManifest.xml") + java.srcDirs("../src", "../src-bind") + res.srcDir("../res") + } +} + +dependencies { + implementation("androidx.appcompat:appcompat:1.7.0") + implementation("androidx.palette:palette:1.0.0") + implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0") + implementation("com.google.android.material:material:1.12.0") + implementation("com.google.guava:guava:33.4.0-android") + + implementation(project(":lib:platform_external_libphonenumber")) + implementation(project(":lib:platform_frameworks_ex:common")) + implementation(project(":lib:platform_frameworks_opt_vcard")) + implementation(project(":lib:platform_packages_apps_PhoneCommon")) +} diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000000..c7ad7549e7 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,4 @@ +plugins { + id("com.android.application") version "8.7.3" apply false + id("org.jetbrains.kotlin.android") version "2.0.21" apply false +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000000..3c5e11311b --- /dev/null +++ b/gradle.properties @@ -0,0 +1,2 @@ +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +android.useAndroidX=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..a4b76b9530d66f5e68d973ea569d8e19de379189 GIT binary patch literal 43583 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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 GZ~q4|mN%#X literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000..fb602ee2af --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,8 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000000..f5feea6d6b --- /dev/null +++ b/gradlew @@ -0,0 +1,252 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000000..9d21a21834 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000000..6db34070cb --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,19 @@ +pluginManagement { + repositories { + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} + +include(":app") +include(":lib:platform_external_libphonenumber") +include(":lib:platform_frameworks_ex:common") +include(":lib:platform_frameworks_opt_vcard") +include(":lib:platform_packages_apps_PhoneCommon") From 5fc6498ab79e8f120ae7801dbf887ed64cd30d3e Mon Sep 17 00:00:00 2001 From: Dmitry Muhomor Date: Thu, 19 Dec 2024 16:16:18 +0200 Subject: [PATCH 27/34] fix androidx.appcompat resource references --- src/com/android/contacts/activities/ActionBarAdapter.java | 2 +- src/com/android/contacts/activities/ShowOrCreateActivity.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/contacts/activities/ActionBarAdapter.java b/src/com/android/contacts/activities/ActionBarAdapter.java index e6f29a4ab6..8f1cd9ca34 100644 --- a/src/com/android/contacts/activities/ActionBarAdapter.java +++ b/src/com/android/contacts/activities/ActionBarAdapter.java @@ -441,7 +441,7 @@ public void run() { */ public void updateOverflowButtonColor() { final String overflowDescription = mActivity.getResources().getString( - R.string.abc_action_menu_overflow_description); + androidx.appcompat.R.string.abc_action_menu_overflow_description); final ViewGroup decorView = (ViewGroup) mActivity.getWindow().getDecorView(); final ViewTreeObserver viewTreeObserver = decorView.getViewTreeObserver(); viewTreeObserver.addOnGlobalLayoutListener( diff --git a/src/com/android/contacts/activities/ShowOrCreateActivity.java b/src/com/android/contacts/activities/ShowOrCreateActivity.java index 086565b83e..c06813dea2 100755 --- a/src/com/android/contacts/activities/ShowOrCreateActivity.java +++ b/src/com/android/contacts/activities/ShowOrCreateActivity.java @@ -219,7 +219,7 @@ protected Dialog onCreateDialog(int id) { final CharSequence message = getResources().getString( R.string.add_contact_dlg_message_fmt, mCreateDescrip); - return new AlertDialog.Builder(this, R.style.Theme_AppCompat_DayNight_Dialog_Alert) + return new AlertDialog.Builder(this, androidx.appcompat.R.style.Theme_AppCompat_DayNight_Dialog_Alert) .setMessage(message) .setPositiveButton(android.R.string.ok, new IntentClickListener(this, createIntent)) From c0110338f857fa7823e402bb68ef750947007edb Mon Sep 17 00:00:00 2001 From: Dmitry Muhomor Date: Thu, 19 Dec 2024 16:19:51 +0200 Subject: [PATCH 28/34] inline SET_DEFAULT_ACCOUNT_FOR_CONTACTS permission system API constant --- .idea/inspectionProfiles/Project_Default.xml | 186 ++++++++++++++++++ src/com/android/contacts/SystemApis.java | 7 + .../preference/ContactsPreferences.java | 2 +- .../DisplayOptionsPreferenceFragment.java | 3 +- 4 files changed, 196 insertions(+), 2 deletions(-) create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 src/com/android/contacts/SystemApis.java diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000000..cbcb0e4c65 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,186 @@ + + + + \ No newline at end of file diff --git a/src/com/android/contacts/SystemApis.java b/src/com/android/contacts/SystemApis.java new file mode 100644 index 0000000000..17106bfd5f --- /dev/null +++ b/src/com/android/contacts/SystemApis.java @@ -0,0 +1,7 @@ +package com.android.contacts; + +public class SystemApis { + // android.Manifest.permission.SET_DEFAULT_ACCOUNT_FOR_CONTACTS + public static final String SET_DEFAULT_ACCOUNT_FOR_CONTACTS = + "android.permission.SET_DEFAULT_ACCOUNT_FOR_CONTACTS"; +} diff --git a/src/com/android/contacts/preference/ContactsPreferences.java b/src/com/android/contacts/preference/ContactsPreferences.java index e5f0cda842..d1a1ee2f7c 100644 --- a/src/com/android/contacts/preference/ContactsPreferences.java +++ b/src/com/android/contacts/preference/ContactsPreferences.java @@ -16,7 +16,7 @@ package com.android.contacts.preference; -import static android.Manifest.permission.SET_DEFAULT_ACCOUNT_FOR_CONTACTS; +import static com.android.contacts.SystemApis.SET_DEFAULT_ACCOUNT_FOR_CONTACTS; import android.accounts.Account; import android.annotation.SuppressLint; diff --git a/src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java b/src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java index 7097be3be7..30538a9cc4 100644 --- a/src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java +++ b/src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java @@ -468,7 +468,8 @@ private String getSetDefaultAccountActivityPackage() { for (ResolveInfo resolveInfo : resolveInfos) { String packageName = resolveInfo.activityInfo.packageName; if (packageManager.checkPermission( - android.Manifest.permission.SET_DEFAULT_ACCOUNT_FOR_CONTACTS, packageName) + com.android.contacts.SystemApis.SET_DEFAULT_ACCOUNT_FOR_CONTACTS, + packageName) == PackageManager.PERMISSION_GRANTED) { return packageName; } From 7bc3cbf34c10ac2acd562b00d515d8c4a0b5adac Mon Sep 17 00:00:00 2001 From: Dmitry Muhomor Date: Thu, 19 Dec 2024 16:20:30 +0200 Subject: [PATCH 29/34] inline ContactsContract.Settings.setDefaultAccount() implementation --- .../contacts/preference/ContactsPreferences.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/com/android/contacts/preference/ContactsPreferences.java b/src/com/android/contacts/preference/ContactsPreferences.java index d1a1ee2f7c..7e4d682ead 100644 --- a/src/com/android/contacts/preference/ContactsPreferences.java +++ b/src/com/android/contacts/preference/ContactsPreferences.java @@ -279,8 +279,16 @@ private void setDefaultAccountToCp2(AccountWithDataSet accountWithDataSet) { .permitDiskReads() .build()); try { - ContactsContract.Settings.setDefaultAccount(mContext.getContentResolver(), - accountWithDataSet == null ? null : accountWithDataSet.getAccountOrNull()); + var extras = new android.os.Bundle(); + Account account = accountWithDataSet == null ? null : accountWithDataSet.getAccountOrNull(); + if (account != null) { + extras.putString(ContactsContract.Settings.ACCOUNT_NAME, account.name); + extras.putString(ContactsContract.Settings.ACCOUNT_TYPE, account.type); + } + + // TODO: mark ContactsContract.Settings.setDefaultAccount with @UnsupportedAppUsage and + // call it via reflection instead + mContext.getContentResolver().call(ContactsContract.AUTHORITY_URI, "setDefaultAccount", null, extras); } finally { StrictMode.setThreadPolicy(oldPolicy); } From 538312d2c7b0438080b58e492b0d23ecdc461730 Mon Sep 17 00:00:00 2001 From: Dmitry Muhomor Date: Fri, 20 Dec 2024 19:35:22 +0200 Subject: [PATCH 30/34] add assets dir to Gradle sourceSets --- app/build.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index e1712ceb8e..8437ee75dd 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -32,6 +32,7 @@ android { } sourceSets.getByName("main") { + assets.srcDir("../assets") manifest.srcFile("../AndroidManifest.xml") java.srcDirs("../src", "../src-bind") res.srcDir("../res") From 4972d1f3f14e2ac4e5c19d8578e3263fcb537f6e Mon Sep 17 00:00:00 2001 From: Dmitry Muhomor Date: Fri, 20 Dec 2024 19:45:33 +0200 Subject: [PATCH 31/34] update platform_external_libphonenumber --- lib/platform_external_libphonenumber | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/platform_external_libphonenumber b/lib/platform_external_libphonenumber index 17c10656eb..4814ded38b 160000 --- a/lib/platform_external_libphonenumber +++ b/lib/platform_external_libphonenumber @@ -1 +1 @@ -Subproject commit 17c10656ebd38235f36a762f2f362a8011028ada +Subproject commit 4814ded38ba34c69da1fcb949b9d47640d854c50 From f269f969026debcc6590bf641173d0d3371a0240 Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Mon, 23 Dec 2024 13:30:36 -0500 Subject: [PATCH 32/34] Improve dark theme color contrast This removes a few dark theme specific colors and tweaks the primary and primary_dark colors to improve contrast in the dark theme. --- AndroidManifest.xml | 4 +- res/drawable/ripple_background.xml | 2 +- res/drawable/searchedittext_custom_cursor.xml | 2 +- res/values-night/colors.xml | 36 ++----------- res/values/colors.xml | 15 ++---- res/values/styles.xml | 53 +------------------ .../android/contacts/SimImportService.java | 6 +-- .../contacts/activities/PeopleActivity.java | 5 ++ .../list/CustomContactListFilterActivity.java | 2 +- .../NotificationImportExportListener.java | 8 +-- 10 files changed, 24 insertions(+), 109 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index efd0c2edec..42aeb03d0d 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -296,12 +296,12 @@ + android:theme="@style/PeopleActivityTheme"/> + android:theme="@style/PeopleActivityTheme"/> \ No newline at end of file + android:color="?attr/colorControlHighlight" /> \ No newline at end of file diff --git a/res/drawable/searchedittext_custom_cursor.xml b/res/drawable/searchedittext_custom_cursor.xml index 473b94c6f5..0f56a2b061 100644 --- a/res/drawable/searchedittext_custom_cursor.xml +++ b/res/drawable/searchedittext_custom_cursor.xml @@ -16,5 +16,5 @@ - + \ No newline at end of file diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml index 96291c65fd..c1e423a7e4 100644 --- a/res/values-night/colors.xml +++ b/res/values-night/colors.xml @@ -26,25 +26,18 @@ #99FFFFFF - #000000 - @color/primary_color #060606 #5B5B5B - #1c3aa9 - #2a56c6 + #265AB6 + #3872D7 #546E7A #607D8B - - #000000 - - @color/contacts_accent_color - #525252 @@ -67,7 +60,7 @@ #BEBDBD - #40B0AEAE + #E0B0AEAE #40CBCBCB @@ -87,23 +80,14 @@ #4285f4 #f4b400 - - #A0000000 - #CBCACA @color/dialtacts_secondary_text_color - - @color/dialtacts_theme_color - #C9C9C9 - - #2a56c6 - #393838 @@ -173,15 +157,9 @@ #000000 - - #000000 - @color/actionbar_background_color - - #000000 #8CFFFFFF @@ -196,8 +174,6 @@ #66FFFFFF - @color/dialtacts_theme_color - #181717 #2C2C2C @@ -227,8 +203,6 @@ @color/actionbar_text_color_black #444444 - #80F50057 - #EAEAEA @@ -247,10 +221,6 @@ #1F1F1F - - #1AFFFFFF - - @android:color/black @android:color/black @color/background_primary diff --git a/res/values/colors.xml b/res/values/colors.xml index 635e08a0f3..ece7f69df4 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -67,7 +67,7 @@ #7f7f7f - #40000000 + #A0000000 #40000000 @@ -87,23 +87,17 @@ #4285f4 #f4b400 - - #a0ffffff - #363636 @color/dialtacts_secondary_text_color - @color/dialtacts_theme_color + @color/primary_color #363636 - - #2a56c6 - #DDDDDD @@ -196,7 +190,7 @@ #66000000 - @color/dialtacts_theme_color + @color/primary_color #f9f9f9 @@ -247,9 +241,6 @@ #E8E8E8 - - #1A000000 - @android:color/white @android:color/white @android:color/transparent diff --git a/res/values/styles.xml b/res/values/styles.xml index 709c333814..6891da48b4 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -22,7 +22,7 @@ true - - -