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

Commit 8a0193e4 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Added StructuredPostal, renamed PACKAGE columns, cleanup. 

Changed Postal to StructuredPostal, which is the new type
coming down from GData.  This also prepares us for upcoming
data sources that need a structured version.  Because of the
number of columns required, we added 3 new DATA columns.

Moved PACKAGE back to Data rows to allow multiple apps to
merge their action entries under a single Contact.  Also
renamed to RES_PACKAGE to make clear that these packages are
strictly for loading resources, and do not imply the owner.

Removed RestrictionExceptions since we narrowed the scope
of IS_RESTRICTED for Eclair.  Factored out sync columns from
Groups and Contacts into its own interface.  Fixed general
warnings in comments.
parent 137f6fc9

core/java/android/provider/ContactsContract.java

+240 −172

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/provider/SocialContract.java

+5 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.provider;



import android.content.res.Resources;

import android.graphics.BitmapFactory;

import android.net.Uri;

import android.provider.ContactsContract.Aggregates;
@@ -36,11 +37,13 @@ public class SocialContract { 


    private interface ActivitiesColumns {

        /**

         * The package name that owns this social activity.

         * The package name to use when creating {@link Resources} objects for

         * this data row. This value is only designed for use when building user

         * interfaces, and should not be used to infer the owner.

         * <p>

         * Type: TEXT

         */

        public static final String PACKAGE = "package";

        public static final String RES_PACKAGE = "res_package";



        /**

         * The mime-type of this social activity.