Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 22e2aaaa: Merge change 22656 into eclair

Browse Source 
Merge commit '22e2aaaa5cb465679320e1027240d5150f574706' into eclair-plus-aosp

* commit '22e2aaaa5cb465679320e1027240d5150f574706':
  Adding an aggregation mode: AGGREGATION_SUSPENDED
This commit is contained in:
Dmitri Plotnikov
2009-08-25 18:34:53 -07:00
committed by Android Git Automerger
parent 381bc38355 22e2aaaa5c
commit d30866fba3
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/provider/ContactsContract.java
View File

@@ -453,16 +453,25 @@ public final class ContactsContract {
*/ */
public static final int AGGREGATION_MODE_IMMEDITATE = 1; public static final int AGGREGATION_MODE_IMMEDITATE = 1;
/**
* If {@link #AGGREGATION_MODE} is {@link #AGGREGATION_MODE_SUSPENDED}, changes
* to the raw contact do not cause its aggregation to be revisited. Note that changing
* {@link #AGGREGATION_MODE} from {@link #AGGREGATION_MODE_SUSPENDED} to
* {@link #AGGREGATION_MODE_DEFAULT} does not trigger an aggregation pass. Any subsequent
* change to the raw contact's data will.
*/
public static final int AGGREGATION_MODE_SUSPENDED = 2;
/** /**
* Aggregation mode: never aggregate this raw contact (note that the raw contact will not * Aggregation mode: never aggregate this raw contact (note that the raw contact will not
* have a corresponding Aggregate and therefore will not be included in Aggregates * have a corresponding Aggregate and therefore will not be included in Aggregates
* query results.) * query results.)
*/ */
public static final int AGGREGATION_MODE_DISABLED = 2; public static final int AGGREGATION_MODE_DISABLED = 3;
/** /**
* A sub-directory of a single raw contact that contains all of their {@link Data} rows. * A sub-directory of a single raw contact that contains all of their {@link Data} rows.
* To access this directory append * To access this directory append {@link Data#CONTENT_DIRECTORY} to the contact URI.
*/ */
public static final class Data implements BaseColumns, DataColumns { public static final class Data implements BaseColumns, DataColumns {
/** /**