diff --git a/res/drawable/fab_bg.xml b/res/drawable/fab_bg.xml new file mode 100644 index 0000000000000000000000000000000000000000..007d3e2205970326bf43ef64f6729a8e52c31a06 --- /dev/null +++ b/res/drawable/fab_bg.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/res/drawable/quantum_ic_add_vd_theme_24.xml b/res/drawable/quantum_ic_add_vd_theme_24.xml index 167dafee63d448a9416732563a79d07356a4c8a5..3ceffde2d9acbdef41c9e7ff073c2c94ce99c159 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_close_vd_theme_24.xml b/res/drawable/quantum_ic_close_vd_theme_24.xml index 0aafe4b5a158bb6b305b33557ac6872204e275e5..955f7912485b489357222a9081800bc13b92bf6f 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_menu_vd_theme_24.xml b/res/drawable/quantum_ic_menu_vd_theme_24.xml index ba6adcbc427f13b4ac3065852c03972de4f6d666..fdb88f3b93c7dd2d96d64daf38cd8dd7033ffc96 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_search_vd_theme_24.xml b/res/drawable/quantum_ic_search_vd_theme_24.xml index 5c5632a84b629c1d87230358289726f5eef5e832..6e9da640e287a26d99e812ea7a0c390938211a6e 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/layout/contact_editor_activity.xml b/res/layout/contact_editor_activity.xml index 5843a58cddd8aff568636d4894cdf7252dae8c4c..f99bc807412a1d6c14c55fc0c98d914c58e3260f 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/res/layout/contact_list_filter_item.xml b/res/layout/contact_list_filter_item.xml index 4d1fbca70f91f4964edae1c25d1746b64eb414d2..637b2246ab851f3544323c19e5aa837696e16643 100644 --- a/res/layout/contact_list_filter_item.xml +++ b/res/layout/contact_list_filter_item.xml @@ -61,6 +61,7 @@ diff --git a/res/layout/date_picker.xml b/res/layout/date_picker.xml index c700f9e643c024616b234dfc99e9e8f1c8a2c819..9bfb8de996e8cc3a969c7e39fe8f9b5f56dfbe5c 100644 --- a/res/layout/date_picker.xml +++ b/res/layout/date_picker.xml @@ -36,7 +36,9 @@ android:textAppearance="?android:attr/textAppearanceLarge" android:layout_gravity="center_horizontal" android:layout_width="wrap_content" - android:layout_height="wrap_content"/> + android:layout_height="wrap_content" + android:buttonTint="@color/color_default_blue1" + /> \ No newline at end of file diff --git a/res/layout/floating_action_button.xml b/res/layout/floating_action_button.xml index a31512f19f7e3c65ea740aea63ec3057291a7a8f..bb616f2ed10daded30ab915ba7d868c46ed1ab37 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/layout/search_bar_expanded.xml b/res/layout/search_bar_expanded.xml index 9f90bc7d09167b31edee4da587fc80538a86e0d8..e630f034a309c51b4a6e471b22fb9f0c4bfca6fd 100644 --- a/res/layout/search_bar_expanded.xml +++ b/res/layout/search_bar_expanded.xml @@ -30,7 +30,7 @@ android:src="@drawable/quantum_ic_arrow_back_vd_theme_24" android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/action_menu_back_from_search" - android:tint="@color/actionbar_background_color" /> + android:tint="@color/color_default_blue1" /> diff --git a/res/menu/edit_contact.xml b/res/menu/edit_contact.xml index 039c6570eb694742dda92bd3b993cd1389c205cf..c049941d03399848da94007ad5fa730ba3cf2ead 100644 --- a/res/menu/edit_contact.xml +++ b/res/menu/edit_contact.xml @@ -17,6 +17,8 @@ + xmlns:contacts="http://schemas.android.com/apk/res-auto" + xmlns:app="http://schemas.android.com/tools"> + + contacts:showAsAction="ifRoom" + app:iconTint="@color/color_default_blue1" + /> + xmlns:contacts="http://schemas.android.com/apk/res-auto" + xmlns:app="http://schemas.android.com/tools"> diff --git a/res/values-v27/styles.xml b/res/values-v27/styles.xml index e821cc1570095ac1bc85b2026cc30a0db2bfef1d..a5ed0de5afa668d36f2e595df6a75cae4490f56c 100644 --- a/res/values-v27/styles.xml +++ b/res/values-v27/styles.xml @@ -52,6 +52,13 @@ @color/navigation_bar_bg @color/navigation_bar_divider true + @style/MyOverflowButtonStyle + true + + + + + @style/ContactsActionBarTitleTextAppCompat @style/ContactsActionBarTitleTextAppCompat + @style/MyOverflowButtonStyle + @color/color_default_blue1 + @@ -277,6 +297,9 @@ @@ -402,7 +425,7 @@ diff --git a/src/com/android/contacts/ContactsApplication.java b/src/com/android/contacts/ContactsApplication.java index 1507ace31d705446d3d03621f19b6cea2d5d2761..18447696c4745906569b638613e9abba6a4446c5 100644 --- a/src/com/android/contacts/ContactsApplication.java +++ b/src/com/android/contacts/ContactsApplication.java @@ -16,17 +16,21 @@ package com.android.contacts; +import android.app.Activity; import android.app.Application; import android.app.FragmentManager; import android.app.LoaderManager; import android.content.ContentResolver; import android.content.ContentUris; import android.content.Context; +import android.content.ContextWrapper; import android.content.SharedPreferences; import android.os.AsyncTask; +import android.os.Build; import android.os.StrictMode; import android.preference.PreferenceManager; import android.provider.ContactsContract.Contacts; +import android.util.AtomicFile; import android.util.Log; import com.android.contacts.testing.InjectedServices; @@ -118,6 +122,16 @@ public class ContactsApplication extends Application { } AnalyticsUtil.initialize(this); + + // setNavBarColor(getResources().getColor(R.color.actionbar_text_color_black), getActivity(getApplicationContext())); + + } + + public static Activity getActivity(Context context) { + if (context == null) return null; + if (context instanceof Activity) return (Activity) context; + if (context instanceof ContextWrapper) return getActivity(((ContextWrapper)context).getBaseContext()); + return null; } private class DelayedInitializer extends AsyncTask { diff --git a/src/com/android/contacts/activities/ActionBarAdapter.java b/src/com/android/contacts/activities/ActionBarAdapter.java index e6f29a4ab6a9044c44c8053a71e3b86c6cdc06b7..3b862e4b8e3231198cce190a3925c3558fdc8624 100644 --- a/src/com/android/contacts/activities/ActionBarAdapter.java +++ b/src/com/android/contacts/activities/ActionBarAdapter.java @@ -466,7 +466,7 @@ public class ActionBarAdapter implements OnCloseListener { R.color.actionbar_color_grey_solid); } else { iconColor = mActivity.getResources().getColor( - R.color.actionbar_text_color); + R.color.color_default_blue1); } overflow.setImageTintList(ColorStateList.valueOf(iconColor)); } diff --git a/src/com/android/contacts/activities/ContactEditorActivity.java b/src/com/android/contacts/activities/ContactEditorActivity.java index 74a0df6b14a20bdc001e2de2f184680194ac90cd..aa37cc1a1549e3270de1fe92e247c19d3da1af75 100644 --- a/src/com/android/contacts/activities/ContactEditorActivity.java +++ b/src/com/android/contacts/activities/ContactEditorActivity.java @@ -22,6 +22,7 @@ import android.content.ComponentName; import android.content.ContentValues; import android.content.Intent; import android.net.Uri; +import android.os.Build; import android.os.Bundle; import android.provider.ContactsContract.QuickContact; import androidx.appcompat.widget.Toolbar; @@ -45,6 +46,13 @@ import com.android.contacts.util.ImplicitIntentsUtil; import java.io.FileNotFoundException; import java.util.ArrayList; +import android.graphics.Color; +import android.graphics.PorterDuff; +import android.graphics.drawable.Drawable; + +import static android.view.WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS; + + /** * Contact editor with only the most important fields displayed initially. */ @@ -345,6 +353,7 @@ public class ContactEditorActivity extends AppCompatContactsActivity implements setContentView(R.layout.contact_editor_activity); mToolbar = (Toolbar) findViewById(R.id.toolbar); + mToolbar.setTitleTextColor(getResources().getColor(R.color.color_default_blue1)); setSupportActionBar(mToolbar); if (Intent.ACTION_EDIT.equals(action)) { mActionBarTitleResId = R.string.contact_editor_title_existing_contact; @@ -377,6 +386,14 @@ public class ContactEditorActivity extends AppCompatContactsActivity implements if (Intent.ACTION_INSERT.equals(action)) { DynamicShortcuts.reportShortcutUsed(this, DynamicShortcuts.SHORTCUT_ADD_CONTACT); } + // this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); + if(Build.VERSION.SDK_INT >= 27) { + this.getWindow().getDecorView().setSystemUiVisibility(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS | + View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR | + 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 57669faaa1204bc2c0d302a79bcca817d854009a..7b66ee040ee415bd2af5ab4b625959b39204d589 100644 --- a/src/com/android/contacts/activities/ContactSelectionActivity.java +++ b/src/com/android/contacts/activities/ContactSelectionActivity.java @@ -22,10 +22,12 @@ import android.content.Intent; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.net.Uri; +import android.os.Build; import android.os.Bundle; import android.provider.ContactsContract.Contacts; import androidx.core.content.ContextCompat; import androidx.appcompat.widget.Toolbar; +import android.widget.ImageView; import android.text.TextUtils; import android.util.Log; import android.view.Menu; @@ -66,6 +68,8 @@ import com.android.contacts.util.ViewUtil; import java.util.ArrayList; +import static android.view.WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS; + /** * Displays a list of contacts (or phone numbers or postal addresses) for the * purposes of selecting one. @@ -131,6 +135,15 @@ public class ContactSelectionActivity extends AppCompatContactsActivity implemen prepareSearchViewAndActionBar(savedState); configureActivityTitle(); + + // this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); + + if(Build.VERSION.SDK_INT >= 27) { + this.getWindow().getDecorView().setSystemUiVisibility(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS | + View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR | + View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); + } + } public boolean isSelectionMode() { @@ -688,7 +701,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; } diff --git a/src/com/android/contacts/activities/LicenseActivity.java b/src/com/android/contacts/activities/LicenseActivity.java index e279a91bde0f6af001df50df3ae9293d158800b6..255420e3aef92c175d0ac0219c6612b93bc7258c 100644 --- a/src/com/android/contacts/activities/LicenseActivity.java +++ b/src/com/android/contacts/activities/LicenseActivity.java @@ -15,14 +15,18 @@ */ package com.android.contacts.activities; +import android.os.Build; import android.os.Bundle; import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AppCompatActivity; import android.view.MenuItem; +import android.view.View; import android.webkit.WebView; import com.android.contacts.R; +import static android.view.WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS; + /** * Displays the licenses for all open source libraries. */ @@ -40,6 +44,14 @@ public class LicenseActivity extends AppCompatActivity { if (actionBar != null) { actionBar.setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP, ActionBar.DISPLAY_HOME_AS_UP); } + //this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); + + if(Build.VERSION.SDK_INT >= 27) { + this.getWindow().getDecorView().setSystemUiVisibility(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS | + View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR | + View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); + } + } @Override diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java index 62195ba76c314ce9fcf7ee14dc86eafc7173e896..42a8278d9db6f975224e7a4075167270c72c5c30 100644 --- a/src/com/android/contacts/activities/PeopleActivity.java +++ b/src/com/android/contacts/activities/PeopleActivity.java @@ -103,12 +103,15 @@ import com.android.contacts.widget.FloatingActionButtonController; import com.android.contactsbind.FeatureHighlightHelper; import com.android.contactsbind.HelpUtils; import com.android.contactsbind.ObjectFactory; - +import android.graphics.drawable.Drawable; +import android.graphics.PorterDuff; import com.google.common.util.concurrent.Futures; import java.util.Collections; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; +import static android.view.View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR; +import static android.view.WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS; /** * Displays a list to browse contacts. @@ -193,6 +196,10 @@ 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; @@ -385,6 +392,7 @@ public class PeopleActivity extends AppCompatContactsActivity implements mToggle = new ContactsActionBarDrawerToggle(this, mDrawerLayout, mToolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close); mDrawerLayout.setDrawerListener(mToggle); + mToggle.getDrawerArrowDrawable().setColor(getResources().getColor(R.color.color_default_blue1)); // Set fallback handler for when drawer is disabled. mToggle.setToolbarNavigationClickListener(new View.OnClickListener() { @Override @@ -420,6 +428,11 @@ public class PeopleActivity extends AppCompatContactsActivity implements Log.d(Constants.PERFORMANCE_TAG, "PeopleActivity.onCreate finish"); } getWindow().setBackgroundDrawable(null); + + getSupportActionBar().setHomeAsUpIndicator(changeBackArrowColor(this, Color.rgb(50, 50, 50))); + getSupportActionBar().getThemedContext(); + + ACCENT_COLOR=fetchAccentColor(); } @@ -638,6 +651,8 @@ public class PeopleActivity extends AppCompatContactsActivity implements mSaveServiceListener = new SaveServiceListener(); LocalBroadcastManager.getInstance(this).registerReceiver(mSaveServiceListener, new IntentFilter(ContactSaveService.BROADCAST_GROUP_DELETED)); + + mToggle.getDrawerArrowDrawable().setColor(getResources().getColor(R.color.color_default_blue1)); } public void updateStatusBarBackground() { @@ -1240,6 +1255,7 @@ public class PeopleActivity extends AppCompatContactsActivity implements public void onEmergencyViewSelected() { ImplicitIntentsUtil.startActivityOutsideApp(this, ImplicitIntentsUtil.getIntentForEmergencyInfo(this)); + } public boolean isGroupView() { @@ -1306,8 +1322,36 @@ public class PeopleActivity extends AppCompatContactsActivity implements private int fetchAccentColor() { + // this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); + + if(Build.VERSION.SDK_INT >= 27) { + this.getWindow().getDecorView().setSystemUiVisibility(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS | + View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR | + View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); + } + int color=getResources().getColor(R.color.accent); - return 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_blue1); + return color; + } + + 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; } diff --git a/src/com/android/contacts/drawer/DrawerAdapter.java b/src/com/android/contacts/drawer/DrawerAdapter.java index 011452bf52127ddfc80a329e4e91e2acc9e25afe..9592ce6f5b59e50cff1c3d59ed47514f9965f664 100644 --- a/src/com/android/contacts/drawer/DrawerAdapter.java +++ b/src/com/android/contacts/drawer/DrawerAdapter.java @@ -374,6 +374,7 @@ public class DrawerAdapter extends BaseAdapter { result.setActivated(activated); result.setContentDescription( displayableAccount.getTypeLabel() + " " + item.account.accountName); + updateSelectedStatus(textView, icon, activated); return result; } @@ -402,9 +403,11 @@ public class DrawerAdapter extends BaseAdapter { if (activated) { imageView.setColorFilter(ACCENT_COLOR, PorterDuff.Mode.SRC_ATOP); + textView.setTextColor(ACCENT_COLOR); } else { imageView.clearColorFilter(); } + } private void notifyChangeAndRebuildList() { diff --git a/src/com/android/contacts/editor/TextFieldsEditorView.java b/src/com/android/contacts/editor/TextFieldsEditorView.java index 28fe87fc6e4228c4d68434c9ef775cfcf2890663..1b51c520803e116ce3ac7d67cbdf2f130f05a5c6 100644 --- a/src/com/android/contacts/editor/TextFieldsEditorView.java +++ b/src/com/android/contacts/editor/TextFieldsEditorView.java @@ -40,6 +40,8 @@ import android.view.inputmethod.InputMethodManager; import android.widget.EditText; import android.widget.ImageView; import android.widget.LinearLayout; +import android.text.style.CharacterStyle; +import android.text.style.MetricAffectingSpan; import com.android.contacts.ContactsUtils; import com.android.contacts.R; @@ -344,6 +346,7 @@ public class TextFieldsEditorView extends LabeledEditorView { mFixedPhonetic = getPhonetic(column); mFixedDisplayName = displayNameField; } + } @Override diff --git a/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java b/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java index 47b76a5399fe6739ad6f5447bf9327a51e5d202f..efd1f081cd0dfbc3087556ee4ea686a0f7f860a7 100644 --- a/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java +++ b/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java @@ -291,6 +291,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(); } diff --git a/src/com/android/contacts/interactions/ImportDialogFragment.java b/src/com/android/contacts/interactions/ImportDialogFragment.java index 41b1c71844d0fa6645c1a7ee9474e651ea3902cb..7f41823a89917e24c939b6fa6d4b724059c8ff74 100644 --- a/src/com/android/contacts/interactions/ImportDialogFragment.java +++ b/src/com/android/contacts/interactions/ImportDialogFragment.java @@ -216,8 +216,18 @@ public class ImportDialogFragment extends DialogFragment { } else { builder.setSingleChoiceItems(adapter, -1, clickListener); } + AlertDialog dialog=builder.create(); + dialog.setOnShowListener( new DialogInterface.OnShowListener() { + @Override + public void onShow(DialogInterface arg0) { + dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(getResources().getColor(R.color.color_default_blue1)); + //dialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(getResources().getColor(R.color.color_default_blue1)); + } + }); + + + return dialog; - return builder.create(); } private int getSimContactCount(SimCard sim) { diff --git a/src/com/android/contacts/list/AccountFilterActivity.java b/src/com/android/contacts/list/AccountFilterActivity.java index 6559489fd6f49f16b29809adf9b8ec0a41214436..ab26cb45fa780cbbeeeba9ee0cc1511dfb136f7d 100644 --- a/src/com/android/contacts/list/AccountFilterActivity.java +++ b/src/com/android/contacts/list/AccountFilterActivity.java @@ -20,6 +20,9 @@ import android.app.ActionBar; import android.app.Activity; import android.content.Context; import android.content.Intent; +import android.graphics.PorterDuff; +import android.graphics.drawable.Drawable; +import android.os.Build; import android.os.Bundle; import android.view.LayoutInflater; import android.view.MenuItem; @@ -35,6 +38,8 @@ import com.android.contacts.model.AccountTypeManager; import java.util.ArrayList; import java.util.List; +import static android.view.WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS; + /** * Shows a list of all available accounts, letting the user select under which account to view * contacts. @@ -65,6 +70,13 @@ public class AccountFilterActivity extends Activity implements AdapterView.OnIte ActionBar actionBar = getActionBar(); if (actionBar != null) { + String resName = Build.VERSION.SDK_INT >= 23 ? "abc_ic_ab_back_material" : "abc_ic_ab_back_mtrl_am_alpha"; + int resINT = getResources().getIdentifier(resName, "drawable", getPackageName()); + + final Drawable upArrow = getResources().getDrawable(resINT); + upArrow.setColorFilter(getResources().getColor(R.color.color_default_blue1), PorterDuff.Mode.SRC_ATOP); + actionBar.setHomeAsUpIndicator(upArrow); + actionBar.setDisplayHomeAsUpEnabled(true); } @@ -80,6 +92,14 @@ public class AccountFilterActivity extends Activity implements AdapterView.OnIte filters.add(ContactListFilter.createFilterWithType( ContactListFilter.FILTER_TYPE_CUSTOM)); mListView.setAdapter(new FilterListAdapter(this, filters, mCurrentFilterType)); + // this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); + + if(Build.VERSION.SDK_INT >= 27) { + this.getWindow().getDecorView().setSystemUiVisibility(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS | + View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR | + View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); + } + } @Override diff --git a/src/com/android/contacts/list/CustomContactListFilterActivity.java b/src/com/android/contacts/list/CustomContactListFilterActivity.java index 3c3edd50a60a1454bf1fb3aa7a288d4101797282..e0e60dabf735198c6f433a45517041a3f5be413b 100644 --- a/src/com/android/contacts/list/CustomContactListFilterActivity.java +++ b/src/com/android/contacts/list/CustomContactListFilterActivity.java @@ -34,8 +34,11 @@ import android.content.Loader; import android.content.OperationApplicationException; import android.database.Cursor; import android.graphics.Color; +import android.graphics.PorterDuff; import android.graphics.drawable.ColorDrawable; +import android.graphics.drawable.Drawable; import android.net.Uri; +import android.os.Build; import android.os.Bundle; import android.os.RemoteException; import android.provider.ContactsContract; @@ -81,6 +84,8 @@ import java.util.List; import javax.annotation.Nullable; +import static android.view.WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS; + /** * Shows a list of all available {@link Groups} available, letting the user * select which ones they want to be visible. @@ -128,9 +133,27 @@ public class CustomContactListFilterActivity extends Activity implements ActionBar actionBar = getActionBar(); if (actionBar != null) { + String resName = Build.VERSION.SDK_INT >= 23 ? "abc_ic_ab_back_material" : "abc_ic_ab_back_mtrl_am_alpha"; + int resINT = getResources().getIdentifier(resName, "drawable", getPackageName()); + + final Drawable upArrow = getResources().getDrawable(resINT); + upArrow.setColorFilter(getResources().getColor(R.color.color_default_blue1), PorterDuff.Mode.SRC_ATOP); + actionBar.setHomeAsUpIndicator(upArrow); + // android.R.id.home will be triggered in onOptionsItemSelected() actionBar.setDisplayHomeAsUpEnabled(true); + + + + } + //this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); + + if(Build.VERSION.SDK_INT >= 27) { + this.getWindow().getDecorView().setSystemUiVisibility(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS | + View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR | + View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); } + } public static class CustomFilterConfigurationLoader extends ListenableFutureLoader { diff --git a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java index 9851d2b2822b703f4473c75a9ded13400f11a301..bb553ad66f196ef63b2fd320e529940080a6881a 100644 --- a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java +++ b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java @@ -998,6 +998,14 @@ 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(mActivity, + R.color.color_default_blue1), PorterDuff.Mode.SRC_ATOP); + } } @Override @@ -1028,7 +1036,7 @@ public class DefaultContactBrowseListFragment extends ContactBrowseListFragment final Drawable icon = menu.getItem(i).getIcon(); if (icon != null && !isSearchOrSelectionMode) { icon.mutate().setColorFilter(ContextCompat.getColor(getContext(), - R.color.actionbar_icon_color), PorterDuff.Mode.SRC_ATOP); + R.color.color_default_blue1), PorterDuff.Mode.SRC_ATOP); } } } diff --git a/src/com/android/contacts/preference/ContactsPreferenceActivity.java b/src/com/android/contacts/preference/ContactsPreferenceActivity.java index 1658f3d4326095234eda86d5d661792d61b8951a..8d74e387d21d73b5c183f71adc3179b07bb108b8 100644 --- a/src/com/android/contacts/preference/ContactsPreferenceActivity.java +++ b/src/com/android/contacts/preference/ContactsPreferenceActivity.java @@ -18,6 +18,7 @@ package com.android.contacts.preference; import android.content.res.Configuration; import android.database.Cursor; +import android.os.Build; import android.os.Bundle; import android.preference.PreferenceActivity; import android.provider.ContactsContract.DisplayNameSources; @@ -28,6 +29,8 @@ import androidx.annotation.StringRes; import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AppCompatDelegate; import androidx.appcompat.widget.Toolbar; + +import android.text.Html; import android.text.TextUtils; import android.view.MenuInflater; import android.view.MenuItem; @@ -43,6 +46,8 @@ import com.android.contacts.preference.DisplayOptionsPreferenceFragment.ProfileL import com.android.contacts.preference.DisplayOptionsPreferenceFragment.ProfileQuery; import com.android.contacts.util.AccountSelectionUtil; +import static android.view.WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS; + /** * Contacts settings. */ @@ -97,6 +102,14 @@ public final class ContactsPreferenceActivity extends PreferenceActivity setActivityTitle(R.string.activity_title_settings); } } + //this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); + + if(Build.VERSION.SDK_INT >= 27) { + this.getWindow().getDecorView().setSystemUiVisibility(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS | + View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR | + View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); + } + } @Override @@ -194,7 +207,11 @@ public final class ContactsPreferenceActivity extends PreferenceActivity private void setActivityTitle(@StringRes int res) { final ActionBar actionBar = mCompatDelegate.getSupportActionBar(); if (actionBar != null) { - actionBar.setTitle(res); + //actionBar.setTitle(res); + String title=this.getResources().getString(res); + + actionBar.setTitle(Html.fromHtml(""+title+" ")); + } } diff --git a/tests/res/layout/fill_call_log_test.xml b/tests/res/layout/fill_call_log_test.xml index 01ade3ea331dc32352a7ed8cb250fb5a03f17196..51a97a8b95ac2c9780b4e01570fe0e174a0fd193 100644 --- a/tests/res/layout/fill_call_log_test.xml +++ b/tests/res/layout/fill_call_log_test.xml @@ -38,6 +38,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/useRandomNumbers" + android:buttonTint="@color/color_default_blue1" />