http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/helpers/FeedAdapter.java
----------------------------------------------------------------------
diff --git 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/helpers/FeedAdapter.java
 
b/sdks/android/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/helpers/FeedAdapter.java
deleted file mode 100644
index 53494dd..0000000
--- 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/helpers/FeedAdapter.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.usergrid.activityfeed.helpers;
-
-import android.app.Activity;
-import android.view.Gravity;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import org.apache.usergrid.activityfeed.ActivityEntity;
-import org.apache.usergrid.activityfeed.R;
-import org.apache.usergrid.java.client.Usergrid;
-import org.apache.usergrid.java.client.model.UsergridUser;
-
-import java.util.List;
-
-public class FeedAdapter extends BaseAdapter {
-    private final List<ActivityEntity> feedMessages;
-    private final Activity context;
-
-    public FeedAdapter(Activity context, List<ActivityEntity> feedMessages) {
-        this.context = context;
-        this.feedMessages = feedMessages;
-    }
-
-    @Override
-    public int getCount() {
-        if (feedMessages != null) {
-            return feedMessages.size();
-        } else {
-            return 0;
-        }
-    }
-
-    @Override
-    public ActivityEntity getItem(int position) {
-        if (feedMessages != null) {
-            return feedMessages.get(position);
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return position;
-    }
-
-    @Override
-    public View getView(final int position, View convertView, ViewGroup 
parent) {
-        ViewHolder holder;
-        ActivityEntity messageEntity = getItem(position);
-        if (convertView == null) {
-            convertView = View.inflate(context,R.layout.message_layout,null);
-            holder = createViewHolder(convertView);
-            convertView.setTag(holder);
-        } else {
-            holder = (ViewHolder) convertView.getTag();
-        }
-
-        holder.txtMessage.setText(messageEntity.getContent());
-
-        boolean isMe = false;
-        String displayName = messageEntity.getDisplayName();
-        if( displayName != null ) {
-            final UsergridUser currentUser = Usergrid.getCurrentUser();
-            if( currentUser != null ) {
-                final String currentUserUsername = currentUser.getUsername();
-                if( currentUserUsername != null && 
displayName.equalsIgnoreCase(currentUserUsername) ) {
-                    isMe = true;
-                }
-            }
-            holder.txtInfo.setText(displayName);
-        }
-        setAlignment(holder,isMe);
-        return convertView;
-    }
-
-    public void add(ActivityEntity message) {
-        feedMessages.add(message);
-    }
-
-    private void setAlignment(ViewHolder holder, boolean isMe) {
-        int gravity;
-        int drawableResourceId;
-        if( !isMe ) {
-            gravity = Gravity.END;
-            drawableResourceId = R.drawable.in_message_bg;
-        } else {
-            gravity = Gravity.START;
-            drawableResourceId = R.drawable.out_message_bg;
-        }
-
-        holder.contentWithBG.setBackgroundResource(drawableResourceId);
-
-        LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) 
holder.contentWithBG.getLayoutParams();
-        layoutParams.gravity = gravity;
-        holder.contentWithBG.setLayoutParams(layoutParams);
-
-        RelativeLayout.LayoutParams lp = (RelativeLayout.LayoutParams) 
holder.content.getLayoutParams();
-        if( !isMe ) {
-            lp.addRule(RelativeLayout.ALIGN_PARENT_LEFT, 0);
-            lp.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
-        } else {
-            lp.addRule(RelativeLayout.ALIGN_PARENT_RIGHT, 0);
-            lp.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
-        }
-
-        holder.content.setLayoutParams(lp);
-        layoutParams = (LinearLayout.LayoutParams) 
holder.txtMessage.getLayoutParams();
-        layoutParams.gravity = gravity;
-        holder.txtMessage.setLayoutParams(layoutParams);
-
-        layoutParams = (LinearLayout.LayoutParams) 
holder.txtInfo.getLayoutParams();
-        layoutParams.gravity = gravity;
-        holder.txtInfo.setLayoutParams(layoutParams);
-    }
-
-    private ViewHolder createViewHolder(View v) {
-        ViewHolder holder = new ViewHolder();
-        holder.txtMessage = (TextView) v.findViewById(R.id.txtMessage);
-        holder.content = (LinearLayout) v.findViewById(R.id.content);
-        holder.contentWithBG = (LinearLayout) 
v.findViewById(R.id.contentWithBackground);
-        holder.txtInfo = (TextView) v.findViewById(R.id.txtInfo);
-        return holder;
-    }
-
-
-    private static class ViewHolder {
-        public TextView txtMessage;
-        public TextView txtInfo;
-        public LinearLayout content;
-        public LinearLayout contentWithBG;
-    }
-}

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/drawable/in_message_bg.9.png
----------------------------------------------------------------------
diff --git 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/drawable/in_message_bg.9.png
 
b/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/drawable/in_message_bg.9.png
deleted file mode 100644
index 08c6f09..0000000
Binary files 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/drawable/in_message_bg.9.png
 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/drawable/out_message_bg.9.png
----------------------------------------------------------------------
diff --git 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/drawable/out_message_bg.9.png
 
b/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/drawable/out_message_bg.9.png
deleted file mode 100644
index 3d511e7..0000000
Binary files 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/drawable/out_message_bg.9.png
 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/drawable/usergridguy.png
----------------------------------------------------------------------
diff --git 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/drawable/usergridguy.png
 
b/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/drawable/usergridguy.png
deleted file mode 100644
index b8a6844..0000000
Binary files 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/drawable/usergridguy.png
 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/layout/action_bar_layout.xml
----------------------------------------------------------------------
diff --git 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/layout/action_bar_layout.xml
 
