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

Commit d1eaef30 authored by Evan Millar's avatar Evan Millar Committed by The Android Open Source Project
Browse files

Automated import from //branches/cupcake/...@141899,141899

parent 9f6b0505

res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -256,6 +256,9 @@ 
    <!-- The group type that displays only contacts with phone numbers -->

    <string name="groupNameWithPhones">Contacts with phone numbers</string>

    

    <!-- The group type that displays "Starred in Android" contacts -->

    <string name="starredInAndroid">Starred in Android</string>

    

    <!-- Toast displayed when a contact is created -->

    <string name="contactCreatedToast">Contact created.</string>

src/com/android/contacts/ContactsGroupSyncSelector.java

+5 −0
Original line number Diff line number Diff line
@@ -207,6 +207,11 @@ public final class ContactsGroupSyncSelector extends ListActivity implements Vie 
                    String systemId = cursor.isNull(COLUMN_INDEX_SYSTEM_ID) ?

                            null : cursor.getString(COLUMN_INDEX_SYSTEM_ID);

                    if (systemId == null || !Groups.GROUP_MY_CONTACTS.equals(systemId)) {

                        // Localize the "Starred in Android" string which we get from the server

                        // side.

                        if (Groups.GROUP_ANDROID_STARRED.equals(name)) {

                            name = getString(R.string.starredInAndroid);

                        }

                        items.add(name);

                        checked.add(cursor.getInt(COLUMN_INDEX_SHOULD_SYNC) != 0);

                        groupIds.add(cursor.getLong(COLUMN_INDEX_ID));

src/com/android/contacts/ContactsListActivity.java

+5 −2
Original line number Diff line number Diff line
@@ -1343,6 +1343,11 @@ public final class ContactsListActivity extends ListActivity 
                if (cursor.isNull(GROUPS_COLUMN_INDEX_SYSTEM_ID)

                        && !Groups.GROUP_MY_CONTACTS.equals(systemId)) {

                    // All groups that aren't My Contacts, since that one is localized on the phone



                    // Localize the "Starred in Android" string which we get from the server side.

                    if (Groups.GROUP_ANDROID_STARRED.equals(name)) {

                        name = getString(R.string.starredInAndroid);

                    }

                    groups.add(name);

                    if (name.equals(mDisplayInfo)) {

                        currentIndex = groups.size() - 1;
@@ -1780,5 +1785,3 @@ public final class ContactsListActivity extends ListActivity 
        }

    }

}