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

Commit 627af1c9 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'donut' of git://github.com/Wysie/android_packages_apps_Contacts into donut

parents 781bb6d1 b207437f

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -842,7 +842,7 @@ 
    <string name="title_about_name">Mod Name</string>

    <string name="summary_about_name">Wysie Contacts</string>

    <string name="title_about_version">Version</string>

    <string name="summary_about_version">2.33</string>

    <string name="summary_about_version">2.34</string>

    <string name="title_about_credits">Credits</string>

    <string name="summary_about_credits">ChainsDD and the rest of XDA! :)</string>

src/com/android/contacts/EditContactActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -2773,7 +2773,7 @@ public final class EditContactActivity extends Activity implements View.OnClickL 
        for (int i = 0; i < selectedGroups.size(); i++) {        

            Cursor cursor = mResolver.query(Groups.CONTENT_URI,

                        GROUPS_PROJECTION, 

                        Contacts.Groups.NAME + "='" + selectedGroups.get(i) + "'", null, null);

                        Contacts.Groups.NAME + "=?", new String[] { selectedGroups.get(i).toString() } , null);

                        

            if (cursor != null) {

                if ((selectedGroups.get(i)).equals(Groups.GROUP_ANDROID_STARRED)) {

src/com/android/contacts/GroupsListActivity.java

+2 −1
Original line number Diff line number Diff line
@@ -298,7 +298,8 @@ public class GroupsListActivity extends ListActivity { 
        public boolean checkGroupExists(String groupName) {

            boolean exists = false;

            

            Cursor c = resolver.query(Groups.CONTENT_URI, GROUPS_PROJECTION, "UPPER(" + Groups.NAME + ")=UPPER('" + groupName + "')", null, null);

            Cursor c = resolver.query(Groups.CONTENT_URI, GROUPS_PROJECTION, "UPPER(" + Groups.NAME + ")=?",

                        new String[] { groupName.toUpperCase() }, null);

            

            if (c.getCount() > 0)

                exists = true;