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

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

Promotion of android_ui.lnx.2.1-00006. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1061579   Ib09ce8630736f5ec5d52074bc78918649c2c802d   Fix contact number display uncomplete in split screen
1039337   I6b835857a8ffda754c99579aabdca82b17673dd1   Contacts: fix the config mechanism for presence
1039337   Id80cff753552dece2a436f9404d94f926fa8862e   Contacts: Update config to control presence.
1063248   I168f4fa835098d3e9d51f9d92f98d22f10ee8bbc   Fix save contact to wrong sim card
1062064   I6c0a6fc9ff097eb6a2dd9262c6aebb2610a6ddd8   Fix FC when drag delete call log to split screen

Change-Id: I81403536f90d3b0ee17077dc3f783d7e0524233f
CRs-Fixed: 1062064, 1061579, 1039337, 1063248
parents 35e2c69b a8debdb8

res/layout/quickcontact_activity_landscape.xml

100644 → 100755
+7 −2
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:background="#00000000"

                android:layout_weight="1"

                android:id="@+id/toolbar_parent">



                <include layout="@layout/quickcontact_header" />
@@ -54,9 +55,13 @@ 
                <include layout="@layout/quickcontact_title_and_phoneticname" />



            </FrameLayout>



            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:layout_weight="3"

                android:orientation="horizontal">

            <include layout="@layout/quickcontact_content" />



            </LinearLayout>

        </LinearLayout>



    </LinearLayout>

res/values/bools.xml

+1 −0
Original line number Diff line number Diff line
@@ -17,5 +17,6 @@ 


    <bool name="quickcontact_two_panel">false</bool>

    <bool name="contact_all_list_show_card_frame">false</bool>

    <bool name="config_presence_enabled">false</bool>



</resources>

src/com/android/contacts/ContactSaveService.java

+21 −32
Original line number Diff line number Diff line
@@ -76,6 +76,8 @@ import java.util.HashSet; 
import java.util.List;

import java.util.concurrent.CopyOnWriteArrayList;



import org.codeaurora.wrapper.UiccPhoneBookController_Wrapper;



/**

 * A service responsible for saving changes to the content provider.

 */
@@ -707,8 +709,6 @@ public class ContactSaveService extends IntentService { 


        if (entity.isContactInsert()) {

            int count = 0;

                Cursor c = null;

                Uri iccUri;

            SubscriptionInfo subInfoRecord = null;

            try {

                subInfoRecord = mSubscriptionManager
@@ -717,24 +717,13 @@ public class ContactSaveService extends IntentService { 
                Log.w(TAG, "SecurityException thrown, lack permission for"

                        + " getActiveSubscriptionInfoList", e);

            }

                if (subInfoRecord == null) {

                    iccUri = Uri.parse(SimContactsConstants.SIM_URI);

                } else {

                    iccUri = Uri.parse(SimContactsConstants.SIM_SUB_URI

                            + subInfoRecord.getSubscriptionId());

            if (subInfoRecord != null) {

                int[] adnCount = UiccPhoneBookController_Wrapper

                        .getAdnRecordsCapacityForSubscriber(subInfoRecord.getSubscriptionId());

                if(adnCount!=null)

                    count= adnCount[MoreContactUtils.ADN_USED_POS];

            }

                try {

                    c = resolver.query(iccUri, null, null, null, null);

                    if (c != null) {

                        count = c.getCount();

                    }

                } finally {

                    if (c != null) {

                        c.close();

                    }

                }



                if (count == MoreContactUtils.getAdnCount(this, subscription)) {

            if (count >0 && count == MoreContactUtils.getAdnCount(this, subscription)) {

                return RESULT_SIM_FULL_FAILURE;

            }

        }

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

+2 −3
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) {

            if (mAreTabsHiddenInViewPager || mPickMode.isPickCall()) {

                if (mPickMode.isPickCall()) {

                    mDelCallLogFragment = new DelCallLogFragment();

                    mDelCallLogFragment.setCheckListListener(new CheckListListener());
@@ -295,8 +295,7 @@ public class MultiPickContactsActivity extends Activity implements ViewPager.OnP 
        public Object instantiateItem(ViewGroup container, int position) {



            Fragment f = (Fragment) super.instantiateItem(container, position);



            if (mAreTabsHiddenInViewPager) {

            if (mAreTabsHiddenInViewPager || mPickMode.isPickCall()) {

                if (mPickMode.isPickCall()) {

                    if (mDelCallLogFragment == null) {

                        mDelCallLogFragment = (DelCallLogFragment) f;

src/com/android/contacts/detail/ContactDisplayUtils.java

+0 −4
Original line number Diff line number Diff line
@@ -462,8 +462,6 @@ public class ContactDisplayUtils { 
                return vt;

            } catch (Exception e) {

                Log.d(TAG, "getVTCapOfContact ERROR " + e);

            } finally {

                return false;

            }

        }

        return false;
@@ -480,8 +478,6 @@ public class ContactDisplayUtils { 
                return vt;

            } catch (Exception e) {

                Log.d(TAG, "getVTCapability ERROR " + e);

            } finally {

                return false;

            }

        }

        return false;