From 63697af83b5479733f2d4398b4199b8e492f532b Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Thu, 24 Sep 2009 01:24:31 -0700
Subject: [PATCH] Generalize DELAY_STARRED_UPDATE location.

---
 .../android/provider/ContactsContract.java    | 43 ++++++++++---------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java
index 8ce9f08c1e624..6b2ab3f3608f8 100644
--- a/core/java/android/provider/ContactsContract.java
+++ b/core/java/android/provider/ContactsContract.java
@@ -408,6 +408,29 @@ public final class ContactsContract {
          */
         public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/contact";
 
+        /**
+         * An optional query parameter added to {@link Groups#CONTENT_URI} or
+         * {@link Settings#CONTENT_URI} signaling that any update of
+         * {@link Contacts#STARRED} should not be triggered based on
+         * {@link Groups#GROUP_VISIBLE} or {@link Settings#UNGROUPED_VISIBLE}
+         * during the current update. Callers should follow-up with a separate
+         * update using {@link #FORCE_STARRED_UPDATE} to ensure that
+         * {@link Contacts#STARRED} remains consistent.
+         *
+         * @hide
+         */
+        public static final String DELAY_STARRED_UPDATE = "delay_update";
+
+        /**
+         * An optional query parameter added to {@link Groups#CONTENT_URI} or
+         * {@link Settings#CONTENT_URI} signaling that a full update of
+         * {@link Contacts#STARRED} should be triggered. This is usually only
+         * needed after using {@link #DELAY_STARRED_UPDATE}.
+         *
+         * @hide
+         */
+        public static final String FORCE_STARRED_UPDATE = "force_update";
+
         /**
          * A sub-directory of a single contact that contains all of the constituent raw contact
          * {@link Data} rows.
@@ -1876,26 +1899,6 @@ public final class ContactsContract {
          * The MIME type of a single group.
          */
         public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/group";
-
-        /**
-         * An optional query parameter added to {@link #CONTENT_URI} signaling
-         * that any update of {@link Contacts#STARRED} should not be triggered
-         * based on {@link #GROUP_VISIBLE} during the current update. Callers
-         * should follow-up with a separate update using {@link #FORCE_UPDATE}
-         * to ensure that {@link Contacts#STARRED} remains consistent.
-         *
-         * @hide
-         */
-        public static final String DELAY_UPDATE = "delay_update";
-
-        /**
-         * An optional query parameter added to {@link #CONTENT_URI} signaling
-         * that a full update of {@link Contacts#STARRED} should be triggered.
-         * This is usually only needed after using {@link #DELAY_UPDATE}.
-         *
-         * @hide
-         */
-        public static final String FORCE_UPDATE = "force_update";
     }
 
     /**