b/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/layout/action_bar_layout.xml
deleted file mode 100644
index f20a1f0..0000000
--- 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/layout/action_bar_layout.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android";
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:gravity="center">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:textColor="@android:color/white"
-        android:id="@+id/actionBarTitle"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:textSize="20sp"
-        android:gravity="center"
-        android:layout_centerInParent="true" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="@android:color/white"
-        android:id="@+id/buttonTitle"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textSize="17sp"
-        android:layout_alignParentEnd="true"
-        android:layout_centerVertical="true" />
-
-</RelativeLayout>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/layout/activity_create_account.xml
----------------------------------------------------------------------
diff --git 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/layout/activity_create_account.xml
 
b/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/layout/activity_create_account.xml
deleted file mode 100644
index 1fba8ed..0000000
--- 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/layout/activity_create_account.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android";
-    xmlns:tools="http://schemas.android.com/tools";
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context=".activities.CreateAccountActivity"
-    android:background="@color/lightBlue">
-
-    <EditText
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/nameText"
-        android:minWidth="250dp"
-        android:background="@android:color/white"
-        android:height="40dp"
-        android:layout_marginTop="32dp"
-        android:hint="Name"
-        android:paddingStart="10dp"
-        android:singleLine="true"
-        android:minLines="1"
-        android:maxLines="1"
-        android:minHeight="30dp"
-        android:layout_centerHorizontal="true"
-        android:inputType="textPersonName"
-        android:maxWidth="250dp"
-        android:paddingEnd="10dp" />
-
-    <EditText
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/usernameText"
-        android:minWidth="250dp"
-        android:background="@android:color/white"
-        android:height="40dp"
-        android:layout_marginTop="15dp"
-        android:hint="Username"
-        android:paddingStart="10dp"
-        android:singleLine="true"
-        android:minLines="1"
-        android:maxLines="1"
-        android:minHeight="30dp"
-        android:layout_below="@+id/nameText"
-        android:layout_centerHorizontal="true"
-        android:paddingEnd="10dp"
-        android:maxWidth="250dp" />
-
-    <EditText
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/emailText"
-        android:minWidth="250dp"
-        android:background="@android:color/white"
-        android:height="40dp"
-        android:layout_marginTop="15dp"
-        android:hint="Email"
-        android:paddingStart="10dp"
-        android:singleLine="true"
-        android:minLines="1"
-        android:maxLines="1"
-        android:minHeight="30dp"
-        android:layout_below="@+id/usernameText"
-        android:layout_centerHorizontal="true"
-        android:inputType="textEmailAddress"
-        android:paddingEnd="10dp"
-        android:maxWidth="250dp" />
-
-    <EditText
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/passwordEditText"
-        android:minWidth="250dp"
-        android:background="@android:color/white"
-        android:height="40dp"
-        android:layout_marginTop="15dp"
-        android:hint="Password"
-        android:paddingStart="10dp"
-        android:singleLine="true"
-        android:minLines="1"
-        android:maxLines="1"
-        android:minHeight="30dp"
-        android:layout_below="@+id/emailText"
-        android:layout_centerHorizontal="true"
-        android:inputType="textPassword"
-        android:paddingEnd="10dp"
-        android:maxWidth="250dp" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Create Account"
-        android:id="@+id/createAccountText"
-        android:textColor="@color/colorPrimary"
-        android:clickable="true"
-        android:layout_centerVertical="true"
-        android:layout_centerHorizontal="true"
-        android:textSize="20sp" />
-</RelativeLayout>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/layout/activity_feed.xml
----------------------------------------------------------------------
diff --git 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/layout/activity_feed.xml
 
b/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/layout/activity_feed.xml
deleted file mode 100644
index 7e0789a..0000000
--- 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/layout/activity_feed.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android";
-    android:id="@+id/container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="@color/white">
-
-    <EditText
-        android:id="@+id/messageEdit"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:layout_alignParentBottom="true"
-        android:hint="Message"
-        android:layout_alignBottom="@+id/chatSendButton"
-        android:layout_toStartOf="@+id/chatSendButton"
-        android:paddingEnd="10dp"
-        android:paddingStart="10dp" />
-
-    <Button
-        android:id="@+id/chatSendButton"
-        android:layout_width="wrap_content"
-        android:layout_height="50dp"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentEnd="true"
-        android:background="@color/colorPrimary"
-        android:text="Send"
-        android:textColor="@color/background_material_light"
-        android:layout_alignParentTop="false"
-        android:layout_alignParentStart="false" />
-
-    <ListView
-        android:id="@+id/messagesContainer"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_alignParentStart="false"
-        android:layout_alignParentTop="false"
-        android:layout_marginBottom="50dp"
-        android:listSelector="@android:color/transparent"
-        android:transcriptMode="alwaysScroll"
-        android:divider="@null"
-        android:background="@color/switch_thumb_normal_material_light"
-        android:paddingBottom="10dp"
-        android:stackFromBottom="true" />
-
-</RelativeLayout>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/layout/activity_follow.xml
----------------------------------------------------------------------
diff --git 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/layout/activity_follow.xml
 
b/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/layout/activity_follow.xml
deleted file mode 100644
index c70da17..0000000
--- 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/layout/activity_follow.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android";
-    xmlns:tools="http://schemas.android.com/tools";
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context=".activities.FollowActivity"
-    android:background="@color/lightBlue">
-
-    <EditText
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/followUsernameText"
-        android:minWidth="250dp"
-        android:background="@android:color/white"
-        android:height="40dp"
-        android:layout_marginTop="70dp"
-        android:hint="Username"
-        android:paddingStart="10dp"
-        android:singleLine="true"
-        android:minLines="1"
-        android:maxLines="1"
-        android:minHeight="30dp"
-        android:inputType="textPersonName"
-        android:layout_alignParentTop="true"
-        android:layout_centerHorizontal="true"
-        android:paddingEnd="10dp"
-        android:maxWidth="250dp" />
-
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Add Follower"
-        android:id="@+id/addFollowerButton"
-        android:minWidth="250dp"
-        android:background="@color/colorPrimary"
-        android:textColor="@android:color/white"
-        android:layout_below="@+id/followUsernameText"
-        android:layout_alignStart="@+id/followUsernameText"
-        android:layout_marginTop="30dp" />
-</RelativeLayout>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/layout/activity_main.xml
----------------------------------------------------------------------
diff --git 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/layout/activity_main.xml
 
