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

Commit 0597f6c4 authored by Wenyi Wang's avatar Wenyi Wang
Browse files

Revert "Apply correct styles to account filter activities on tablets" 

This reverts commit a1146fe754bb4e69b4bc5810a293a42c4ea11529.

Change-Id: I18e8f64218f2d5a04810e51439a0fd50a7a581e0
parent bf71177f

src/com/android/contacts/common/list/AccountFilterActivity.java

+0 −12
Original line number Diff line number Diff line
@@ -63,10 +63,6 @@ public class AccountFilterActivity extends AppCompatActivity 


    private ContactListFilter mCurrentFilter;



    private ContactListFilterView mCustomFilterView; // the "Customize" filter



    private boolean mIsCustomFilterViewSelected;



    @Override

    protected void onCreate(Bundle icicle) {

        super.onCreate(icicle);
@@ -174,8 +170,6 @@ public class AccountFilterActivity extends AppCompatActivity 
        final ContactListFilter filter = (ContactListFilter) view.getTag();

        if (filter == null) return; // Just in case

        if (filter.filterType == ContactListFilter.FILTER_TYPE_CUSTOM) {

            mCustomFilterView = listFilterView;

            mIsCustomFilterViewSelected = listFilterView.isChecked();

            final Intent intent = new Intent(this,

                    CustomContactListFilterActivity.class);

            listFilterView.setActivated(true);
@@ -196,12 +190,6 @@ public class AccountFilterActivity extends AppCompatActivity 


    @Override

    protected void onActivityResult(int requestCode, int resultCode, Intent data) {

        if (resultCode == AppCompatActivity.RESULT_CANCELED && mCustomFilterView != null &&

                !mIsCustomFilterViewSelected) {

            mCustomFilterView.setActivated(false);

            return;

        }



        if (resultCode != AppCompatActivity.RESULT_OK) {

            return;

        }

src/com/android/contacts/common/list/ContactListFilterView.java

+0 −4
Original line number Diff line number Diff line
@@ -78,10 +78,6 @@ public class ContactListFilterView extends LinearLayout { 
        setContentDescription(generateContentDescription());

    }



    public boolean isChecked() {

        return mRadioButton.isChecked();

    }



    public void bindView(AccountTypeManager accountTypes) {

        if (mAccountType == null) {

            mIcon = (ImageView) findViewById(R.id.icon);