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

Commit d42412a7 authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Revert "get Accent color from OS and implement" 

This reverts commit f8ef4e67.
parent fde8fc0d

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

+0 −34
Original line number Diff line number Diff line
@@ -28,11 +28,8 @@ import android.content.Intent; 
import android.content.IntentFilter;

import android.content.SyncStatusObserver;

import android.content.res.Configuration;

import android.content.res.TypedArray;

import android.graphics.Color;

import android.graphics.drawable.ColorDrawable;

import android.net.Uri;

import android.os.Build;

import android.os.Bundle;

import android.os.Handler;

import android.provider.ContactsContract;
@@ -50,14 +47,11 @@ import androidx.appcompat.app.ActionBarDrawerToggle; 
import androidx.appcompat.app.AppCompatActivity;

import androidx.appcompat.widget.Toolbar;

import android.util.Log;

import android.util.TypedValue;

import android.view.KeyCharacterMap;

import android.view.KeyEvent;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;

import android.view.Window;

import android.view.WindowManager;

import android.view.accessibility.AccessibilityEvent;

import android.view.accessibility.AccessibilityManager;

import android.widget.ImageButton;
@@ -117,7 +111,6 @@ public class PeopleActivity extends AppCompatContactsActivity implements 
        DrawerFragmentListener,

        SelectAccountDialogFragment.Listener {



    public static int ACCENT_COLOR = 0;

    /** Possible views of Contacts app. */

    public enum ContactsView {

        NONE,
@@ -420,7 +413,6 @@ public class PeopleActivity extends AppCompatContactsActivity implements 
            Log.d(Constants.PERFORMANCE_TAG, "PeopleActivity.onCreate finish");

        }

        getWindow().setBackgroundDrawable(null);

        ACCENT_COLOR=fetchAccentColor();

    }



    @Override
@@ -1300,30 +1292,4 @@ public class PeopleActivity extends AppCompatContactsActivity implements 
    }





    /*

     * get Accent color from OS

     * */



    private int fetchAccentColor() {

        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));



        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {

            Window window = getWindow();

            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);

            window.setStatusBarColor(color);

        }

        getSupportActionBar().setBackgroundDrawable(

                new ColorDrawable(color));





        return color;

    }





}

src/com/android/contacts/drawer/DrawerAdapter.java

+0 −2
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ import com.android.contacts.util.ImplicitIntentsUtil; 
import com.android.contacts.util.SharedPreferenceUtil;

import com.android.contactsbind.HelpUtils;

import com.android.contactsbind.ObjectFactory;

import static com.android.contacts.activities.PeopleActivity.ACCENT_COLOR;



import java.util.ArrayList;

import java.util.List;
@@ -261,7 +260,6 @@ public class DrawerAdapter extends BaseAdapter { 
        titleView.setText(item.text);

        final ImageView iconView = (ImageView) result.findViewById(R.id.icon);

        iconView.setImageResource(item.icon);

        iconView.setColorFilter(ACCENT_COLOR,  android.graphics.PorterDuff.Mode.MULTIPLY);

        final TextView newBadge = (TextView) result.findViewById(R.id.assistant_new_badge);

        final boolean showWelcomeBadge = !SharedPreferenceUtil.isWelcomeCardDismissed(mActivity);

        newBadge.setVisibility(item.contactsView == ContactsView.ASSISTANT && showWelcomeBadge

src/com/android/contacts/list/CustomContactListFilterActivity.java

+2 −7
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ import android.widget.ExpandableListView.ExpandableListContextMenuInfo; 
import android.widget.TextView;



import com.android.contacts.R;

import com.android.contacts.activities.PeopleActivity;

import com.android.contacts.model.AccountTypeManager;

import com.android.contacts.model.ValuesDelta;

import com.android.contacts.model.account.AccountInfo;
@@ -601,12 +600,8 @@ public class CustomContactListFilterActivity extends Activity implements 
            final int textColor = mContext.getResources().getColor(isExpanded

                    ? R.color.dialtacts_theme_color

                    : R.color.account_filter_text_color);

//            text1.setTextColor(textColor);

//            text2.setTextColor(textColor);

//

            text1.setTextColor(PeopleActivity.ACCENT_COLOR);

            text2.setTextColor(PeopleActivity.ACCENT_COLOR);



            text1.setTextColor(textColor);

            text2.setTextColor(textColor);



            return convertView;

        }