b/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/layout/activity_main.xml
deleted file mode 100644
index af8038b..0000000
--- 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android";
-    xmlns:tools="http://schemas.android.com/tools";
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context=".activities.MainActivity"
-    android:background="@color/lightBlue">
-
-    <ImageView
-        android:layout_width="125dp"
-        android:layout_height="125dp"
-        android:id="@+id/imageView"
-        android:layout_alignParentTop="true"
-        android:layout_centerHorizontal="true"
-        android:src="@drawable/usergridguy"
-        android:layout_marginTop="20dp"
-        android:adjustViewBounds="true" />
-
-    <EditText
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/usernameText"
-        android:minWidth="250dp"
-        android:background="@android:color/white"
-        android:height="40dp"
-        android:layout_below="@+id/imageView"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="30dp"
-        android:hint="Username"
-        android:paddingStart="10dp"
-        android:singleLine="true"
-        android:minLines="1"
-        android:maxLines="1"
-        android:minHeight="30dp"
-        android:paddingEnd="10dp"
-        android:maxWidth="250dp" />
-
-    <EditText
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/passwordEditText"
-        android:minWidth="250dp"
-        android:background="@android:color/white"
-        android:height="40dp"
-        android:layout_marginTop="15dp"
-        android:layout_below="@+id/usernameText"
-        android:layout_alignStart="@+id/usernameText"
-        android:hint="Password"
-        android:paddingStart="10dp"
-        android:singleLine="true"
-        android:maxLines="1"
-        android:minLines="1"
-        android:minHeight="30dp"
-        android:maxWidth="250dp"
-        android:paddingEnd="10dp"
-        android:inputType="textPassword" />
-
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Sign In"
-        android:id="@+id/signInButton"
-        android:layout_below="@+id/passwordEditText"
-        android:layout_alignEnd="@+id/passwordEditText"
-        android:layout_marginTop="25dp"
-        android:minWidth="250dp"
-        android:background="@color/colorPrimary"
-        android:textColor="@android:color/white" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Create Account"
-        android:id="@+id/createAccountTextView"
-        android:layout_below="@+id/signInButton"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="30dp"
-        android:textColor="@color/colorPrimary"
-        android:clickable="true" />
-
-</RelativeLayout>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/layout/message_layout.xml
----------------------------------------------------------------------
diff --git 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/layout/message_layout.xml
 
b/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/layout/message_layout.xml
deleted file mode 100644
index da355b9..0000000
--- 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/layout/message_layout.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android";
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-    <LinearLayout
-        android:id="@+id/content"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/txtInfo"
-            android:layout_width="wrap_content"
-            android:layout_height="40sp"
-            android:layout_gravity="left"
-            android:textSize="25sp"
-            android:textColor="@android:color/darker_gray"
-            android:layout_marginTop="10dp"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp" />
-
-        <LinearLayout
-            android:id="@+id/contentWithBackground"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="left"
-            android:background="@drawable/in_message_bg"
-            android:paddingLeft="10dp"
-            android:paddingBottom="10dp"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/txtMessage"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="@android:color/black"
-                android:maxWidth="240dp" />
-
-        </LinearLayout>
-
-    </LinearLayout>
-</RelativeLayout>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/layout/scrollable_alert_view.xml
----------------------------------------------------------------------
diff --git 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/layout/scrollable_alert_view.xml
 
b/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/layout/scrollable_alert_view.xml
deleted file mode 100644
index a630675..0000000
--- 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/layout/scrollable_alert_view.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android";
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/scrollableAlertTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="16dip"
-        android:layout_marginRight="16dip"
-        android:layout_marginTop="10dip"
-        android:textAppearance="?android:attr/textAppearanceLarge" />
-
-    <ScrollView
-        android:layout_width="wrap_content" 
android:layout_height="wrap_content">
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/scrollableAlertMessage"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="16dip"
-                android:layout_marginRight="16dip"
-                android:layout_marginTop="20dip"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textColor="@color/colorPrimary"
-                android:background="@color/lightBlue"/>
-        </LinearLayout>
-    </ScrollView>
-</LinearLayout>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-hdpi/ic_launcher.png
----------------------------------------------------------------------
diff --git 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-hdpi/ic_launcher.png
 
b/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index cde69bc..0000000
Binary files 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-hdpi/ic_launcher.png
 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-mdpi/ic_launcher.png
----------------------------------------------------------------------
diff --git 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-mdpi/ic_launcher.png
 
b/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index c133a0c..0000000
Binary files 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-mdpi/ic_launcher.png
 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-xhdpi/ic_launcher.png
----------------------------------------------------------------------
diff --git 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-xhdpi/ic_launcher.png
 
b/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index bfa42f0..0000000
Binary files 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-xhdpi/ic_launcher.png
 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-xxhdpi/ic_launcher.png
----------------------------------------------------------------------
diff --git 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-xxhdpi/ic_launcher.png
 
b/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 324e72c..0000000
Binary files 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-xxhdpi/ic_launcher.png
 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-xxxhdpi/ic_launcher.png
----------------------------------------------------------------------
diff --git 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-xxxhdpi/ic_launcher.png
 
b/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index aee44e1..0000000
Binary files 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-xxxhdpi/ic_launcher.png
 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/values-w820dp/dimens.xml
----------------------------------------------------------------------
diff --git 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/values-w820dp/dimens.xml
 
