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

Commit a9415814 authored by Matt Garnes's avatar Matt Garnes
Browse files

Merge CAF branch 'LA.BR.1.2.1_rb2.12' into caf/cm-12.0.

parents 851f4b75 11a7d225

res/layout/expanding_entry_card_item.xml

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ 
        android:layout_height="wrap_content"

        android:layout_alignParentTop="true"

        android:layout_toEndOf="@+id/icon"

        android:layout_toStartOf="@+id/header"

        android:textColor="@color/quickcontact_entry_header_text_color"

        android:textAlignment="viewStart"

        android:layout_marginBottom="@dimen/expanding_entry_card_header_margin_bottom" />

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

+3 −1
Original line number Diff line number Diff line
@@ -196,10 +196,12 @@ public final class ShowOrCreateActivity extends ContactsActivity 
                finish();



            } else {

                if (!isDestroyed()) {

                    showDialog(CREATE_CONTACT_DIALOG);

                }

            }

        }

    }



    @Override

    protected Dialog onCreateDialog(int id) {

src/com/android/contacts/editor/ContactEditorUtils.java

100644 → 100755
+6 −1
Original line number Diff line number Diff line
@@ -283,8 +283,13 @@ public class ContactEditorUtils { 
    String[] getWritableAccountTypeStrings() {

        final Set<String> types = Sets.newHashSet();

        for (AccountType type : mAccountTypes.getAccountTypes(true)) {

            if (type.accountType.equals(SimContactsConstants.ACCOUNT_TYPE_SIM)

                    || type.accountType.equals(SimContactsConstants.ACCOUNT_TYPE_PHONE)) {

                continue;

            } else {

                types.add(type.accountType);

            }

        }

        return types.toArray(new String[types.size()]);

    }

src/com/android/contacts/group/GroupDetailFragment.java

100644 → 100755
+1 −0
Original line number Diff line number Diff line
@@ -290,6 +290,7 @@ public class GroupDetailFragment extends Fragment implements OnScrollListener { 
                Log.e(TAG, "Failed to load group members");

                return;

            }

            getActivity().invalidateOptionsMenu();

            updateSize(data.getCount());

            mAdapter.setContactCursor(data);

            mMemberListView.setEmptyView(mEmptyView);