Merge "Fix enterprise contacts APIs naming and docs" into nyc-dev

am: f3a7d7cce7

* commit 'f3a7d7cce730c9226841c5148bec2e79538a7096':
  Fix enterprise contacts APIs naming and docs

Change-Id: Ic4f20d92d742dd950c42a7a9ae8c7570b8830e9b

5 files changed, 11 insertions, 10 deletions

diff --git a/src-N/com/android/contacts/common/compat/DirectorySdkCompat.java b/src-N/com/android/contacts/common/compat/DirectorySdkCompat.java
index 9b065d05..57d20a67 100644
--- a/src-N/com/android/contacts/common/compat/DirectorySdkCompat.java
+++ b/src-N/com/android/contacts/common/compat/DirectorySdkCompat.java
@@ -28,8 +28,8 @@ public class DirectorySdkCompat {
     public static final long ENTERPRISE_LOCAL_DEFAULT = Directory.ENTERPRISE_DEFAULT;
     public static final long ENTERPRISE_LOCAL_INVISIBLE = Directory.ENTERPRISE_LOCAL_INVISIBLE;
 
-    public static boolean isRemoteDirectory(long directoryId) {
-        return Directory.isRemoteDirectory(directoryId);
+    public static boolean isRemoteDirectoryId(long directoryId) {
+        return Directory.isRemoteDirectoryId(directoryId);
     }
 
     public static boolean isEnterpriseDirectoryId(long directoryId) {
diff --git a/src-pre-N/com/android/contacts/common/compat/DirectorySdkCompat.java b/src-pre-N/com/android/contacts/common/compat/DirectorySdkCompat.java
index daf7b475..d3015fef 100644
--- a/src-pre-N/com/android/contacts/common/compat/DirectorySdkCompat.java
+++ b/src-pre-N/com/android/contacts/common/compat/DirectorySdkCompat.java
@@ -30,7 +30,7 @@ public class DirectorySdkCompat {
     public static final long ENTERPRISE_LOCAL_DEFAULT = 1000000000L + Directory.DEFAULT;
     public static final long ENTERPRISE_LOCAL_INVISIBLE = 1000000000L + Directory.LOCAL_INVISIBLE;
 
-    public static boolean isRemoteDirectory(long directoryId) {
+    public static boolean isRemoteDirectoryId(long directoryId) {
         Log.wtf(TAG, "Not Implemented");
         return false;
     }
diff --git a/src/com/android/contacts/common/compat/DirectoryCompat.java b/src/com/android/contacts/common/compat/DirectoryCompat.java
index f1009382..682e14c7 100644
--- a/src/com/android/contacts/common/compat/DirectoryCompat.java
+++ b/src/com/android/contacts/common/compat/DirectoryCompat.java
@@ -39,9 +39,9 @@ public class DirectoryCompat {
         return directoryId == Directory.LOCAL_INVISIBLE;
     }
 
-    public static boolean isRemoteDirectory(long directoryId) {
+    public static boolean isRemoteDirectoryId(long directoryId) {
         if (ContactsUtils.FLAG_N_FEATURE) {
-            return DirectorySdkCompat.isRemoteDirectory(directoryId);
+            return DirectorySdkCompat.isRemoteDirectoryId(directoryId);
         }
         return !(directoryId == Directory.DEFAULT || directoryId == Directory.LOCAL_INVISIBLE);
     }
diff --git a/src/com/android/contacts/common/list/ContactEntryListAdapter.java b/src/com/android/contacts/common/list/ContactEntryListAdapter.java
index b6b9d7a4..db6e3db4 100644
--- a/src/com/android/contacts/common/list/ContactEntryListAdapter.java
+++ b/src/com/android/contacts/common/list/ContactEntryListAdapter.java
@@ -419,7 +419,7 @@ public abstract class ContactEntryListAdapter extends IndexerListAdapter {
             if (getPartitionByDirectoryId(id) == -1) {
                 DirectoryPartition partition = new DirectoryPartition(false, true);
                 partition.setDirectoryId(id);
-                if (DirectoryCompat.isRemoteDirectory(id)) {
+                if (DirectoryCompat.isRemoteDirectoryId(id)) {
                     if (DirectoryCompat.isEnterpriseDirectoryId(id)) {
                         partition.setLabel(mContext.getString(R.string.directory_search_label_work));
                     } else {
@@ -642,7 +642,7 @@ public abstract class ContactEntryListAdapter extends IndexerListAdapter {
         TextView labelTextView = (TextView)view.findViewById(R.id.label);
         TextView displayNameTextView = (TextView)view.findViewById(R.id.display_name);
         labelTextView.setText(directoryPartition.getLabel());
-        if (!DirectoryCompat.isRemoteDirectory(directoryId)) {
+        if (!DirectoryCompat.isRemoteDirectoryId(directoryId)) {
             displayNameTextView.setText(null);
         } else {
             String directoryName = directoryPartition.getDisplayName();
diff --git a/src/com/android/contacts/common/list/PhoneNumberListAdapter.java b/src/com/android/contacts/common/list/PhoneNumberListAdapter.java
index 95d6f361..348cac2d 100644
--- a/src/com/android/contacts/common/list/PhoneNumberListAdapter.java
+++ b/src/com/android/contacts/common/list/PhoneNumberListAdapter.java
@@ -211,7 +211,8 @@ public class PhoneNumberListAdapter extends ContactEntryListAdapter {
             loader.setUri(builder.build());
             loader.setProjection(PhoneQuery.PROJECTION_PRIMARY);
         } else {
-            final boolean isRemoteDirectoryQuery = DirectoryCompat.isRemoteDirectory(directoryId);
+            final boolean isRemoteDirectoryQuery
+                    = DirectoryCompat.isRemoteDirectoryId(directoryId);
             final Builder builder;
             if (isSearchMode()) {
                 final Uri baseUri;
@@ -342,7 +343,7 @@ public class PhoneNumberListAdapter extends ContactEntryListAdapter {
     public Uri getDataUri(int partitionIndex, Cursor cursor) {
         final long directoryId =
                 ((DirectoryPartition)getPartition(partitionIndex)).getDirectoryId();
-        if (DirectoryCompat.isRemoteDirectory(directoryId)) {
+        if (DirectoryCompat.isRemoteDirectoryId(directoryId)) {
             return null;
         } else if (DirectoryCompat.isEnterpriseDirectoryId(directoryId)) {
             /*
@@ -609,7 +610,7 @@ public class PhoneNumberListAdapter extends ContactEntryListAdapter {
                 if (id > maxId) {
                     maxId = id;
                 }
-                if (!DirectoryCompat.isRemoteDirectory(id)) {
+                if (!DirectoryCompat.isRemoteDirectoryId(id)) {
                     // assuming remote directories come after local, we will end up with the index
                     // where we should insert extended directories. This also works if there are no
                     // remote directories at all.