b/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/values-w820dp/dimens.xml
deleted file mode 100644
index 63fc816..0000000
--- 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/values-w820dp/dimens.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<resources>
-    <!-- Example customization of dimensions originally defined in 
res/values/dimens.xml
-         (such as screen margins) for screens with more than 820dp of 
available width. This
-         would include 7" and 10" devices in landscape (~960dp and ~1280dp 
respectively). -->
-    <dimen name="activity_horizontal_margin">64dp</dimen>
-</resources>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/values/colors.xml
----------------------------------------------------------------------
diff --git 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/values/colors.xml 
b/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/values/colors.xml
deleted file mode 100644
index b26cbd3..0000000
--- 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#135480</color>
-    <color name="colorPrimaryDark">#135480</color>
-    <color name="colorAccent">#FF4081</color>
-    <color name="lightBlue">#E8EEED</color>
-    <color name="white">#ffffff</color>
-</resources>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/values/dimens.xml
----------------------------------------------------------------------
diff --git 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/values/dimens.xml 
b/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/values/dimens.xml
deleted file mode 100644
index 47c8224..0000000
--- 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<resources>
-    <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
-</resources>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/values/strings.xml
----------------------------------------------------------------------
diff --git 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/values/strings.xml
 
b/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/values/strings.xml
deleted file mode 100644
index 583eb46..0000000
--- 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">ActivityFeed</string>
-</resources>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/values/styles.xml
----------------------------------------------------------------------
diff --git 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/values/styles.xml 
b/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/values/styles.xml
deleted file mode 100644
index 8690628..0000000
--- 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<resources>
-
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-    </style>
-    <style name="MyActionBar" 
parent="@style/Widget.AppCompat.Light.ActionBar.Solid.Inverse">
-        <item name="background">@color/lightBlue</item>
-        <item name="titleTextStyle">@style/MyActionBarTitle</item>
-    </style>
-
-    <style name="MyActionBarTitle" 
parent="@style/TextAppearance.AppCompat.Widget.ActionBar.Title">
-        <item name="android:textColor">@color/white</item>
-    </style>
-
-</resources>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/ActivityFeed/activityfeed/src/test/java/org/apache/usergrid/activityfeed/ExampleUnitTest.java
----------------------------------------------------------------------
diff --git 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/test/java/org/apache/usergrid/activityfeed/ExampleUnitTest.java
 
