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

Commit a892ad00 authored by Sean Midford's avatar Sean Midford Committed by Android (Google) Code Review
Browse files

Merge "Updated picker UI for linking and send to labels." into ub-contactsdialer-h-dev

parents 00b9dc34 85405d03

res/layout/join_contact_picker_section_header.xml

+5 −4
Original line number Diff line number Diff line
@@ -23,8 +23,9 @@ 
    <TextView

        android:id="@+id/text"

        style="@style/ContactListSeparatorTextViewStyle"

        android:paddingLeft="8dip"

        android:paddingRight="8dip"

        android:paddingStart="8dip"

        android:paddingEnd="8dip" />

        android:textAlignment="viewStart"

        android:paddingLeft="24dip"

        android:paddingRight="24dip"

        android:paddingStart="24dip"

        android:paddingEnd="24dip"/>

</LinearLayout>

res/values/dimens.xml

+2 −2
Original line number Diff line number Diff line
@@ -148,8 +148,8 @@ 
    <!-- For join screen. Mainly for tablet. -->

    <dimen name="join_header_left_margin">@dimen/contact_browser_list_header_left_margin</dimen>

    <dimen name="join_header_right_margin">@dimen/contact_browser_list_header_right_margin</dimen>

    <dimen name="join_header_top_margin">16dip</dimen>

    <dimen name="join_header_bottom_margin">0dip</dimen>

    <dimen name="join_header_top_margin">12dip</dimen>

    <dimen name="join_header_bottom_margin">12dip</dimen>



    <dimen name="contact_filter_header_min_height">24dip</dimen>

src/com/android/contacts/list/JoinContactListFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ public class JoinContactListFragment extends ContactEntryListFragment<JoinContac 
    @Override

    public JoinContactListAdapter createListAdapter() {

        JoinContactListAdapter adapter = new JoinContactListAdapter(getActivity());

        adapter.setPhotoPosition(ContactListItemView.getDefaultPhotoPosition(true /* opposite */));

        adapter.setPhotoPosition(ContactListItemView.getDefaultPhotoPosition(false /* opposite */));

        return adapter;

    }

src/com/android/contacts/list/MultiSelectEmailAddressesListAdapter.java

+0 −11
Original line number Diff line number Diff line
@@ -160,7 +160,6 @@ public class MultiSelectEmailAddressesListAdapter extends MultiSelectEntryContac 
        cursor.moveToPosition(position);



        bindViewId(view, cursor, EmailQuery.EMAIL_ID);

        bindSectionHeaderAndDivider(view, position);

        if (isFirstEntry) {

            bindName(view, cursor);

            bindQuickContact(view, partition, cursor, EmailQuery.PHOTO_ID,
@@ -190,16 +189,6 @@ public class MultiSelectEmailAddressesListAdapter extends MultiSelectEntryContac 
        view.showData(cursor, EmailQuery.EMAIL_ADDRESS);

    }



    protected void bindSectionHeaderAndDivider(final ContactListItemView view, int position) {

        final int section = getSectionForPosition(position);

        if (getPositionForSection(section) == position) {

            final String title = (String)getSections()[section];

            view.setSectionHeader(title);

        } else {

            view.setSectionHeader(null);

        }

    }



    protected void bindName(final ContactListItemView view, Cursor cursor) {

        view.showDisplayName(cursor, EmailQuery.DISPLAY_NAME, getContactNameDisplayOrder());

    }

src/com/android/contacts/list/MultiSelectEmailAddressesListFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ public class MultiSelectEmailAddressesListFragment 


    public MultiSelectEmailAddressesListFragment() {

        setPhotoLoaderEnabled(true);

        setSectionHeaderDisplayEnabled(true);

        setSectionHeaderDisplayEnabled(false);

        setSearchMode(false);

        setHasOptionsMenu(true);

        setListType(ListEvent.ListType.PICK_EMAIL);