Merge "Rehide some fields in ContactsContract" (ab5a6dc9) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −10

Original line number	Diff line number	Diff line
		@@ -23832,16 +23832,6 @@ package android.provider {
		field public static final int UNPINNED = 2147483647; // 0x7fffffff
		}

		public static final class ContactsContract.Preferences {
		ctor public ContactsContract.Preferences();
		field public static final java.lang.String DISPLAY_ORDER = "android.contacts.DISPLAY_ORDER";
		field public static final int DISPLAY_ORDER_ALTERNATIVE = 2; // 0x2
		field public static final int DISPLAY_ORDER_PRIMARY = 1; // 0x1
		field public static final java.lang.String SORT_ORDER = "android.contacts.SORT_ORDER";
		field public static final int SORT_ORDER_ALTERNATIVE = 2; // 0x2
		field public static final int SORT_ORDER_PRIMARY = 1; // 0x1
		}

		public static final deprecated class ContactsContract.Presence extends android.provider.ContactsContract.StatusUpdates {
		ctor public ContactsContract.Presence();
		}

+13 −1

Original line number	Diff line number	Diff line
		@@ -246,7 +246,7 @@ public final class ContactsContract {
		public static final String KEY_AUTHORIZED_URI = "authorized_uri";
		}

		/*
		/**
		* @hide
		*/
		public static final class Preferences {
		@@ -254,16 +254,22 @@ public final class ContactsContract {
		/**
		* A key in the {@link android.provider.Settings android.provider.Settings} provider
		* that stores the preferred sorting order for contacts (by given name vs. by family name).
		*
		* @hide
		*/
		public static final String SORT_ORDER = "android.contacts.SORT_ORDER";

		/**
		* The value for the SORT_ORDER key corresponding to sorting by given name first.
		*
		* @hide
		*/
		public static final int SORT_ORDER_PRIMARY = 1;

		/**
		* The value for the SORT_ORDER key corresponding to sorting by family name first.
		*
		* @hide
		*/
		public static final int SORT_ORDER_ALTERNATIVE = 2;

		@@ -271,16 +277,22 @@ public final class ContactsContract {
		* A key in the {@link android.provider.Settings android.provider.Settings} provider
		* that stores the preferred display order for contacts (given name first vs. family
		* name first).
		*
		* @hide
		*/
		public static final String DISPLAY_ORDER = "android.contacts.DISPLAY_ORDER";

		/**
		* The value for the DISPLAY_ORDER key corresponding to showing the given name first.
		*
		* @hide
		*/
		public static final int DISPLAY_ORDER_PRIMARY = 1;

		/**
		* The value for the DISPLAY_ORDER key corresponding to showing the family name first.
		*
		* @hide
		*/
		public static final int DISPLAY_ORDER_ALTERNATIVE = 2;
		}