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

Commit 64df2d11 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of android_ui.lnx.2.1-00016.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1072080   Ic97c68e33454cbe7a9e4c90456de19e67404adf8   Fix ClassCastException during monkey test
1061655   I24f7472876ee6fd8ff1f45315f2a97da36e55bf7   Contacts: Check the state of writing system settings per
1069312   Iff6752240e76e47e83710e715684fc84cfb7bc57   Fix delete call log screen force close in split mode

Change-Id: Ic4309d4b5ca02e5500ccedf664f9100bbe77a32a
CRs-Fixed: 1069312, 1061655, 1072080
parents a1d3fbe0 b9ab67d4
Loading
Loading
Loading
Loading
+11 −7
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ public class MultiPickContactsActivity extends Activity implements ViewPager.OnP
            // occur crash.
            position = getRtlPosition(position);

            if (mAreTabsHiddenInViewPager || !mPickMode.isPickPhone()) {
            if (!mPickMode.isPickPhone()) {
                if (mPickMode.isPickCall()) {
                    mDelCallLogFragment = new DelCallLogFragment();
                    mDelCallLogFragment.setCheckListListener(new CheckListListener());
@@ -295,15 +295,15 @@ public class MultiPickContactsActivity extends Activity implements ViewPager.OnP
        public Object instantiateItem(ViewGroup container, int position) {

            Fragment f = (Fragment) super.instantiateItem(container, position);
            if (mAreTabsHiddenInViewPager || !mPickMode.isPickPhone()) {
            if (!mPickMode.isPickPhone()) {
                if (mPickMode.isPickCall()) {
                    if (mDelCallLogFragment == null) {
                    if (mDelCallLogFragment == null && f instanceof DelCallLogFragment) {
                        mDelCallLogFragment = (DelCallLogFragment) f;
                        mDelCallLogFragment
                                .setCheckListListener(new CheckListListener());
                    }
                } else {
                    if (mContactsFragment == null) {
                    if (mContactsFragment == null && f instanceof ContactsFragment) {
                        mContactsFragment = (ContactsFragment) f;
                        mContactsFragment
                                .setCheckListListener(new CheckListListener());
@@ -312,21 +312,21 @@ public class MultiPickContactsActivity extends Activity implements ViewPager.OnP
            } else {
                switch (position) {
                case TAB_INDEX_RECENT:
                    if (mCallLogFragment == null) {
                    if (mCallLogFragment == null && f instanceof CallLogFragment) {
                        mCallLogFragment = (CallLogFragment) f;
                        mCallLogFragment
                                .setCheckListListener(new CheckListListener());
                    }
                    break;
                case TAB_INDEX_CONTACTS:
                    if (mContactsFragment == null) {
                    if (mContactsFragment == null && f instanceof ContactsFragment) {
                        mContactsFragment = (ContactsFragment) f;
                        mContactsFragment
                                .setCheckListListener(new CheckListListener());
                    }
                    break;
                case TAB_INDEX_GROUP:
                    if (mGroupFragment == null) {
                    if (mGroupFragment == null && f instanceof GroupsFragment) {
                        mGroupFragment = (GroupsFragment) f;
                        mGroupFragment
                                .setCheckListListener(new CheckListListener());
@@ -714,6 +714,10 @@ public class MultiPickContactsActivity extends Activity implements ViewPager.OnP
        }
    }

    public CheckListListener createListener() {
        return new CheckListListener();
    }

    private void configureSearchMode() {
        TextView topDividerLine = (TextView) findViewById(R.id.multi_pick_top_divider);
        if (mSearchUiVisible) {
+5 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ import android.widget.AbsListView;
import android.widget.TextView;

import com.android.contacts.R;
import com.android.contacts.activities.MultiPickContactsActivity;
import com.android.contacts.common.ContactPhotoManager;
import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
import com.android.contacts.common.util.UriUtils;
@@ -175,6 +176,10 @@ public class CallLogFragment extends ListFragment {
        resolver = mContext.getContentResolver();
        resolver.registerContentObserver(Calls.CONTENT_URI, true, mCallLogObserver);

        if (mCheckListListener == null) {
            mCheckListListener = ((MultiPickContactsActivity) getActivity())
                    .createListener();
        }
        if (mCallLogListAdapter == null) {
            mCallLogListAdapter = new CallLogItemListAdapter(mContext);
            mContactsCheckedList = new ArrayList<String>();
+3 −0
Original line number Diff line number Diff line
@@ -254,6 +254,9 @@ public class ContactsFragment extends ListFragment {
                checkedList = new ArrayList<String>();
            }
        }
        if (mCheckListListener == null)
            mCheckListListener = ((MultiPickContactsActivity) getActivity())
                    .createListener();
        mHeaderView = new View(mContext);
        AbsListView.LayoutParams layoutParams = new AbsListView.LayoutParams(
                AbsListView.LayoutParams.MATCH_PARENT,
+4 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import android.widget.ListView;
import android.widget.AbsListView;

import com.android.contacts.R;
import com.android.contacts.activities.MultiPickContactsActivity;
import com.android.contacts.list.OnCheckListActionListener;

public class DelCallLogFragment extends ListFragment
@@ -95,6 +96,9 @@ public class DelCallLogFragment extends ListFragment
    public void onActivityCreated(Bundle savedInstanceState) {
        super.onActivityCreated(savedInstanceState);

        if (mCheckListListener == null)
            mCheckListListener = ((MultiPickContactsActivity) getActivity())
                    .createListener();
        if (mDelCallLogAdapter == null) {
            mDelCallLogAdapter = new DelCallLogAdapter(mContext);
            mDelCallLogAdapter.setCheckListListener(mCheckListListener);
+4 −0
Original line number Diff line number Diff line
@@ -187,6 +187,10 @@ public class GroupsFragment extends ExpandableListFragment implements OnGroupCli
        mList.setOnGroupClickListener(this);
        mList.setOnChildClickListener(this);
        mList.setDivider(null);
        if (mCheckListListener == null) {
            mCheckListListener = ((MultiPickContactsActivity) getActivity())
                    .createListener();
        }
        if (mAdapter == null) {
            if (mAllContactsCurosrMap == null) {
                mAllContactsCurosrMap = new HashMap<Long, String[]>();
Loading