b/sdks/android/Samples/ActivityFeed/activityfeed/src/test/java/org/apache/usergrid/activityfeed/ExampleUnitTest.java
deleted file mode 100644
index 8230157..0000000
--- 
a/sdks/android/Samples/ActivityFeed/activityfeed/src/test/java/org/apache/usergrid/activityfeed/ExampleUnitTest.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.apache.usergrid.activityfeed;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * To work on unit tests, switch the Test Artifact in the Build Variants view.
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() throws Exception {
-        assertEquals(4, 2 + 2);
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/ActivityFeed/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/android/Samples/ActivityFeed/build.gradle 
b/sdks/android/Samples/ActivityFeed/build.gradle
deleted file mode 100644
index aff4f41..0000000
--- a/sdks/android/Samples/ActivityFeed/build.gradle
+++ /dev/null
@@ -1,23 +0,0 @@
-// Top-level build file where you can add configuration options common to all 
sub-projects/modules.
-
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-allprojects {
-    repositories {
-        jcenter()
-    }
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/ActivityFeed/gradle.properties
----------------------------------------------------------------------
diff --git a/sdks/android/Samples/ActivityFeed/gradle.properties 
b/sdks/android/Samples/ActivityFeed/gradle.properties
deleted file mode 100644
index 1d3591c..0000000
--- a/sdks/android/Samples/ActivityFeed/gradle.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Project-wide Gradle settings.
-
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx10248m -XX:MaxPermSize=256m
-# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m 
-XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# 
http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/ActivityFeed/gradle/wrapper/gradle-wrapper.jar
----------------------------------------------------------------------
diff --git 
a/sdks/android/Samples/ActivityFeed/gradle/wrapper/gradle-wrapper.jar 
b/sdks/android/Samples/ActivityFeed/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 13372ae..0000000
Binary files 
a/sdks/android/Samples/ActivityFeed/gradle/wrapper/gradle-wrapper.jar and 
/dev/null differ

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/ActivityFeed/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git 
a/sdks/android/Samples/ActivityFeed/gradle/wrapper/gradle-wrapper.properties 
b/sdks/android/Samples/ActivityFeed/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 122a0dc..0000000
--- a/sdks/android/Samples/ActivityFeed/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Mon Dec 28 10:00:20 PST 2015
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/ActivityFeed/gradlew
----------------------------------------------------------------------
diff --git a/sdks/android/Samples/ActivityFeed/gradlew 
b/sdks/android/Samples/ActivityFeed/gradlew
deleted file mode 100755
index 9d82f78..0000000
--- a/sdks/android/Samples/ActivityFeed/gradlew
+++ /dev/null
@@ -1,160 +0,0 @@
-#!/usr/bin/env bash
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to 
pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 
'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" 
\"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### 
Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### 
Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" 
"$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" 
"$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" 
"$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the 
shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" 
org.gradle.wrapper.GradleWrapperMain "$@"

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/ActivityFeed/gradlew.bat
----------------------------------------------------------------------
diff --git a/sdks/android/Samples/ActivityFeed/gradlew.bat 
b/sdks/android/Samples/ActivityFeed/gradlew.bat
deleted file mode 100644
index aec9973..0000000
--- a/sdks/android/Samples/ActivityFeed/gradlew.bat
+++ /dev/null
@@ -1,90 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS 
to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your 
PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% 
"-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" 
org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code 
instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/ActivityFeed/settings.gradle
----------------------------------------------------------------------
diff --git a/sdks/android/Samples/ActivityFeed/settings.gradle 
b/sdks/android/Samples/ActivityFeed/settings.gradle
deleted file mode 100644
index 05d5d93..0000000
--- a/sdks/android/Samples/ActivityFeed/settings.gradle
+++ /dev/null
@@ -1,2 +0,0 @@
-include ':activityfeed', ':UsergridAndroidSDK'
-project (":UsergridAndroidSDK").projectDir = new 
File("../../UsergridAndroidSDK")

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/Push/.gitignore
----------------------------------------------------------------------
diff --git a/sdks/android/Samples/Push/.gitignore 
b/sdks/android/Samples/Push/.gitignore
deleted file mode 100644
index c6cbe56..0000000
--- a/sdks/android/Samples/Push/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-*.iml
-.gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
-.DS_Store
-/build
-/captures

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/Push/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/android/Samples/Push/build.gradle 
b/sdks/android/Samples/Push/build.gradle
deleted file mode 100644
index 6056b85..0000000
--- a/sdks/android/Samples/Push/build.gradle
+++ /dev/null
@@ -1,22 +0,0 @@
-// Top-level build file where you can add configuration options common to all 
sub-projects/modules.
-
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-allprojects {
-    repositories {
-        jcenter()
-    }
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/Push/gradle.properties
----------------------------------------------------------------------
diff --git a/sdks/android/Samples/Push/gradle.properties 
b/sdks/android/Samples/Push/gradle.properties
deleted file mode 100644
index 1d3591c..0000000
--- a/sdks/android/Samples/Push/gradle.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Project-wide Gradle settings.
-
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx10248m -XX:MaxPermSize=256m
-# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m 
-XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# 
http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/Push/gradle/wrapper/gradle-wrapper.jar
----------------------------------------------------------------------
diff --git a/sdks/android/Samples/Push/gradle/wrapper/gradle-wrapper.jar 
b/sdks/android/Samples/Push/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 13372ae..0000000
Binary files a/sdks/android/Samples/Push/gradle/wrapper/gradle-wrapper.jar and 
/dev/null differ

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/Push/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/sdks/android/Samples/Push/gradle/wrapper/gradle-wrapper.properties 
b/sdks/android/Samples/Push/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 122a0dc..0000000
--- a/sdks/android/Samples/Push/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Mon Dec 28 10:00:20 PST 2015
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/Push/gradlew
----------------------------------------------------------------------
diff --git a/sdks/android/Samples/Push/gradlew 
b/sdks/android/Samples/Push/gradlew
deleted file mode 100755
index 9d82f78..0000000
--- a/sdks/android/Samples/Push/gradlew
+++ /dev/null
@@ -1,160 +0,0 @@
-#!/usr/bin/env bash
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to 
pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 
'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" 
\"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### 
Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### 
Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" 
"$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" 
"$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" 
"$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the 
shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" 
org.gradle.wrapper.GradleWrapperMain "$@"

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/Push/gradlew.bat
----------------------------------------------------------------------
diff --git a/sdks/android/Samples/Push/gradlew.bat 
b/sdks/android/Samples/Push/gradlew.bat
deleted file mode 100644
index aec9973..0000000
--- a/sdks/android/Samples/Push/gradlew.bat
+++ /dev/null
@@ -1,90 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS 
to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your 
PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% 
"-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" 
org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code 
instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/Push/push/.gitignore
----------------------------------------------------------------------
diff --git a/sdks/android/Samples/Push/push/.gitignore 
b/sdks/android/Samples/Push/push/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/sdks/android/Samples/Push/push/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/Push/push/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/android/Samples/Push/push/build.gradle 
b/sdks/android/Samples/Push/push/build.gradle
deleted file mode 100644
index 2b845b3..0000000
--- a/sdks/android/Samples/Push/push/build.gradle
+++ /dev/null
@@ -1,27 +0,0 @@
-apply plugin: 'com.android.application'
-
-android {
-    compileSdkVersion 23
-    buildToolsVersion "22.0.1"
-
-    defaultConfig {
-        applicationId "org.apache.usergrid.push"
-        minSdkVersion 17
-        targetSdkVersion 23
-        versionCode 1
-        versionName "1.0"
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 
'proguard-rules.pro'
-        }
-    }
-}
-
-dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:23.3.0'
-    compile project(':UsergridAndroidSDK')
-}

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/Push/push/libs/gcm.jar
----------------------------------------------------------------------
diff --git a/sdks/android/Samples/Push/push/libs/gcm.jar 
b/sdks/android/Samples/Push/push/libs/gcm.jar
deleted file mode 100755
index ac109a8..0000000
Binary files a/sdks/android/Samples/Push/push/libs/gcm.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/Push/push/proguard-rules.pro
----------------------------------------------------------------------
diff --git a/sdks/android/Samples/Push/push/proguard-rules.pro 
b/sdks/android/Samples/Push/push/proguard-rules.pro
deleted file mode 100644
index 73ed137..0000000
--- a/sdks/android/Samples/Push/push/proguard-rules.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in 
/Users/ApigeeCorporation/Developer/android_sdk_files/sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/Push/push/src/androidTest/java/org/apache/usergrid/push/ApplicationTest.java
----------------------------------------------------------------------
diff --git 
a/sdks/android/Samples/Push/push/src/androidTest/java/org/apache/usergrid/push/ApplicationTest.java
 
b/sdks/android/Samples/Push/push/src/androidTest/java/org/apache/usergrid/push/ApplicationTest.java
deleted file mode 100644
index a9f1c73..0000000
--- 
a/sdks/android/Samples/Push/push/src/androidTest/java/org/apache/usergrid/push/ApplicationTest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.apache.usergrid.push;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html";>Testing 
Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/Push/push/src/main/AndroidManifest.xml
----------------------------------------------------------------------
diff --git a/sdks/android/Samples/Push/push/src/main/AndroidManifest.xml 
b/sdks/android/Samples/Push/push/src/main/AndroidManifest.xml
deleted file mode 100644
index bbfaaf4..0000000
--- a/sdks/android/Samples/Push/push/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android";
-    package="org.apache.usergrid.push" >
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" 
/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" 
/>
-    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" 
/>
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-
-    <permission
-        android:name="org.apache.usergrid.push.gcm.permission.C2D_MESSAGE"
-        android:protectionLevel="signature" />
-
-    <uses-permission 
android:name="org.apache.usergrid.push.gcm.permission.C2D_MESSAGE" />
-
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme" >
-        <receiver
-            android:name="com.google.android.gcm.GCMBroadcastReceiver"
-            android:permission="com.google.android.c2dm.permission.SEND" >
-            <intent-filter>
-                <action android:name="com.google.android.c2dm.intent.RECEIVE" 
/>
-                <action 
android:name="com.google.android.c2dm.intent.REGISTRATION" />
-
-                <category android:name="org.apache.usergrid.push" />
-            </intent-filter>
-        </receiver>
-
-        <service android:name=".GCMIntentService" />
-
-        <activity android:name=".MainActivity" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity android:name=".SettingsActivity" >
-        </activity>
-    </application>
-
-</manifest>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/Push/push/src/main/java/org/apache/usergrid/push/GCMIntentService.java
----------------------------------------------------------------------
diff --git 
a/sdks/android/Samples/Push/push/src/main/java/org/apache/usergrid/push/GCMIntentService.java
 
b/sdks/android/Samples/Push/push/src/main/java/org/apache/usergrid/push/GCMIntentService.java
deleted file mode 100644
index 5faeb01..0000000
--- 
a/sdks/android/Samples/Push/push/src/main/java/org/apache/usergrid/push/GCMIntentService.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.apache.usergrid.push;
-
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.support.v4.app.NotificationCompat;
-import android.util.Log;
-
-import com.google.android.gcm.GCMBaseIntentService;
-
-public class GCMIntentService extends GCMBaseIntentService {
-
-    public GCMIntentService() {
-        super(MainActivity.GCM_SENDER_ID);
-    }
-
-    @Override
-    protected void onRegistered(Context context, String registrationId) {
-        Log.i(TAG, "Device registered: " + registrationId);
-        MainActivity.registerPush(context,registrationId);
-    }
-
-    @Override
-    protected void onUnregistered(Context context, String registrationId) {
-        Log.i(TAG, "Device unregistered");
-    }
-
-    @Override
-    protected void onMessage(Context context, Intent intent) {
-        String message = intent.getExtras().getString("data");
-        Log.i(TAG, "Received message: " + message);
-        generateNotification(context, message);
-    }
-
-    @Override
-    protected void onDeletedMessages(Context context, int total) {
-        Log.i(TAG, "Received deleted messages notification");
-        String message = "GCM server deleted " + total +" pending messages!";
-        generateNotification(context, message);
-    }
-
-    @Override
-    public void onError(Context context, String errorId) {
-        Log.i(TAG, "Received error: " + errorId);
-    }
-
-    @Override
-    protected boolean onRecoverableError(Context context, String errorId) {
-        Log.i(TAG, "Received recoverable error: " + errorId);
-        return super.onRecoverableError(context, errorId);
-    }
-
-    /**
-     * Issues a Notification to inform the user that server has sent a message.
-     */
-    private static void generateNotification(Context context, String message) {
-        long when = System.currentTimeMillis();
-        NotificationManager notificationManager = (NotificationManager)
-                context.getSystemService(Context.NOTIFICATION_SERVICE);
-
-        Intent notificationIntent = new Intent(context, MainActivity.class);
-        // set intent so it does not start a new activity
-        notificationIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | 
Intent.FLAG_ACTIVITY_SINGLE_TOP);
-        PendingIntent intent = PendingIntent.getActivity(context, 0, 
notificationIntent, 0);
-
-        Notification notification = new NotificationCompat.Builder(context)
-                .setContentText(message)
-                .setContentTitle(context.getString(R.string.app_name))
-                .setWhen(when)
-                .setSmallIcon(R.drawable.usergridguy)
-                .setContentIntent(intent)
-                .build();
-
-        notification.flags |= Notification.FLAG_AUTO_CANCEL;
-
-        // Play default notification sound
-        notification.defaults |= Notification.DEFAULT_SOUND;
-
-        // Vibrate if vibrate is enabled
-        notification.defaults |= Notification.DEFAULT_VIBRATE;
-        notificationManager.notify(0, notification);
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/Push/push/src/main/java/org/apache/usergrid/push/MainActivity.java
----------------------------------------------------------------------
diff --git 
a/sdks/android/Samples/Push/push/src/main/java/org/apache/usergrid/push/MainActivity.java
 
b/sdks/android/Samples/Push/push/src/main/java/org/apache/usergrid/push/MainActivity.java
deleted file mode 100644
index 084dceb..0000000
--- 
a/sdks/android/Samples/Push/push/src/main/java/org/apache/usergrid/push/MainActivity.java
+++ /dev/null
@@ -1,162 +0,0 @@
-package org.apache.usergrid.push;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
-import android.util.Log;
-import android.view.View;
-import android.widget.Button;
-import android.widget.ImageButton;
-
-import com.google.android.gcm.GCMRegistrar;
-
-import org.apache.usergrid.android.UsergridAsync;
-import org.apache.usergrid.android.UsergridSharedDevice;
-import org.apache.usergrid.android.callbacks.UsergridResponseCallback;
-import org.apache.usergrid.java.client.Usergrid;
-import org.apache.usergrid.java.client.UsergridClientConfig;
-import org.apache.usergrid.java.client.UsergridEnums;
-import org.apache.usergrid.java.client.UsergridRequest;
-import org.apache.usergrid.java.client.response.UsergridResponse;
-
-import java.util.HashMap;
-
-public class MainActivity extends AppCompatActivity {
-
-    public static String ORG_ID = "rwalsh";
-    public static String APP_ID = "sandbox";
-    public static String BASE_URL = "https://api.usergrid.com";;
-
-    public static String NOTIFIER_ID = "androidPushNotifier";
-    public static String GCM_SENDER_ID = "186455511595";
-    public static String GCM_REGISTRATION_ID = "";
-
-    public static boolean USERGRID_PREFS_NEEDS_REFRESH = false;
-    private static final String USERGRID_PREFS_FILE_NAME = 
"usergrid_prefs.xml";
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-
-        retrieveSavedPrefs();
-        Usergrid.initSharedInstance(ORG_ID,APP_ID,BASE_URL);
-        MainActivity.registerPush(this);
-
-        final ImageButton infoButton = (ImageButton) 
findViewById(R.id.infoButton);
-        if( infoButton != null ) {
-            final Intent settingsActivity = new Intent(this, 
SettingsActivity.class);
-            infoButton.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    MainActivity.this.startActivity(settingsActivity);
-                }
-            });
-        }
-
-        final Button pushToThisDeviceButton = (Button) 
findViewById(R.id.pushToThisDevice);
-        if( pushToThisDeviceButton != null ) {
-            pushToThisDeviceButton.setOnClickListener(new 
View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    
MainActivity.this.sendPush(UsergridSharedDevice.getSharedDeviceUUID(MainActivity.this),"Push
 To This Device");
-                }
-            });
-        }
-        final Button pushToAllDevicesButton = (Button) 
findViewById(R.id.pushToAllDevices);
-        if( pushToAllDevicesButton != null ) {
-            pushToAllDevicesButton.setOnClickListener(new 
View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    MainActivity.this.sendPush("*","Push To All Devices");
-                }
-            });
-        }
-    }
-
-    @Override
-    protected void onResume() {
-        if( USERGRID_PREFS_NEEDS_REFRESH ) {
-            Usergrid.setConfig(new 
UsergridClientConfig(ORG_ID,APP_ID,BASE_URL));
-            if( GCM_REGISTRATION_ID != null && !GCM_REGISTRATION_ID.isEmpty() 
) {
-                UsergridAsync.applyPushToken(this, GCM_REGISTRATION_ID, 
MainActivity.NOTIFIER_ID, new UsergridResponseCallback() {
-                    @Override
-                    public void onResponse(@NonNull UsergridResponse response) 
{ }
-                });
-            }
-            this.savePrefs();
-            USERGRID_PREFS_NEEDS_REFRESH = false;
-        }
-        super.onResume();
-    }
-
-    @Override
-    protected void onDestroy() {
-        this.savePrefs();
-        super.onDestroy();
-    }
-
-    public static void registerPush(Context context) {
-        final String regId = GCMRegistrar.getRegistrationId(context);
-        if ("".equals(regId)) {
-            GCMRegistrar.register(context, GCM_SENDER_ID);
-        } else {
-            if (GCMRegistrar.isRegisteredOnServer(context)) {
-                Log.i("", "Already registered with GCM");
-            } else {
-                MainActivity.registerPush(context, regId);
-            }
-        }
-    }
-
-    public static void registerPush(@NonNull final Context context, @NonNull 
final String registrationId) {
-        MainActivity.GCM_REGISTRATION_ID = registrationId;
-        UsergridAsync.applyPushToken(context, registrationId, 
MainActivity.NOTIFIER_ID, new UsergridResponseCallback() {
-            @Override
-            public void onResponse(@NonNull UsergridResponse response) {
-                if( !response.ok() ) {
-                    System.out.print("Error Description :" + 
response.getResponseError().toString());
-                }
-            }
-        });
-    }
-
-    public void sendPush(@NonNull final String deviceId, @NonNull final String 
message) {
-        HashMap<String,String> notificationMap = new HashMap<>();
-        notificationMap.put(MainActivity.NOTIFIER_ID,message);
-        HashMap<String,HashMap<String,String>> payloadMap = new HashMap<>();
-        payloadMap.put("payloads",notificationMap);
-
-        UsergridRequest notificationRequest = new 
UsergridRequest(UsergridEnums.UsergridHttpMethod.POST,UsergridRequest.APPLICATION_JSON_MEDIA_TYPE,Usergrid.clientAppUrl(),null,payloadMap,Usergrid.authForRequests(),"devices",
 deviceId, "notifications");
-        UsergridAsync.sendRequest(notificationRequest, new 
UsergridResponseCallback() {
-            @Override
-            public void onResponse(@NonNull UsergridResponse response) {
-                System.out.print("Push request completed successfully :" + 
response.ok());
-                if(!response.ok() && response.getResponseError() != null) {
-                    System.out.print("Error Description :" + 
response.getResponseError().toString());
-                }
-            }
-        });
-    }
-
-    public void savePrefs() {
-        SharedPreferences prefs = 
this.getSharedPreferences(USERGRID_PREFS_FILE_NAME, Context.MODE_PRIVATE);
-        SharedPreferences.Editor editor = prefs.edit();
-        editor.putString("ORG_ID", ORG_ID);
-        editor.putString("APP_ID", APP_ID);
-        editor.putString("BASE_URL", BASE_URL);
-        editor.putString("NOTIFIER_ID", NOTIFIER_ID);
-        editor.apply();
-    }
-
-    public void retrieveSavedPrefs() {
-        SharedPreferences prefs = 
this.getSharedPreferences(USERGRID_PREFS_FILE_NAME, Context.MODE_PRIVATE);
-        ORG_ID = prefs.getString("ORG_ID", ORG_ID);
-        APP_ID = prefs.getString("APP_ID", APP_ID);
-        BASE_URL = prefs.getString("BASE_URL",BASE_URL);
-        NOTIFIER_ID = prefs.getString("NOTIFIER_ID",NOTIFIER_ID);
-    }
-}

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/Push/push/src/main/java/org/apache/usergrid/push/SettingsActivity.java
----------------------------------------------------------------------
diff --git 
a/sdks/android/Samples/Push/push/src/main/java/org/apache/usergrid/push/SettingsActivity.java
 
