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

Commit 81e450c5 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of android_ui.lnx.2.1-00009. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1064429   I2f40516eb96d2d05cda2d7f3f27228c1adc2e3e4   Remove "Refresh" menu in quick contacts
1064433   I9d2f1eba7bc1d3411ae1bbdd5063cadb2ef95426   contacts crashed
1064433   I9ea2fedc0cc10bb24334f9efd161b2f566dfa136   Phone will auto reboot when click message in contact whe

Change-Id: I596f222cddd1d27155e6974e549a3ea3d4cabd3e
CRs-Fixed: 1064429, 1064433
parents e060a576 335db0f8

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

+15 −12
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ public class ExpandingEntryCardView extends CardView { 
    private String mContactName;

    private Handler mHandler;

    private boolean mEnablePresence = false;

    private boolean mHaveFetched = false;



    private static final Property<View, Integer> VIEW_LAYOUT_HEIGHT_PROPERTY =

            new Property<View, Integer>(Integer.class, "height") {
@@ -890,6 +891,7 @@ public class ExpandingEntryCardView extends CardView { 
        if (mEnablePresence) {

            if (mEnable == CallUtil.ENABLE_VIDEO_CALLING) {

                showVTicon = ContactDisplayUtils.getVTCapability(entry.getHeader());

                if(!mHaveFetched){

                    new Thread(new Runnable(){

                        public void run(){

                            if (null != entry.getHeader()) {
@@ -898,14 +900,15 @@ public class ExpandingEntryCardView extends CardView { 
                                boolean newVT = ContactDisplayUtils.startAvailabilityFetch(

                                            entry.getHeader());

                                if (oldVT != newVT) {

                                    mHaveFetched = true;

                                    mHandler.sendEmptyMessage(PRESENCE_AVAILABILITY_FETCH);

                                }

                            }

                        }



                    }).start();

                }

            }

        }

        if (entry.getThirdIcon() != null && entry.getThirdAction() != Entry.ACTION_NONE

                && (mEnablePresence ? showVTicon : true/*This true is used for the keep AOSP*/)) {

            thirdIcon.setImageDrawable(entry.getThirdIcon());

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

+4 −2
Original line number Diff line number Diff line
@@ -1036,8 +1036,10 @@ public class QuickContactActivity extends ContactsActivity 
            mContactCard.setCallBack(new VideoCallingCallback(){

                @Override

                public void updateContact(){

                    if(mContactData != null){

                        reFreshContact();

                    }

                }

            });

        }
@@ -2881,7 +2883,7 @@ public class QuickContactActivity extends ContactsActivity 
            }



            final MenuItem refreshMenuItem = menu.findItem(R.id.menu_refresh);

            refreshMenuItem.setVisible(isContactEditable());

            refreshMenuItem.setVisible(false);



            final MenuItem deleteMenuItem = menu.findItem(R.id.menu_delete);

            deleteMenuItem.setVisible(isContactEditable() && !mContactData.isUserProfile());