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

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

Merge 81e450c5 on remote branch 

Change-Id: I24ad5309e7e356f8db88b1558c39d6fa1882909b
parents 884dfe70 81e450c5

res/layout/multi_pick_activity.xml

100644 → 100755
+6 −6
Original line number Diff line number Diff line
@@ -87,20 +87,20 @@ 
        android:layout_width="match_parent"

        android:layout_height="@dimen/multi_pick_linear_layout_for_button_height"

        android:layout_gravity="bottom"

        android:gravity="end|center_vertical"

        android:orientation="vertical" >

        android:gravity="center"

        android:orientation="horizontal" >



        <TextView

            android:id="@+id/btn_ok"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:layout_marginEnd="@dimen/ok_or_clear_button_margin_end"

            android:enabled="false"

            android:background="?android:attr/selectableItemBackgroundBorderless"

            android:fontFamily="sans-serif-medium"

            android:paddingRight="16dp"

            android:paddingLeft="16dp"

            android:gravity="end|center_vertical"

            android:gravity="center"

            android:text="@string/btn_ok"

            android:textSize="@dimen/ok_or_clear_button_text_size" />

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.isPickPhone()) {

                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.isPickPhone()) {

                if (mPickMode.isPickCall()) {

                    if (mDelCallLogFragment == null) {

                        mDelCallLogFragment = (DelCallLogFragment) f;