b/sdks/android/Samples/Push/push/src/main/java/org/apache/usergrid/push/SettingsActivity.java
deleted file mode 100644
index 54ea269..0000000
--- 
a/sdks/android/Samples/Push/push/src/main/java/org/apache/usergrid/push/SettingsActivity.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.apache.usergrid.push;
-
-import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.view.View;
-import android.widget.Button;
-import android.widget.EditText;
-
-import org.apache.usergrid.java.client.Usergrid;
-
-public class SettingsActivity extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_settings);
-
-        final EditText orgIdEditText = (EditText) findViewById(R.id.orgId);
-        if( orgIdEditText != null ) {
-            orgIdEditText.setText(Usergrid.getOrgId());
-        }
-        final EditText appIdEditText = (EditText) findViewById(R.id.appId);
-        if( appIdEditText != null ) {
-            appIdEditText.setText(Usergrid.getAppId());
-        }
-        final EditText urlEditText = (EditText) findViewById(R.id.url);
-        if( urlEditText != null ) {
-            urlEditText.setText(Usergrid.getBaseUrl());
-        }
-        final EditText notifierIdEditText = (EditText) 
findViewById(R.id.notifierId);
-        if( notifierIdEditText != null ) {
-            notifierIdEditText.setText(MainActivity.NOTIFIER_ID);
-        }
-
-        final Button saveButton = (Button) findViewById(R.id.saveButton);
-        if( saveButton != null ) {
-            saveButton.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    if( orgIdEditText != null ) {
-                        MainActivity.ORG_ID = 
orgIdEditText.getText().toString();
-                    }
-                    if( appIdEditText != null ) {
-                        MainActivity.APP_ID = 
appIdEditText.getText().toString();
-                    }
-                    if( urlEditText != null ) {
-                        MainActivity.BASE_URL = 
urlEditText.getText().toString();
-                    }
-                    if( notifierIdEditText != null ) {
-                        MainActivity.NOTIFIER_ID = 
notifierIdEditText.getText().toString();
-                    }
-                    MainActivity.USERGRID_PREFS_NEEDS_REFRESH = true;
-                    SettingsActivity.this.finish();
-                }
-            });
-        }
-
-        final Button cancelButton = (Button) findViewById(R.id.cancelButton);
-        if( cancelButton != null ) {
-            cancelButton.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    SettingsActivity.this.finish();
-                }
-            });
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/Push/push/src/main/res/drawable/info.png
----------------------------------------------------------------------
diff --git a/sdks/android/Samples/Push/push/src/main/res/drawable/info.png 
b/sdks/android/Samples/Push/push/src/main/res/drawable/info.png
deleted file mode 100644
index 534d0ae..0000000
Binary files a/sdks/android/Samples/Push/push/src/main/res/drawable/info.png 
and /dev/null differ

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/Push/push/src/main/res/drawable/usergridguy.png
----------------------------------------------------------------------
diff --git 
a/sdks/android/Samples/Push/push/src/main/res/drawable/usergridguy.png 
b/sdks/android/Samples/Push/push/src/main/res/drawable/usergridguy.png
deleted file mode 100644
index b8a6844..0000000
Binary files 
a/sdks/android/Samples/Push/push/src/main/res/drawable/usergridguy.png and 
/dev/null differ

