From 2f5456d510ae4bc9537f4a0af6e846c8bbe58867 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Fri, 23 Oct 2020 12:25:05 +0530 Subject: [PATCH 01/79] removeSpan on afterTextChanged --- .../android/contacts/editor/TextFieldsEditorView.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/com/android/contacts/editor/TextFieldsEditorView.java b/src/com/android/contacts/editor/TextFieldsEditorView.java index 28fe87fc6e..957ae1bc3f 100644 --- a/src/com/android/contacts/editor/TextFieldsEditorView.java +++ b/src/com/android/contacts/editor/TextFieldsEditorView.java @@ -29,6 +29,8 @@ import android.text.Spannable; import android.text.Spanned; import android.text.TextUtils; import android.text.TextWatcher; +import android.text.style.CharacterStyle; +import android.text.style.MetricAffectingSpan; import android.text.style.TtsSpan; import android.util.AttributeSet; import android.util.Log; @@ -344,6 +346,14 @@ public class TextFieldsEditorView extends LabeledEditorView { mFixedPhonetic = getPhonetic(column); mFixedDisplayName = displayNameField; } + + CharacterStyle[] toBeRemovedSpans = s.getSpans(0, s.length(), + MetricAffectingSpan.class); + for (int index = 0; index < toBeRemovedSpans.length; index++) + s.removeSpan(toBeRemovedSpans[index]); + + Log.e("TAG", "line 356 ....afterTextChanged...................removeSpan"); + } @Override -- GitLab From 258246deac22e2c870af7460855b9cc305499369 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Thu, 29 Oct 2020 08:45:22 +0530 Subject: [PATCH 02/79] change toolbar title and Status bar icon color --- .../contacts/activities/PeopleActivity.java | 33 +++++++++++++++---- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java index 92eb5be071..5d34d3c000 100644 --- a/src/com/android/contacts/activities/PeopleActivity.java +++ b/src/com/android/contacts/activities/PeopleActivity.java @@ -31,6 +31,7 @@ import android.content.res.Configuration; import android.content.res.TypedArray; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; +import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Build; import android.os.Bundle; @@ -194,6 +195,9 @@ public class PeopleActivity extends AppCompatContactsActivity implements private ContactsActionBarDrawerToggle mToggle; private Toolbar mToolbar; + public static int color_default_blue1; + public static int color_default_primary_text; + // The account the new group will be created under. private AccountWithDataSet mNewGroupAccount; @@ -423,6 +427,9 @@ public class PeopleActivity extends AppCompatContactsActivity implements getWindow().setBackgroundDrawable(null); ACCENT_COLOR=fetchAccentColor(); + + + } @Override @@ -1306,18 +1313,30 @@ public class PeopleActivity extends AppCompatContactsActivity implements * */ private int fetchAccentColor() { + this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); int color=getResources().getColor(R.color.accent); -// TypedValue typedValue = new TypedValue(); -// TypedArray a = this.obtainStyledAttributes(typedValue.data, new int[] { R.attr.colorAccent }); -// int color = a.getColor(0, 0); -// a.recycle(); -// Log.e("TAG", "accent Colour #"+Integer.toHexString(color)); -// getSupportActionBar().setBackgroundDrawable( -// new ColorDrawable(color)); + + color_default_primary_text=getResources().getColor(R.color.color_default_primary_text); + color_default_blue1=getResources().getColor(R.color.color_default_blue1); + //getSupportActionBar().setBackgroundDrawable(new ColorDrawable(color_accent)); + getSupportActionBar().getThemedContext(); + + mToolbar.setTitleTextColor(color_default_primary_text); + setOverflowButtonColor(toolbar, color_default_primary_text); + return color; } + public static void setOverflowButtonColor(final Toolbar toolbar, final int color) { + Drawable drawable = toolbar.getOverflowIcon(); + if (drawable != null) { + drawable = DrawableCompat.wrap(drawable); + DrawableCompat.setTint(drawable.mutate(), color); + toolbar.setOverflowIcon(drawable); + } + } + } -- GitLab From 7c3a6c95f954e86b08377000da3a6a82ceb81e57 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Thu, 29 Oct 2020 10:04:35 +0530 Subject: [PATCH 03/79] add some color and fixed for build failed --- res/values/colors.xml | 7 +++++++ .../contacts/activities/PeopleActivity.java | 18 +++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/res/values/colors.xml b/res/values/colors.xml index e25af79a08..4aa8a5e359 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -48,6 +48,13 @@ #546E7A #607D8B @lineageos.platform:color/color_default_accent + + @lineageos.platform:color/color_default_primary_text + @lineageos.platform:color/color_default_secondary_text + @lineageos.platform:color/color_default_background + @lineageos.platform:color/color_default_blue1 + @lineageos.platform:color/color_default_gray2 + #FFFFFF diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java index 5d34d3c000..dae71e6a56 100644 --- a/src/com/android/contacts/activities/PeopleActivity.java +++ b/src/com/android/contacts/activities/PeopleActivity.java @@ -1322,20 +1322,20 @@ public class PeopleActivity extends AppCompatContactsActivity implements getSupportActionBar().getThemedContext(); mToolbar.setTitleTextColor(color_default_primary_text); - setOverflowButtonColor(toolbar, color_default_primary_text); + //setOverflowButtonColor(mToolbar, color_default_primary_text); return color; } - public static void setOverflowButtonColor(final Toolbar toolbar, final int color) { - Drawable drawable = toolbar.getOverflowIcon(); - if (drawable != null) { - drawable = DrawableCompat.wrap(drawable); - DrawableCompat.setTint(drawable.mutate(), color); - toolbar.setOverflowIcon(drawable); - } - } +// public static void setOverflowButtonColor(final Toolbar toolbar, final int color) { +// Drawable drawable = toolbar.getOverflowIcon(); +// if (drawable != null) { +// drawable = DrawableCompat.wrap(drawable); +// DrawableCompat.setTint(drawable.mutate(), color); +// toolbar.setOverflowIcon(drawable); +// } +// } -- GitLab From bd06642b93b0b118adb99760b6b84674935e781d Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Thu, 29 Oct 2020 11:08:59 +0530 Subject: [PATCH 04/79] status bar for other activity and toolbar textColorSecondary --- res/values/styles.xml | 5 +++-- .../contacts/activities/ContactSelectionActivity.java | 2 ++ src/com/android/contacts/activities/LicenseActivity.java | 2 ++ src/com/android/contacts/list/AccountFilterActivity.java | 1 + .../contacts/list/CustomContactListFilterActivity.java | 1 + .../contacts/preference/ContactsPreferenceActivity.java | 1 + 6 files changed, 10 insertions(+), 2 deletions(-) diff --git a/res/values/styles.xml b/res/values/styles.xml index dc45bcb61b..c84d3e2156 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -222,6 +222,7 @@ @style/ContactsActionBarTitleTextAppCompat @style/ContactsActionBarTitleTextAppCompat + @color/color_default_primary_text + + + + diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java index 956faa7d56..acdaf431b6 100644 --- a/src/com/android/contacts/activities/PeopleActivity.java +++ b/src/com/android/contacts/activities/PeopleActivity.java @@ -1322,8 +1322,8 @@ public class PeopleActivity extends AppCompatContactsActivity implements //getSupportActionBar().setBackgroundDrawable(new ColorDrawable(color_accent)); getSupportActionBar().getThemedContext(); - // mToolbar.setTitleTextColor(color_default_primary_text); - setOverflowButtonColor(mToolbar, color_default_primary_text); + mToolbar.setTitleTextColor(color_default_blue1); + setOverflowButtonColor(mToolbar, color_default_blue1); -- GitLab From a5946fa6fecb87a25c1e0ee4a6f570638345f8cf Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Mon, 2 Nov 2020 22:50:34 +0530 Subject: [PATCH 16/79] add Log for Test --- src/com/android/contacts/activities/PeopleActivity.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java index acdaf431b6..8199679fc7 100644 --- a/src/com/android/contacts/activities/PeopleActivity.java +++ b/src/com/android/contacts/activities/PeopleActivity.java @@ -1331,10 +1331,13 @@ public class PeopleActivity extends AppCompatContactsActivity implements } public static void setOverflowButtonColor(final Toolbar toolbar, final int color) { Drawable drawable = toolbar.getOverflowIcon(); + Log.e("TAG", "log log log log..........1"); if (drawable != null) { + Log.e("TAG", "log log log log..........2"); drawable = DrawableCompat.wrap(drawable); DrawableCompat.setTint(drawable.mutate(), color); toolbar.setOverflowIcon(drawable); + Log.e("TAG", "log log log log..........3"); } } -- GitLab From c21971fcf218db8b6f1383034f94316cfcbd0d4c Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Tue, 3 Nov 2020 07:56:26 +0530 Subject: [PATCH 17/79] update for toolbar icon --- .../contacts/activities/PeopleActivity.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java index 8199679fc7..86cd0d2365 100644 --- a/src/com/android/contacts/activities/PeopleActivity.java +++ b/src/com/android/contacts/activities/PeopleActivity.java @@ -30,6 +30,7 @@ import android.content.SyncStatusObserver; import android.content.res.Configuration; import android.content.res.TypedArray; import android.graphics.Color; +import android.graphics.PorterDuff; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.net.Uri; @@ -428,7 +429,8 @@ public class PeopleActivity extends AppCompatContactsActivity implements ACCENT_COLOR=fetchAccentColor(); - + getSupportActionBar().setHomeAsUpIndicator(changeBackArrowColor(this, Color.rgb(50, 50, 50))); + getSupportActionBar().getThemedContext(); } @@ -1327,6 +1329,7 @@ public class PeopleActivity extends AppCompatContactsActivity implements + return color; } public static void setOverflowButtonColor(final Toolbar toolbar, final int color) { @@ -1341,6 +1344,18 @@ public class PeopleActivity extends AppCompatContactsActivity implements } } + public static Drawable changeBackArrowColor(Context context, int color) { + String resName; + int res; + + resName = Build.VERSION.SDK_INT >= 23 ? "abc_ic_ab_back_material" : "abc_ic_ab_back_mtrl_am_alpha"; + res = context.getResources().getIdentifier(resName, "drawable", context.getPackageName()); + + final Drawable upArrow = context.getResources().getDrawable(res); + upArrow.setColorFilter(color, PorterDuff.Mode.SRC_ATOP); + + return upArrow; + } } -- GitLab From 51ba5258abbc021043e3aeb192e01234548545f5 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Tue, 3 Nov 2020 08:55:08 +0530 Subject: [PATCH 18/79] update for toolbar icon for testing --- src/com/android/contacts/activities/PeopleActivity.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java index 86cd0d2365..6cb4c11f3c 100644 --- a/src/com/android/contacts/activities/PeopleActivity.java +++ b/src/com/android/contacts/activities/PeopleActivity.java @@ -427,10 +427,11 @@ public class PeopleActivity extends AppCompatContactsActivity implements } getWindow().setBackgroundDrawable(null); - ACCENT_COLOR=fetchAccentColor(); + getSupportActionBar().setHomeAsUpIndicator(changeBackArrowColor(this, Color.rgb(50, 50, 50))); getSupportActionBar().getThemedContext(); + ACCENT_COLOR=fetchAccentColor(); } @@ -1322,6 +1323,7 @@ public class PeopleActivity extends AppCompatContactsActivity implements color_default_primary_text=getResources().getColor(R.color.color_default_primary_text); color_default_blue1=getResources().getColor(R.color.color_default_blue1); //getSupportActionBar().setBackgroundDrawable(new ColorDrawable(color_accent)); + getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_work_profile); getSupportActionBar().getThemedContext(); mToolbar.setTitleTextColor(color_default_blue1); -- GitLab From 439326bb0bcf3e69890eb9a862d3b75db1c3f650 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Tue, 3 Nov 2020 09:44:02 +0530 Subject: [PATCH 19/79] update for toolbar icon color --- res/layout/people_activity_toolbar.xml | 1 + res/values/colors.xml | 2 +- src/com/android/contacts/activities/PeopleActivity.java | 9 ++++----- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/res/layout/people_activity_toolbar.xml b/res/layout/people_activity_toolbar.xml index d1c35c6a01..89f10e7d2d 100644 --- a/res/layout/people_activity_toolbar.xml +++ b/res/layout/people_activity_toolbar.xml @@ -35,6 +35,7 @@ android:padding="0dp" style="@style/ContactsToolbarStyle" /> + \ No newline at end of file diff --git a/res/values/colors.xml b/res/values/colors.xml index 4aa8a5e359..e864d443c2 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -47,7 +47,7 @@ #546E7A #607D8B - @lineageos.platform:color/color_default_accent + @lineageos.platform:color/color_default_blue1 @lineageos.platform:color/color_default_primary_text @lineageos.platform:color/color_default_secondary_text diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java index 6cb4c11f3c..3acfba9276 100644 --- a/src/com/android/contacts/activities/PeopleActivity.java +++ b/src/com/android/contacts/activities/PeopleActivity.java @@ -392,6 +392,9 @@ public class PeopleActivity extends AppCompatContactsActivity implements R.string.navigation_drawer_open, R.string.navigation_drawer_close); mDrawerLayout.setDrawerListener(mToggle); // Set fallback handler for when drawer is disabled. + + mToggle.getDrawerArrowDrawable().setColor(getResources().getColor(R.color.color_default_blue1)); + mToggle.setToolbarNavigationClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -1323,18 +1326,14 @@ public class PeopleActivity extends AppCompatContactsActivity implements color_default_primary_text=getResources().getColor(R.color.color_default_primary_text); color_default_blue1=getResources().getColor(R.color.color_default_blue1); //getSupportActionBar().setBackgroundDrawable(new ColorDrawable(color_accent)); - getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_work_profile); getSupportActionBar().getThemedContext(); mToolbar.setTitleTextColor(color_default_blue1); setOverflowButtonColor(mToolbar, color_default_blue1); - - - return color; } - public static void setOverflowButtonColor(final Toolbar toolbar, final int color) { + public static void setOverflowButtonColor(Toolbar toolbar, int color) { Drawable drawable = toolbar.getOverflowIcon(); Log.e("TAG", "log log log log..........1"); if (drawable != null) { -- GitLab From 52b507bde4f69280e4a19a757ae7d0eb6b4efe39 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Tue, 3 Nov 2020 10:42:07 +0530 Subject: [PATCH 20/79] update Fab button and theme for empty contacts list --- res/drawable/fab_bg.xml | 12 ++++++++++++ res/drawable/quantum_ic_add_vd_theme_24.xml | 2 +- res/layout/floating_action_button.xml | 4 ++-- res/values/styles.xml | 4 ++-- 4 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 res/drawable/fab_bg.xml diff --git a/res/drawable/fab_bg.xml b/res/drawable/fab_bg.xml new file mode 100644 index 0000000000..9dfd9699b6 --- /dev/null +++ b/res/drawable/fab_bg.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/res/drawable/quantum_ic_add_vd_theme_24.xml b/res/drawable/quantum_ic_add_vd_theme_24.xml index 167dafee63..3ceffde2d9 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/layout/floating_action_button.xml b/res/layout/floating_action_button.xml index a31512f19f..9dcf9f64fa 100644 --- a/res/layout/floating_action_button.xml +++ b/res/layout/floating_action_button.xml @@ -26,7 +26,7 @@ android:layout_gravity="bottom|end" android:layout_marginBottom="@dimen/floating_action_button_margin_bottom" android:layout_marginEnd="@dimen/floating_action_button_margin_right" - android:background="@drawable/fab_pink" + android:background="@drawable/fab_bg" android:elevation="@dimen/design_fab_elevation" app:layout_dodgeInsetEdges="bottom" > @@ -37,5 +37,5 @@ android:background="@drawable/floating_action_button" android:contentDescription="@string/action_menu_add_new_contact_button" android:src="@drawable/quantum_ic_add_vd_theme_24" - android:tint="@color/floating_action_button_icon_color"/> + android:tint="@color/color_default_blue1" /> \ No newline at end of file diff --git a/res/values/styles.xml b/res/values/styles.xml index d512d9f4d9..fa90bf8bac 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -403,7 +403,7 @@ @@ -411,7 +411,7 @@ -- GitLab From aa64c76e43b4c60a7e873e69130c154c17d29eed Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Tue, 3 Nov 2020 11:36:29 +0530 Subject: [PATCH 21/79] update search icon --- res/drawable/quantum_ic_search_vd_theme_24.xml | 2 +- res/values/colors.xml | 2 +- res/xml/searchable.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/res/drawable/quantum_ic_search_vd_theme_24.xml b/res/drawable/quantum_ic_search_vd_theme_24.xml index 5c5632a84b..6e9da640e2 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/values/colors.xml b/res/values/colors.xml index e864d443c2..fcdf545d4b 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -56,7 +56,7 @@ @lineageos.platform:color/color_default_gray2 - #FFFFFF + @lineageos.platform:color/color_default_blue1 @color/contacts_accent_color diff --git a/res/xml/searchable.xml b/res/xml/searchable.xml index 3d6876ebcd..bfa403f76e 100644 --- a/res/xml/searchable.xml +++ b/res/xml/searchable.xml @@ -17,7 +17,7 @@ Date: Tue, 3 Nov 2020 12:45:30 +0530 Subject: [PATCH 22/79] update search icon --- res/menu/people_options.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/res/menu/people_options.xml b/res/menu/people_options.xml index 5fb0f2eb62..7ffbf86ab6 100644 --- a/res/menu/people_options.xml +++ b/res/menu/people_options.xml @@ -14,11 +14,13 @@ limitations under the License. --> + xmlns:contacts="http://schemas.android.com/apk/res-auto" + xmlns:app="http://schemas.android.com/tools"> Date: Tue, 3 Nov 2020 14:03:31 +0530 Subject: [PATCH 23/79] update search icon --- res/drawable/quantum_ic_close_vd_theme_24.xml | 2 +- res/menu/edit_contact.xml | 3 +++ res/menu/people_options.xml | 1 + res/menu/search_menu.xml | 5 ++++- res/values/styles.xml | 4 +++- .../android/contacts/activities/ContactEditorActivity.java | 5 +++++ src/com/android/contacts/editor/ContactEditorFragment.java | 4 ++++ 7 files changed, 21 insertions(+), 3 deletions(-) diff --git a/res/drawable/quantum_ic_close_vd_theme_24.xml b/res/drawable/quantum_ic_close_vd_theme_24.xml index 0aafe4b5a1..955f791248 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/menu/edit_contact.xml b/res/menu/edit_contact.xml index 039c6570eb..b30934e67c 100644 --- a/res/menu/edit_contact.xml +++ b/res/menu/edit_contact.xml @@ -17,12 +17,15 @@ diff --git a/res/menu/people_options.xml b/res/menu/people_options.xml index 7ffbf86ab6..86be2d61c2 100644 --- a/res/menu/people_options.xml +++ b/res/menu/people_options.xml @@ -17,6 +17,7 @@ xmlns:contacts="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/tools"> + xmlns:contacts="http://schemas.android.com/apk/res-auto" + xmlns:app="http://schemas.android.com/tools"> diff --git a/res/values/styles.xml b/res/values/styles.xml index fa90bf8bac..9f8e016861 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -220,8 +220,10 @@ 72dp 72dp @style/ContactsActionBarTitleText + + + diff --git a/src/com/android/contacts/preference/ContactsPreferenceActivity.java b/src/com/android/contacts/preference/ContactsPreferenceActivity.java index 60f6ceeba0..0ca1c8715f 100644 --- a/src/com/android/contacts/preference/ContactsPreferenceActivity.java +++ b/src/com/android/contacts/preference/ContactsPreferenceActivity.java @@ -18,6 +18,9 @@ package com.android.contacts.preference; import android.content.res.Configuration; import android.database.Cursor; +import android.graphics.Color; +import android.graphics.PorterDuff; +import android.graphics.drawable.Drawable; import android.os.Bundle; import android.preference.PreferenceActivity; import android.provider.ContactsContract.DisplayNameSources; @@ -28,7 +31,10 @@ import android.support.annotation.StringRes; import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatDelegate; import android.support.v7.widget.Toolbar; +import android.text.Spannable; +import android.text.SpannableString; import android.text.TextUtils; +import android.text.style.ForegroundColorSpan; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; @@ -42,7 +48,7 @@ import com.android.contacts.model.account.AccountWithDataSet; import com.android.contacts.preference.DisplayOptionsPreferenceFragment.ProfileListener; import com.android.contacts.preference.DisplayOptionsPreferenceFragment.ProfileQuery; import com.android.contacts.util.AccountSelectionUtil; - +import androidx.core.graphics.drawable.DrawableCompat; /** * Contacts settings. */ @@ -72,6 +78,7 @@ public final class ContactsPreferenceActivity extends PreferenceActivity final ActionBar actionBar = mCompatDelegate.getSupportActionBar(); if (actionBar != null) { actionBar.setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP, ActionBar.DISPLAY_HOME_AS_UP); + } mProviderStatusWatcher = ProviderStatusWatcher.getInstance(this); @@ -196,8 +203,28 @@ public final class ContactsPreferenceActivity extends PreferenceActivity final ActionBar actionBar = mCompatDelegate.getSupportActionBar(); if (actionBar != null) { actionBar.setTitle(res); + } + + Spannable text = new SpannableString(actionBar.getTitle()); + text.setSpan(new ForegroundColorSpan(Color.BLUE), 0, text.length(), Spannable.SPAN_INCLUSIVE_INCLUSIVE); + actionBar.setTitle(text); + + getSupportActionBar().setHomeAsUpIndicator(getColoredArrow()); } + private Drawable getColoredArrow() { + Drawable arrowDrawable = getResources().getDrawable(R.drawable.abc_ic_ab_back_mtrl_am_alpha); + Drawable wrapped = DrawableCompat.wrap(arrowDrawable); + + if (arrowDrawable != null && wrapped != null) { + // This should avoid tinting all the arrows + arrowDrawable.mutate(); + DrawableCompat.setTint(wrapped, Color.GRAY); + } + + return wrapped; + } + @Override public void onProfileLoaded(Cursor cursor) { -- GitLab From e2d637db9728df7220099a3307f471b2dab66455 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Tue, 3 Nov 2020 15:06:36 +0530 Subject: [PATCH 25/79] update Setting toolbar color --- res/values/styles.xml | 3 --- .../preference/DisplayOptionsPreferenceFragment.java | 8 ++++++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/res/values/styles.xml b/res/values/styles.xml index f4e84f52ba..c5d0eb1e9f 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -224,9 +224,6 @@ - diff --git a/src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java b/src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java index 82e90b3176..c829598f40 100644 --- a/src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java +++ b/src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java @@ -27,6 +27,8 @@ import android.content.IntentFilter; import android.content.Loader; import android.content.res.Resources; import android.database.Cursor; +import android.graphics.PorterDuff; +import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Bundle; import android.preference.Preference; @@ -191,6 +193,12 @@ public class DisplayOptionsPreferenceFragment extends PreferenceFragment mRootView = new FrameLayout(getActivity()); final View list = super.onCreateView(inflater, mRootView, savedInstanceState); mRootView.addView(list); + + final Drawable upArrow = getResources().getDrawable(R.drawable.abc_ic_ab_back_mtrl_am_alpha); + upArrow.setColorFilter(getResources().getColor(R.color.grey), PorterDuff.Mode.SRC_ATOP); + getSupportActionBar().setHomeAsUpIndicator(upArrow); + + return mRootView; } -- GitLab From 8a1212eafd613de97249c4dedea2badfaf577838 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Tue, 3 Nov 2020 17:15:34 +0530 Subject: [PATCH 26/79] update Setting toolbar color --- res/layout/contact_editor_activity.xml | 1 + .../contacts/preference/ContactsPreferenceActivity.java | 5 +++++ .../preference/DisplayOptionsPreferenceFragment.java | 5 ----- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/res/layout/contact_editor_activity.xml b/res/layout/contact_editor_activity.xml index 36fc64aa16..fc30c121f0 100644 --- a/res/layout/contact_editor_activity.xml +++ b/res/layout/contact_editor_activity.xml @@ -30,6 +30,7 @@ android:background="?android:attr/colorPrimary" android:elevation="4dp" app:navigationContentDescription="@string/cancel_button_content_description" + app:theme="@style/ThemeOverlay.AppCompat.Light" app:navigationIcon="@drawable/quantum_ic_close_vd_theme_24" app:title="@string/contact_editor_title_existing_contact" /> diff --git a/src/com/android/contacts/preference/ContactsPreferenceActivity.java b/src/com/android/contacts/preference/ContactsPreferenceActivity.java index 0ca1c8715f..5a8f908d4a 100644 --- a/src/com/android/contacts/preference/ContactsPreferenceActivity.java +++ b/src/com/android/contacts/preference/ContactsPreferenceActivity.java @@ -81,6 +81,11 @@ public final class ContactsPreferenceActivity extends PreferenceActivity } + Toolbar toolbar = (Toolbar)findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + + + mProviderStatusWatcher = ProviderStatusWatcher.getInstance(this); mNewLocalProfileExtra = getIntent().getStringExtra(EXTRA_NEW_LOCAL_PROFILE); diff --git a/src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java b/src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java index c829598f40..16d9049270 100644 --- a/src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java +++ b/src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java @@ -194,11 +194,6 @@ public class DisplayOptionsPreferenceFragment extends PreferenceFragment final View list = super.onCreateView(inflater, mRootView, savedInstanceState); mRootView.addView(list); - final Drawable upArrow = getResources().getDrawable(R.drawable.abc_ic_ab_back_mtrl_am_alpha); - upArrow.setColorFilter(getResources().getColor(R.color.grey), PorterDuff.Mode.SRC_ATOP); - getSupportActionBar().setHomeAsUpIndicator(upArrow); - - return mRootView; } -- GitLab From b66d7b09f2b094948e90979147f1bc571af156b7 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Tue, 3 Nov 2020 18:27:19 +0530 Subject: [PATCH 27/79] fixed some bugs for build --- .../ContactsPreferenceActivity.java | 22 +++---------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/src/com/android/contacts/preference/ContactsPreferenceActivity.java b/src/com/android/contacts/preference/ContactsPreferenceActivity.java index 5a8f908d4a..94223a8cb5 100644 --- a/src/com/android/contacts/preference/ContactsPreferenceActivity.java +++ b/src/com/android/contacts/preference/ContactsPreferenceActivity.java @@ -41,6 +41,8 @@ import android.view.View; import android.view.ViewGroup; import com.android.contacts.R; +import com.android.contacts.activities.PeopleActivity; +import com.android.contacts.drawer.DrawerFragment; import com.android.contacts.editor.SelectAccountDialogFragment; import com.android.contacts.interactions.ImportDialogFragment; import com.android.contacts.list.ProviderStatusWatcher; @@ -84,7 +86,7 @@ public final class ContactsPreferenceActivity extends PreferenceActivity Toolbar toolbar = (Toolbar)findViewById(R.id.toolbar); setSupportActionBar(toolbar); - + toolbar.setTitleTextColor(getResources().getColor(R.color.color_default_blue1)); mProviderStatusWatcher = ProviderStatusWatcher.getInstance(this); @@ -211,26 +213,8 @@ public final class ContactsPreferenceActivity extends PreferenceActivity } - Spannable text = new SpannableString(actionBar.getTitle()); - text.setSpan(new ForegroundColorSpan(Color.BLUE), 0, text.length(), Spannable.SPAN_INCLUSIVE_INCLUSIVE); - actionBar.setTitle(text); - - getSupportActionBar().setHomeAsUpIndicator(getColoredArrow()); - } - private Drawable getColoredArrow() { - Drawable arrowDrawable = getResources().getDrawable(R.drawable.abc_ic_ab_back_mtrl_am_alpha); - Drawable wrapped = DrawableCompat.wrap(arrowDrawable); - - if (arrowDrawable != null && wrapped != null) { - // This should avoid tinting all the arrows - arrowDrawable.mutate(); - DrawableCompat.setTint(wrapped, Color.GRAY); - } - - return wrapped; } - @Override public void onProfileLoaded(Cursor cursor) { boolean hasProfile = false; -- GitLab From 2182c2f4fe5f300f00fc990e6e8d77fcbe36bf6f Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Tue, 3 Nov 2020 18:49:47 +0530 Subject: [PATCH 28/79] searchIcon update color --- .../android/contacts/activities/ContactSelectionActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/contacts/activities/ContactSelectionActivity.java b/src/com/android/contacts/activities/ContactSelectionActivity.java index beb61d60c8..0a7521326e 100644 --- a/src/com/android/contacts/activities/ContactSelectionActivity.java +++ b/src/com/android/contacts/activities/ContactSelectionActivity.java @@ -690,7 +690,7 @@ public class ContactSelectionActivity extends AppCompatContactsActivity implemen final Drawable searchIcon = searchItem.getIcon(); if (searchIcon != null) { searchIcon.mutate().setColorFilter(ContextCompat.getColor(this, - R.color.actionbar_icon_color), PorterDuff.Mode.SRC_ATOP); + R.color.color_default_blue1), PorterDuff.Mode.SRC_ATOP); } return true; } -- GitLab From 06cf77c9d5986ecbd8a43332db61e7aa1d2f4c5c Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Tue, 3 Nov 2020 19:37:13 +0530 Subject: [PATCH 29/79] update for some test --- .../android/contacts/activities/ContactSelectionActivity.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/com/android/contacts/activities/ContactSelectionActivity.java b/src/com/android/contacts/activities/ContactSelectionActivity.java index 0a7521326e..0fef1a568b 100644 --- a/src/com/android/contacts/activities/ContactSelectionActivity.java +++ b/src/com/android/contacts/activities/ContactSelectionActivity.java @@ -34,6 +34,7 @@ import android.view.MenuItem; import android.view.View; import android.view.View.OnClickListener; import android.view.View.OnFocusChangeListener; +import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; @@ -692,6 +693,8 @@ public class ContactSelectionActivity extends AppCompatContactsActivity implemen searchIcon.mutate().setColorFilter(ContextCompat.getColor(this, R.color.color_default_blue1), PorterDuff.Mode.SRC_ATOP); } + ImageView iconSearch = searchItem.findViewById(android.support.v7.appcompat.R.id.search_button); + iconSearch.setColorFilter(getResources().getColor(R.color.color_default_blue1)); return true; } -- GitLab From bb9d3fcd3014f02a9d9c0b3d3d7f3a48a8dd21f5 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Tue, 3 Nov 2020 20:00:58 +0530 Subject: [PATCH 30/79] log for test --- .../contacts/activities/ContactSelectionActivity.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/com/android/contacts/activities/ContactSelectionActivity.java b/src/com/android/contacts/activities/ContactSelectionActivity.java index 0fef1a568b..4926209b58 100644 --- a/src/com/android/contacts/activities/ContactSelectionActivity.java +++ b/src/com/android/contacts/activities/ContactSelectionActivity.java @@ -687,14 +687,15 @@ public class ContactSelectionActivity extends AppCompatContactsActivity implemen final MenuItem searchItem = menu.findItem(R.id.menu_search); searchItem.setVisible(!mIsSearchMode && mIsSearchSupported); - + Log.e("TAG","..............menu 0"); final Drawable searchIcon = searchItem.getIcon(); if (searchIcon != null) { + Log.e("TAG","..............menu 1"); searchIcon.mutate().setColorFilter(ContextCompat.getColor(this, R.color.color_default_blue1), PorterDuff.Mode.SRC_ATOP); + Log.e("TAG","..............menu 2"); } - ImageView iconSearch = searchItem.findViewById(android.support.v7.appcompat.R.id.search_button); - iconSearch.setColorFilter(getResources().getColor(R.color.color_default_blue1)); + return true; } -- GitLab From 6e1bf5a7101a1563142205f4fbf7f354791d517a Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Tue, 3 Nov 2020 20:09:53 +0530 Subject: [PATCH 31/79] update for search menu icon --- .../activities/ContactSelectionActivity.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/com/android/contacts/activities/ContactSelectionActivity.java b/src/com/android/contacts/activities/ContactSelectionActivity.java index 4926209b58..81d4511087 100644 --- a/src/com/android/contacts/activities/ContactSelectionActivity.java +++ b/src/com/android/contacts/activities/ContactSelectionActivity.java @@ -164,6 +164,17 @@ public class ContactSelectionActivity extends AppCompatContactsActivity implemen && mRequest.getActionCode() != ContactsRequest.ACTION_PICK_PHONES && !mRequest.isLegacyCompatibilityMode(); configureSearchMode(); + + setOverflowButtonColor(mToolbar, getResources().getColor(R.color.color_default_blue1)); + } + + public static void setOverflowButtonColor(final Toolbar toolbar, final int color) { + Drawable drawable = toolbar.getOverflowIcon(); + if(drawable != null) { + drawable = DrawableCompat.wrap(drawable); + DrawableCompat.setTint(drawable.mutate(), color); + toolbar.setOverflowIcon(drawable); + } } private void configureSearchMode() { @@ -687,13 +698,13 @@ public class ContactSelectionActivity extends AppCompatContactsActivity implemen final MenuItem searchItem = menu.findItem(R.id.menu_search); searchItem.setVisible(!mIsSearchMode && mIsSearchSupported); - Log.e("TAG","..............menu 0"); + final Drawable searchIcon = searchItem.getIcon(); if (searchIcon != null) { - Log.e("TAG","..............menu 1"); + searchIcon.mutate().setColorFilter(ContextCompat.getColor(this, R.color.color_default_blue1), PorterDuff.Mode.SRC_ATOP); - Log.e("TAG","..............menu 2"); + } return true; -- GitLab From 716a6bb16143cd291802a06f3b84f13d4673fbfa Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Tue, 3 Nov 2020 20:36:35 +0530 Subject: [PATCH 32/79] update for search menu icon fixed for build failed --- .../android/contacts/activities/ContactSelectionActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/contacts/activities/ContactSelectionActivity.java b/src/com/android/contacts/activities/ContactSelectionActivity.java index 81d4511087..c04444d498 100644 --- a/src/com/android/contacts/activities/ContactSelectionActivity.java +++ b/src/com/android/contacts/activities/ContactSelectionActivity.java @@ -64,7 +64,7 @@ import com.android.contacts.list.UiIntentActions; import com.android.contacts.logging.ListEvent; import com.android.contacts.util.ImplicitIntentsUtil; import com.android.contacts.util.ViewUtil; - +import androidx.core.graphics.drawable.DrawableCompat; import java.util.ArrayList; /** -- GitLab From 78f983cbbd1ff0aa5a85d14cd072a9d32b335ec8 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Tue, 3 Nov 2020 21:44:31 +0530 Subject: [PATCH 33/79] Search bar icons color update --- res/drawable/quantum_ic_menu_vd_theme_24.xml | 2 +- res/layout/search_bar_expanded.xml | 5 +++-- src/com/android/contacts/activities/ActionBarAdapter.java | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/res/drawable/quantum_ic_menu_vd_theme_24.xml b/res/drawable/quantum_ic_menu_vd_theme_24.xml index ba6adcbc42..fdb88f3b93 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/layout/search_bar_expanded.xml b/res/layout/search_bar_expanded.xml index 9f90bc7d09..58294a3b3c 100644 --- a/res/layout/search_bar_expanded.xml +++ b/res/layout/search_bar_expanded.xml @@ -28,9 +28,10 @@ android:layout_height="@dimen/search_box_icon_size" android:layout_marginEnd="@dimen/search_box_navigation_icon_margin" android:src="@drawable/quantum_ic_arrow_back_vd_theme_24" + android:tint="@color/color_default_blue1" android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/action_menu_back_from_search" - android:tint="@color/actionbar_background_color" /> + /> diff --git a/src/com/android/contacts/activities/ActionBarAdapter.java b/src/com/android/contacts/activities/ActionBarAdapter.java index 27bcc7a351..c04e3856b3 100644 --- a/src/com/android/contacts/activities/ActionBarAdapter.java +++ b/src/com/android/contacts/activities/ActionBarAdapter.java @@ -155,6 +155,7 @@ public class ActionBarAdapter implements OnCloseListener { mSearchView.addTextChangedListener(new SearchTextWatcher()); final ImageButton searchBackButton = (ImageButton) mSearchContainer .findViewById(R.id.search_back_button); + searchBackButton.setOnClickListener( new OnClickListener() { @Override @@ -336,6 +337,7 @@ public class ActionBarAdapter implements OnCloseListener { mToolbar.setContentInsetsRelative(mMaxToolbarContentInsetStart, mToolbar.getContentInsetEnd()); mToolbar.setNavigationIcon(R.drawable.quantum_ic_menu_vd_theme_24); + } else { mToolbar.setNavigationIcon(null); } -- GitLab From f2096fefa85a009a2e63d54a0d56ff84f5dd0297 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Tue, 3 Nov 2020 21:46:09 +0530 Subject: [PATCH 34/79] Search bar icons color update --- .../android/contacts/activities/ContactSelectionActivity.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/android/contacts/activities/ContactSelectionActivity.java b/src/com/android/contacts/activities/ContactSelectionActivity.java index c04444d498..b249c485be 100644 --- a/src/com/android/contacts/activities/ContactSelectionActivity.java +++ b/src/com/android/contacts/activities/ContactSelectionActivity.java @@ -134,6 +134,8 @@ public class ContactSelectionActivity extends AppCompatContactsActivity implemen configureActivityTitle(); this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); + + setOverflowButtonColor(mToolbar, getResources().getColor(R.color.color_default_blue1)); } public boolean isSelectionMode() { @@ -165,7 +167,7 @@ public class ContactSelectionActivity extends AppCompatContactsActivity implemen && !mRequest.isLegacyCompatibilityMode(); configureSearchMode(); - setOverflowButtonColor(mToolbar, getResources().getColor(R.color.color_default_blue1)); + } public static void setOverflowButtonColor(final Toolbar toolbar, final int color) { -- GitLab From 06a3b1d614b2a8b8458b7244bd54ba4899296d30 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Tue, 3 Nov 2020 22:41:41 +0530 Subject: [PATCH 35/79] Search bar icons color update --- .../contacts/list/DefaultContactBrowseListFragment.java | 9 +++++++++ .../android/contacts/list/GroupMemberPickerFragment.java | 2 ++ 2 files changed, 11 insertions(+) diff --git a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java index f07c4a5a59..3b7a347eda 100644 --- a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java +++ b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java @@ -998,6 +998,15 @@ public class DefaultContactBrowseListFragment extends ContactBrowseListFragment } super.onCreateOptionsMenu(menu, inflater); inflater.inflate(R.menu.people_options, menu); + + final MenuItem searchItem = menu.findItem(R.id.menu_search); + final Drawable searchIcon = searchItem.getIcon(); + if (searchIcon != null) { + + searchIcon.mutate().setColorFilter(ContextCompat.getColor(this, + R.color.color_default_blue1), PorterDuff.Mode.SRC_ATOP); + + } } @Override diff --git a/src/com/android/contacts/list/GroupMemberPickerFragment.java b/src/com/android/contacts/list/GroupMemberPickerFragment.java index e94d73b1c4..4567827d04 100644 --- a/src/com/android/contacts/list/GroupMemberPickerFragment.java +++ b/src/com/android/contacts/list/GroupMemberPickerFragment.java @@ -270,6 +270,8 @@ public class GroupMemberPickerFragment extends public void onCreateOptionsMenu(Menu menu, MenuInflater menuInflater) { super.onCreateOptionsMenu(menu, menuInflater); menuInflater.inflate(R.menu.group_member_picker, menu); + + } @Override -- GitLab From 9a4b44de29cf7f7948c00e57c0cb514a919ca4a1 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Wed, 4 Nov 2020 07:52:25 +0530 Subject: [PATCH 36/79] Search bar icons color update --- .../android/contacts/list/DefaultContactBrowseListFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java index 3b7a347eda..2b8b9b1172 100644 --- a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java +++ b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java @@ -1003,7 +1003,7 @@ public class DefaultContactBrowseListFragment extends ContactBrowseListFragment final Drawable searchIcon = searchItem.getIcon(); if (searchIcon != null) { - searchIcon.mutate().setColorFilter(ContextCompat.getColor(this, + searchIcon.mutate().setColorFilter(ContextCompat.getColor(mActivity, R.color.color_default_blue1), PorterDuff.Mode.SRC_ATOP); } -- GitLab From 75f450306ba2b43376e9cd8e5ed7366db1423049 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Wed, 4 Nov 2020 08:29:15 +0530 Subject: [PATCH 37/79] update some of color --- res/values/colors.xml | 4 ++-- res/values/styles.xml | 4 ++-- src/com/android/contacts/activities/PeopleActivity.java | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/res/values/colors.xml b/res/values/colors.xml index fcdf545d4b..16eb5cd294 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -32,7 +32,7 @@ #0f000000 - #FFFFFF + @color/color_default_blue1 @color/primary_color @@ -196,7 +196,7 @@ - #ffffff + @color/color_default_blue1 #8C000000 diff --git a/res/values/styles.xml b/res/values/styles.xml index c5d0eb1e9f..be81565eaf 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -271,12 +271,12 @@ diff --git a/src/com/android/contacts/activities/ContactEditorActivity.java b/src/com/android/contacts/activities/ContactEditorActivity.java index edc7a2ae51..56745113f7 100644 --- a/src/com/android/contacts/activities/ContactEditorActivity.java +++ b/src/com/android/contacts/activities/ContactEditorActivity.java @@ -355,6 +355,7 @@ public class ContactEditorActivity extends AppCompatContactsActivity implements mActionBarTitleResId = R.string.contact_editor_title_new_contact; } mToolbar.setTitle(mActionBarTitleResId); + mToolbar.setTitleTextColor(getResources().getColor(R.color.color_default_blue1)); // Set activity title for Talkback setTitle(mActionBarTitleResId); @@ -389,7 +390,7 @@ public class ContactEditorActivity extends AppCompatContactsActivity implements DynamicShortcuts.reportShortcutUsed(this, DynamicShortcuts.SHORTCUT_ADD_CONTACT); } - + this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); } @Override diff --git a/src/com/android/contacts/activities/ContactSelectionActivity.java b/src/com/android/contacts/activities/ContactSelectionActivity.java index b249c485be..cccb2fbf7e 100644 --- a/src/com/android/contacts/activities/ContactSelectionActivity.java +++ b/src/com/android/contacts/activities/ContactSelectionActivity.java @@ -135,7 +135,7 @@ public class ContactSelectionActivity extends AppCompatContactsActivity implemen this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); - setOverflowButtonColor(mToolbar, getResources().getColor(R.color.color_default_blue1)); + } public boolean isSelectionMode() { -- GitLab From 43a5ab36400f543006710f696c755b0297f05121 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Wed, 4 Nov 2020 12:39:28 +0530 Subject: [PATCH 39/79] update for illegalStateException in Setting Screen --- res/values/styles.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/res/values/styles.xml b/res/values/styles.xml index f2e1281899..8d93498327 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -285,8 +285,11 @@ + diff --git a/src/com/android/contacts/preference/ContactsPreferenceActivity.java b/src/com/android/contacts/preference/ContactsPreferenceActivity.java index bbf7bfd101..df7ecc5800 100644 --- a/src/com/android/contacts/preference/ContactsPreferenceActivity.java +++ b/src/com/android/contacts/preference/ContactsPreferenceActivity.java @@ -86,7 +86,7 @@ public final class ContactsPreferenceActivity extends PreferenceActivity Toolbar toolbar = (Toolbar)findViewById(R.id.toolbar); setSupportActionBar(toolbar); - //toolbar.setTitleTextColor(this.getResources().getColor(R.color.color_default_blue1)); + toolbar.setTitleTextColor(this.getResources().getColor(R.color.color_default_blue1)); mProviderStatusWatcher = ProviderStatusWatcher.getInstance(this); @@ -111,7 +111,7 @@ public final class ContactsPreferenceActivity extends PreferenceActivity setActivityTitle(R.string.activity_title_settings); } } - this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); + } @Override -- GitLab From 2ca47ebd2b6e44ee04ef2109cea4a8c30e583b66 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Wed, 4 Nov 2020 19:45:12 +0530 Subject: [PATCH 42/79] setting update fixed --- .../contacts/preference/ContactsPreferenceActivity.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/com/android/contacts/preference/ContactsPreferenceActivity.java b/src/com/android/contacts/preference/ContactsPreferenceActivity.java index df7ecc5800..03421bc5d1 100644 --- a/src/com/android/contacts/preference/ContactsPreferenceActivity.java +++ b/src/com/android/contacts/preference/ContactsPreferenceActivity.java @@ -83,11 +83,6 @@ public final class ContactsPreferenceActivity extends PreferenceActivity } - Toolbar toolbar = (Toolbar)findViewById(R.id.toolbar); - setSupportActionBar(toolbar); - - toolbar.setTitleTextColor(this.getResources().getColor(R.color.color_default_blue1)); - mProviderStatusWatcher = ProviderStatusWatcher.getInstance(this); mNewLocalProfileExtra = getIntent().getStringExtra(EXTRA_NEW_LOCAL_PROFILE); -- GitLab From 9785715c7fcbe44b2089172111e92276734888bf Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Wed, 4 Nov 2020 20:41:45 +0530 Subject: [PATCH 43/79] setting set status bar icons colors --- .../android/contacts/preference/ContactsPreferenceActivity.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/com/android/contacts/preference/ContactsPreferenceActivity.java b/src/com/android/contacts/preference/ContactsPreferenceActivity.java index 03421bc5d1..71e2201ae9 100644 --- a/src/com/android/contacts/preference/ContactsPreferenceActivity.java +++ b/src/com/android/contacts/preference/ContactsPreferenceActivity.java @@ -107,6 +107,8 @@ public final class ContactsPreferenceActivity extends PreferenceActivity } } + this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); + } @Override -- GitLab From a8869849d8f0b92ff4525df294ee8b4b037694e4 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Wed, 4 Nov 2020 20:59:45 +0530 Subject: [PATCH 44/79] setting set status bar icons colors --- res/values/styles.xml | 4 ++-- .../contacts/preference/ContactsPreferenceActivity.java | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/res/values/styles.xml b/res/values/styles.xml index 719129ef4b..6e25cc7842 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -189,8 +189,8 @@ @style/ContactsActionBarStyleAppCompat @style/ContactsActionBarStyleAppCompat diff --git a/src/com/android/contacts/preference/ContactsPreferenceActivity.java b/src/com/android/contacts/preference/ContactsPreferenceActivity.java index 914c3d6e5c..71e2201ae9 100644 --- a/src/com/android/contacts/preference/ContactsPreferenceActivity.java +++ b/src/com/android/contacts/preference/ContactsPreferenceActivity.java @@ -83,9 +83,6 @@ public final class ContactsPreferenceActivity extends PreferenceActivity } - toolbar.getNavigationIcon().setColorFilter(getResources().getColor(R.color.blue_gray_15), PorterDuff.Mode.SRC_ATOP); - - mProviderStatusWatcher = ProviderStatusWatcher.getInstance(this); mNewLocalProfileExtra = getIntent().getStringExtra(EXTRA_NEW_LOCAL_PROFILE); -- GitLab From 228c6a1366efc3d98178bb0d37412554cf73b617 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Wed, 4 Nov 2020 22:43:54 +0530 Subject: [PATCH 46/79] update Dialog positive and negative Button background --- .../interactions/ContactMultiDeletionInteraction.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java b/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java index 47b76a5399..9b844af223 100644 --- a/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java +++ b/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java @@ -31,6 +31,7 @@ import android.os.Bundle; import android.provider.ContactsContract.RawContacts; import android.text.TextUtils; import android.util.Log; +import android.widget.Button; import com.android.contacts.ContactSaveService; import com.android.contacts.R; @@ -283,6 +284,14 @@ public class ContactMultiDeletionInteraction extends Fragment } ) .create(); + Button negativeButton = mDialog.getButton(DialogInterface.BUTTON_NEGATIVE); + Button positiveButton = mDialog.getButton(DialogInterface.BUTTON_POSITIVE); + + if(negativeButton != null) { + negativeButton.setBackgroundColor(getResources().getColor(R.color.color_default_blue1)); + }if(positiveButton != null) { + positiveButton.setBackgroundColor(getResources().getColor(R.color.color_default_blue1)); + } mDialog.setOnDismissListener(new OnDismissListener() { @Override -- GitLab From d305d1986b01a3549fdf4a0b055b9ec5978119c8 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Wed, 4 Nov 2020 23:33:59 +0530 Subject: [PATCH 47/79] update Dialog positive and negative Button background --- .../ContactMultiDeletionInteraction.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java b/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java index 9b844af223..0ae239ee3b 100644 --- a/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java +++ b/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java @@ -284,14 +284,6 @@ public class ContactMultiDeletionInteraction extends Fragment } ) .create(); - Button negativeButton = mDialog.getButton(DialogInterface.BUTTON_NEGATIVE); - Button positiveButton = mDialog.getButton(DialogInterface.BUTTON_POSITIVE); - - if(negativeButton != null) { - negativeButton.setBackgroundColor(getResources().getColor(R.color.color_default_blue1)); - }if(positiveButton != null) { - positiveButton.setBackgroundColor(getResources().getColor(R.color.color_default_blue1)); - } mDialog.setOnDismissListener(new OnDismissListener() { @Override @@ -300,6 +292,15 @@ public class ContactMultiDeletionInteraction extends Fragment mDialog = null; } }); + + mDialog.setOnShowListener( new DialogInterface.OnShowListener() { + @Override + public void onShow(DialogInterface arg0) { + mDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(getResources().getColor(R.color.color_default_blue1)); + mDialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(getResources().getColor(R.color.color_default_blue1)); + } + }); + mDialog.show(); } -- GitLab From a57010deb5709357c33cfaa96d827f01c76e05b6 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Thu, 5 Nov 2020 08:21:45 +0530 Subject: [PATCH 48/79] update OverFlow button color --- res/values-v27/styles.xml | 1 + res/values/styles.xml | 1 + .../android/contacts/activities/ActionBarAdapter.java | 2 +- .../contacts/activities/ContactSelectionActivity.java | 10 ++-------- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/res/values-v27/styles.xml b/res/values-v27/styles.xml index 57ed440a53..60f2ec582a 100644 --- a/res/values-v27/styles.xml +++ b/res/values-v27/styles.xml @@ -82,6 +82,7 @@ @drawable/quantum_ic_close_vd_theme_24 @color/primary_text_color @color/secondary_text_color + @android:color/transparent @style/ListViewStyle @color/background_primary diff --git a/res/values/styles.xml b/res/values/styles.xml index e1e67b22b8..8a4b6e918c 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -354,6 +354,7 @@ since the Alert dialog is private. They are identical anyway. --> + diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java index ee44b9f549..708eb6fc69 100644 --- a/src/com/android/contacts/activities/PeopleActivity.java +++ b/src/com/android/contacts/activities/PeopleActivity.java @@ -1325,9 +1325,9 @@ public class PeopleActivity extends AppCompatContactsActivity implements * */ private int fetchAccentColor() { - this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); - this.getWindow().setNavigationBarColor(R.color.black); - + // this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); + // this.getWindow().setNavigationBarColor(R.color.expanding_entry_card_button_text_color); + this.getWindow().getDecorView().setSystemUiVisibility(SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR); int color=getResources().getColor(R.color.accent); color_default_primary_text=getResources().getColor(R.color.color_default_primary_text); -- GitLab From 155cc404b9e3f07ccc742b6904e551a71c44e0ac Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Thu, 19 Nov 2020 12:14:51 +0530 Subject: [PATCH 62/79] update toolbar for contacts to display --- res/values/styles.xml | 2 ++ src/com/android/contacts/activities/PeopleActivity.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/res/values/styles.xml b/res/values/styles.xml index c89135f4c4..bdf49c5dd3 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -303,6 +303,8 @@ diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java index 708eb6fc69..16ed294d6a 100644 --- a/src/com/android/contacts/activities/PeopleActivity.java +++ b/src/com/android/contacts/activities/PeopleActivity.java @@ -1327,6 +1327,8 @@ public class PeopleActivity extends AppCompatContactsActivity implements private int fetchAccentColor() { // this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); // this.getWindow().setNavigationBarColor(R.color.expanding_entry_card_button_text_color); + + this.getWindow().getDecorView().setSystemUiVisibility(SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR); int color=getResources().getColor(R.color.accent); -- GitLab From 934838803dbdcbc5896c512545969e83008a4dde Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Thu, 19 Nov 2020 13:24:19 +0530 Subject: [PATCH 63/79] update toolbar for contacts to display --- res/values/styles.xml | 4 ++++ .../android/contacts/activities/PeopleActivity.java | 5 +++-- .../android/contacts/list/AccountFilterActivity.java | 11 +++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/res/values/styles.xml b/res/values/styles.xml index bdf49c5dd3..c8df4b1e45 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -26,10 +26,14 @@ + @@ -127,6 +128,7 @@ @@ -128,7 +128,7 @@