Merge "Allow a sync adapter to provide an OPEN action for a group"
diff --git a/src/com/android/contacts/GroupMetaDataLoader.java b/src/com/android/contacts/GroupMetaDataLoader.java
index 8533bb6..f11217c 100644
--- a/src/com/android/contacts/GroupMetaDataLoader.java
+++ b/src/com/android/contacts/GroupMetaDataLoader.java
@@ -35,6 +35,8 @@
Groups.FAVORITES,
Groups.GROUP_IS_READ_ONLY,
Groups.DELETED,
+ Groups.ACTION,
+ Groups.ACTION_URI,
};
public final static int ACCOUNT_NAME = 0;
@@ -45,6 +47,8 @@
public final static int FAVORITES = 5;
public final static int IS_READ_ONLY = 6;
public final static int DELETED = 7;
+ public final static int ACTION = 8;
+ public final static int ACTION_URI = 9;
public GroupMetaDataLoader(Context context, Uri groupUri) {
super(context, ensureIsGroupUri(groupUri), COLUMNS, Groups.ACCOUNT_TYPE + " NOT NULL AND "
diff --git a/src/com/android/contacts/group/GroupDetailFragment.java b/src/com/android/contacts/group/GroupDetailFragment.java
index f58d99a..c5f6ef4 100644
--- a/src/com/android/contacts/group/GroupDetailFragment.java
+++ b/src/com/android/contacts/group/GroupDetailFragment.java
@@ -35,6 +35,7 @@
import android.database.Cursor;
import android.net.Uri;
import android.os.Bundle;
+import android.util.Log;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
@@ -248,6 +249,11 @@
mGroupId = cursor.getLong(GroupMetaDataLoader.GROUP_ID);
mGroupName = cursor.getString(GroupMetaDataLoader.TITLE);
updateTitle(mGroupName);
+
+ // TODO: Replace by real button
+ final String action = cursor.getString(GroupMetaDataLoader.ACTION);
+ final String actionUri = cursor.getString(GroupMetaDataLoader.ACTION_URI);
+ Log.d(TAG, "Group open action: " + action + ", uri: " + actionUri);
}
}