http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdc10b78/sdks/android/Samples/Push/push/src/main/res/layout/activity_main.xml
----------------------------------------------------------------------
diff --git 
a/sdks/android/Samples/Push/push/src/main/res/layout/activity_main.xml 
b/sdks/android/Samples/Push/push/src/main/res/layout/activity_main.xml
deleted file mode 100644
index a365c94..0000000
--- a/sdks/android/Samples/Push/push/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android";
-    xmlns:tools="http://schemas.android.com/tools";
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context=".MainActivity"
-    android:background="@color/colorPrimary">
-
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/usergridGuy"
-        android:minWidth="175dp"
-        android:minHeight="175dp"
-        android:maxHeight="175dp"
-        android:maxWidth="175dp"
-        android:clickable="false"
-        android:src="@drawable/usergridguy"
-        android:layout_centerVertical="true"
-        android:layout_alignStart="@+id/pushToAllDevices" />
-
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Push To All Devices"
-        android:id="@+id/pushToAllDevices"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:minHeight="175dp"
-        android:maxWidth="175dp"
-        android:minWidth="175dp"
-        android:maxHeight="175dp"
-        android:background="#95b8cb"
-        android:textColor="#ffffff"
-        android:textSize="10dp"
-        android:clickable="true" />
-
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Push To This Device"
-        android:id="@+id/pushToThisDevice"
-        android:minHeight="175dp"
-        android:maxWidth="175dp"
-        android:minWidth="175dp"
-        android:maxHeight="175dp"
-        android:background="#95b8cb"
-        android:textColor="@color/background_floating_material_light"
-        android:textSize="10dp"
-        android:layout_alignParentTop="true"
-        android:layout_alignStart="@+id/usergridGuy"
-        android:clickable="true" />
-
-    <ImageButton
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:id="@+id/infoButton"
-        android:src="@drawable/info"
-        android:background="@null"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentEnd="true"
-        android:adjustViewBounds="true"
-        android:scaleType="centerCrop" />
-
-</RelativeLayout>

Reply via email to