Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26d203dd authored by Wenyi Wang's avatar Wenyi Wang Committed by android-build-merger
Browse files

Fix usage of getColor() on pre-M SDKs (2/2) 

am: 56dfa580

* commit '56dfa580':
  Fix usage of getColor() on pre-M SDKs (2/2)
parents e516d32b 56dfa580

src/com/android/contacts/activities/ActionBarAdapter.java

+5 −2
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ import com.android.contacts.R; 
import com.android.contacts.activities.ActionBarAdapter.Listener.Action;

import com.android.contacts.list.ContactsRequest;



import com.android.contacts.common.compat.CompatUtils;



/**

 * Adapter for the action bar at the top of the Contacts activity.

 */
@@ -502,11 +504,12 @@ public class ActionBarAdapter implements OnCloseListener { 


    private void updateStatusBarColor() {

        if (mSelectionMode) {

            int cabStatusBarColor = mActivity.getResources().getColor(

            final int cabStatusBarColor = mActivity.getResources().getColor(

                    R.color.contextual_selection_bar_status_bar_color);

            mActivity.getWindow().setStatusBarColor(cabStatusBarColor);

        } else {

            int normalStatusBarColor = mActivity.getColor(R.color.primary_color_dark);

            final int normalStatusBarColor = CompatUtils.getColorCompat

                    (mActivity, R.color.primary_color_dark);

            mActivity.getWindow().setStatusBarColor(normalStatusBarColor);

        }

    }

src/com/android/contacts/quickcontact/QuickContactActivity.java

+8 −8
Original line number Diff line number Diff line
@@ -183,8 +183,7 @@ import java.util.Set; 
import java.util.TreeSet;

import java.util.concurrent.ConcurrentHashMap;



import android.graphics.PorterDuff;

import android.support.v4.content.ContextCompat;

import com.android.contacts.common.compat.CompatUtils;



/**

 * Mostly translucent {@link Activity} that shows QuickContact dialog. It loads
@@ -644,10 +643,11 @@ public class QuickContactActivity extends ContactsActivity 


    private void enableLinkButton() {

        mSuggestionsLinkButton.setClickable(true);

        mSuggestionsLinkButton.getBackground().setColorFilter(getResources().getColor(

                R.color.primary_color, getTheme()), PorterDuff.Mode.SRC_ATOP);

        mSuggestionsLinkButton.setTextColor(getResources().getColor(android.R.color.white,

                getTheme()));

        mSuggestionsLinkButton.getBackground().setColorFilter(

                CompatUtils.getColorCompat(this, R.color.primary_color),

                PorterDuff.Mode.SRC_ATOP);

        mSuggestionsLinkButton.setTextColor(

                CompatUtils.getColorCompat(this, android.R.color.white));

        mSuggestionsLinkButton.setOnClickListener(new OnClickListener() {

            @Override

            public void onClick(View view) {
@@ -669,10 +669,10 @@ public class QuickContactActivity extends ContactsActivity 
    private void disableLinkButton() {

        mSuggestionsLinkButton.setClickable(false);

        mSuggestionsLinkButton.getBackground().setColorFilter(

                getResources().getColor(R.color.disabled_button_background, getTheme()),

                CompatUtils.getColorCompat(this, R.color.disabled_button_background),

                PorterDuff.Mode.SRC_ATOP);

        mSuggestionsLinkButton.setTextColor(

                getResources().getColor(R.color.disabled_button_text, getTheme()));

                CompatUtils.getColorCompat(this, R.color.disabled_button_text));

    }



    private interface ContextMenuIds {