You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by mr...@apache.org on 2016/09/02 17:25:28 UTC

[06/12] usergrid git commit: Adding new Android SDK

http://git-wip-us.apache.org/repos/asf/usergrid/blob/b30b60b3/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
new file mode 100644
index 0000000..a630675
--- /dev/null
+++ b/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/layout/scrollable_alert_view.xml
@@ -0,0 +1,35 @@
+<?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/b30b60b3/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
new file mode 100644
index 0000000..cde69bc
Binary files /dev/null and b/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-hdpi/ic_launcher.png differ

http://git-wip-us.apache.org/repos/asf/usergrid/blob/b30b60b3/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
new file mode 100644
index 0000000..c133a0c
Binary files /dev/null and b/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-mdpi/ic_launcher.png differ

http://git-wip-us.apache.org/repos/asf/usergrid/blob/b30b60b3/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
new file mode 100644
index 0000000..bfa42f0
Binary files /dev/null and b/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-xhdpi/ic_launcher.png differ

http://git-wip-us.apache.org/repos/asf/usergrid/blob/b30b60b3/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
new file mode 100644
index 0000000..324e72c
Binary files /dev/null and b/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-xxhdpi/ic_launcher.png differ

http://git-wip-us.apache.org/repos/asf/usergrid/blob/b30b60b3/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
new file mode 100644
index 0000000..aee44e1
Binary files /dev/null and b/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ

http://git-wip-us.apache.org/repos/asf/usergrid/blob/b30b60b3/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
new file mode 100644
index 0000000..63fc816
--- /dev/null
+++ b/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+<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/b30b60b3/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
new file mode 100644
index 0000000..b26cbd3
--- /dev/null
+++ b/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/values/colors.xml
@@ -0,0 +1,8 @@
+<?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/b30b60b3/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
new file mode 100644
index 0000000..47c8224
--- /dev/null
+++ b/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/values/dimens.xml
@@ -0,0 +1,5 @@
+<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/b30b60b3/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
new file mode 100644
index 0000000..583eb46
--- /dev/null
+++ b/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">ActivityFeed</string>
+</resources>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/b30b60b3/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
new file mode 100644
index 0000000..8690628
--- /dev/null
+++ b/sdks/android/Samples/ActivityFeed/activityfeed/src/main/res/values/styles.xml
@@ -0,0 +1,19 @@
+<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/b30b60b3/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
new file mode 100644
index 0000000..8230157
--- /dev/null
+++ b/sdks/android/Samples/ActivityFeed/activityfeed/src/test/java/org/apache/usergrid/activityfeed/ExampleUnitTest.java
@@ -0,0 +1,15 @@
+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/b30b60b3/sdks/android/Samples/ActivityFeed/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/android/Samples/ActivityFeed/build.gradle b/sdks/android/Samples/ActivityFeed/build.gradle
new file mode 100644
index 0000000..03bced9
--- /dev/null
+++ b/sdks/android/Samples/ActivityFeed/build.gradle
@@ -0,0 +1,23 @@
+// 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.0'
+
+        // 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/b30b60b3/sdks/android/Samples/ActivityFeed/gradle.properties
----------------------------------------------------------------------
diff --git a/sdks/android/Samples/ActivityFeed/gradle.properties b/sdks/android/Samples/ActivityFeed/gradle.properties
new file mode 100644
index 0000000..1d3591c
--- /dev/null
+++ b/sdks/android/Samples/ActivityFeed/gradle.properties
@@ -0,0 +1,18 @@
+# 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/b30b60b3/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
new file mode 100644
index 0000000..13372ae
Binary files /dev/null and b/sdks/android/Samples/ActivityFeed/gradle/wrapper/gradle-wrapper.jar differ

http://git-wip-us.apache.org/repos/asf/usergrid/blob/b30b60b3/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
new file mode 100644
index 0000000..122a0dc
--- /dev/null
+++ b/sdks/android/Samples/ActivityFeed/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#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/b30b60b3/sdks/android/Samples/ActivityFeed/gradlew
----------------------------------------------------------------------
diff --git a/sdks/android/Samples/ActivityFeed/gradlew b/sdks/android/Samples/ActivityFeed/gradlew
new file mode 100755
index 0000000..9d82f78
--- /dev/null
+++ b/sdks/android/Samples/ActivityFeed/gradlew
@@ -0,0 +1,160 @@
+#!/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/b30b60b3/sdks/android/Samples/ActivityFeed/gradlew.bat
----------------------------------------------------------------------
diff --git a/sdks/android/Samples/ActivityFeed/gradlew.bat b/sdks/android/Samples/ActivityFeed/gradlew.bat
new file mode 100644
index 0000000..aec9973
--- /dev/null
+++ b/sdks/android/Samples/ActivityFeed/gradlew.bat
@@ -0,0 +1,90 @@
+@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/b30b60b3/sdks/android/Samples/ActivityFeed/settings.gradle
----------------------------------------------------------------------
diff --git a/sdks/android/Samples/ActivityFeed/settings.gradle b/sdks/android/Samples/ActivityFeed/settings.gradle
new file mode 100644
index 0000000..05d5d93
--- /dev/null
+++ b/sdks/android/Samples/ActivityFeed/settings.gradle
@@ -0,0 +1,2 @@
+include ':activityfeed', ':UsergridAndroidSDK'
+project (":UsergridAndroidSDK").projectDir = new File("../../UsergridAndroidSDK")

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

http://git-wip-us.apache.org/repos/asf/usergrid/blob/b30b60b3/sdks/android/Samples/Push/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/android/Samples/Push/build.gradle b/sdks/android/Samples/Push/build.gradle
new file mode 100644
index 0000000..12e80f1
--- /dev/null
+++ b/sdks/android/Samples/Push/build.gradle
@@ -0,0 +1,22 @@
+// 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.0'
+        // 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/b30b60b3/sdks/android/Samples/Push/gradle.properties
----------------------------------------------------------------------
diff --git a/sdks/android/Samples/Push/gradle.properties b/sdks/android/Samples/Push/gradle.properties
new file mode 100644
index 0000000..1d3591c
--- /dev/null
+++ b/sdks/android/Samples/Push/gradle.properties
@@ -0,0 +1,18 @@
+# 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/b30b60b3/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
new file mode 100644
index 0000000..13372ae
Binary files /dev/null and b/sdks/android/Samples/Push/gradle/wrapper/gradle-wrapper.jar differ

http://git-wip-us.apache.org/repos/asf/usergrid/blob/b30b60b3/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
new file mode 100644
index 0000000..122a0dc
--- /dev/null
+++ b/sdks/android/Samples/Push/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#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/b30b60b3/sdks/android/Samples/Push/gradlew
----------------------------------------------------------------------
diff --git a/sdks/android/Samples/Push/gradlew b/sdks/android/Samples/Push/gradlew
new file mode 100755
index 0000000..9d82f78
--- /dev/null
+++ b/sdks/android/Samples/Push/gradlew
@@ -0,0 +1,160 @@
+#!/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/b30b60b3/sdks/android/Samples/Push/gradlew.bat
----------------------------------------------------------------------
diff --git a/sdks/android/Samples/Push/gradlew.bat b/sdks/android/Samples/Push/gradlew.bat
new file mode 100644
index 0000000..aec9973
--- /dev/null
+++ b/sdks/android/Samples/Push/gradlew.bat
@@ -0,0 +1,90 @@
+@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/b30b60b3/sdks/android/Samples/Push/push/.gitignore
----------------------------------------------------------------------
diff --git a/sdks/android/Samples/Push/push/.gitignore b/sdks/android/Samples/Push/push/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/sdks/android/Samples/Push/push/.gitignore
@@ -0,0 +1 @@
+/build

http://git-wip-us.apache.org/repos/asf/usergrid/blob/b30b60b3/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
new file mode 100644
index 0000000..2b845b3
--- /dev/null
+++ b/sdks/android/Samples/Push/push/build.gradle
@@ -0,0 +1,27 @@
+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/b30b60b3/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
new file mode 100755
index 0000000..ac109a8
Binary files /dev/null and b/sdks/android/Samples/Push/push/libs/gcm.jar differ

http://git-wip-us.apache.org/repos/asf/usergrid/blob/b30b60b3/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
new file mode 100644
index 0000000..73ed137
--- /dev/null
+++ b/sdks/android/Samples/Push/push/proguard-rules.pro
@@ -0,0 +1,17 @@
+# 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/b30b60b3/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
new file mode 100644
index 0000000..a9f1c73
--- /dev/null
+++ b/sdks/android/Samples/Push/push/src/androidTest/java/org/apache/usergrid/push/ApplicationTest.java
@@ -0,0 +1,13 @@
+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/b30b60b3/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
new file mode 100644
index 0000000..bbfaaf4
--- /dev/null
+++ b/sdks/android/Samples/Push/push/src/main/AndroidManifest.xml
@@ -0,0 +1,51 @@
+<?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/b30b60b3/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
new file mode 100644
index 0000000..5faeb01
--- /dev/null
+++ b/sdks/android/Samples/Push/push/src/main/java/org/apache/usergrid/push/GCMIntentService.java
@@ -0,0 +1,85 @@
+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/b30b60b3/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
new file mode 100644
index 0000000..084dceb
--- /dev/null
+++ b/sdks/android/Samples/Push/push/src/main/java/org/apache/usergrid/push/MainActivity.java
@@ -0,0 +1,162 @@
+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/b30b60b3/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
new file mode 100644
index 0000000..54ea269
--- /dev/null
+++ b/sdks/android/Samples/Push/push/src/main/java/org/apache/usergrid/push/SettingsActivity.java
@@ -0,0 +1,68 @@
+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/b30b60b3/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
new file mode 100644
index 0000000..534d0ae
Binary files /dev/null and b/sdks/android/Samples/Push/push/src/main/res/drawable/info.png differ

http://git-wip-us.apache.org/repos/asf/usergrid/blob/b30b60b3/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
new file mode 100644
index 0000000..b8a6844
Binary files /dev/null and b/sdks/android/Samples/Push/push/src/main/res/drawable/usergridguy.png differ

http://git-wip-us.apache.org/repos/asf/usergrid/blob/b30b60b3/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
new file mode 100644
index 0000000..a365c94
--- /dev/null
+++ b/sdks/android/Samples/Push/push/src/main/res/layout/activity_main.xml
@@ -0,0 +1,69 @@
+<?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>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/b30b60b3/sdks/android/Samples/Push/push/src/main/res/layout/activity_settings.xml
----------------------------------------------------------------------
diff --git a/sdks/android/Samples/Push/push/src/main/res/layout/activity_settings.xml b/sdks/android/Samples/Push/push/src/main/res/layout/activity_settings.xml
new file mode 100644
index 0000000..0f6626b
--- /dev/null
+++ b/sdks/android/Samples/Push/push/src/main/res/layout/activity_settings.xml
@@ -0,0 +1,95 @@
+<?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:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    tools:context="org.apache.usergrid.push.SettingsActivity"
+    android:background="@color/colorPrimary"
+    android:minHeight="30dp">
+
+    <EditText
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/orgId"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
+        android:minWidth="300dp"
+        android:background="@android:color/white"
+        android:layout_marginTop="30dp"
+        android:hint="Org Id"
+        android:paddingStart="10dp"
+        android:minHeight="30dp"
+        android:maxLines="1"
+        android:singleLine="true"
+        android:maxWidth="300dp" />
+
+    <EditText
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/appId"
+        android:minWidth="300dp"
+        android:background="@android:color/white"
+        android:layout_marginTop="30dp"
+        android:layout_below="@+id/orgId"
+        android:layout_centerHorizontal="true"
+        android:hint="App Id"
+        android:paddingStart="10dp"
+        android:minHeight="30dp"
+        android:maxLines="1"
+        android:singleLine="true"
+        android:maxWidth="300dp" />
+
+    <EditText
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/url"
+        android:minWidth="300dp"
+        android:background="@android:color/white"
+        android:layout_marginTop="30dp"
+        android:layout_below="@+id/appId"
+        android:layout_centerHorizontal="true"
+        android:hint="URL"
+        android:paddingStart="10dp"
+        android:minHeight="30dp"
+        android:maxLines="1"
+        android:singleLine="true"
+        android:maxWidth="300dp" />
+
+    <EditText
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/notifierId"
+        android:minWidth="300dp"
+        android:background="@android:color/white"
+        android:layout_marginTop="30dp"
+        android:layout_below="@+id/url"
+        android:layout_centerHorizontal="true"
+        android:hint="Notifier Id"
+        android:paddingStart="10dp"
+        android:minHeight="30dp"
+        android:maxLines="1"
+        android:singleLine="true"
+        android:maxWidth="300dp" />
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Save"
+        android:id="@+id/saveButton"
+        android:layout_marginTop="23dp"
+        android:layout_below="@+id/notifierId"
+        android:layout_alignEnd="@+id/notifierId" />
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Cancel"
+        android:id="@+id/cancelButton"
+        android:layout_alignTop="@+id/saveButton"
+        android:layout_alignStart="@+id/notifierId" />
+</RelativeLayout>

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

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

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

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

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

http://git-wip-us.apache.org/repos/asf/usergrid/blob/b30b60b3/sdks/android/Samples/Push/push/src/main/res/values-w820dp/dimens.xml
----------------------------------------------------------------------
diff --git a/sdks/android/Samples/Push/push/src/main/res/values-w820dp/dimens.xml b/sdks/android/Samples/Push/push/src/main/res/values-w820dp/dimens.xml
new file mode 100644
index 0000000..63fc816
--- /dev/null
+++ b/sdks/android/Samples/Push/push/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+<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/b30b60b3/sdks/android/Samples/Push/push/src/main/res/values/colors.xml
----------------------------------------------------------------------
diff --git a/sdks/android/Samples/Push/push/src/main/res/values/colors.xml b/sdks/android/Samples/Push/push/src/main/res/values/colors.xml
new file mode 100644
index 0000000..75703af
--- /dev/null
+++ b/sdks/android/Samples/Push/push/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#1b5d89</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF4081</color>
+</resources>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/b30b60b3/sdks/android/Samples/Push/push/src/main/res/values/dimens.xml
----------------------------------------------------------------------
diff --git a/sdks/android/Samples/Push/push/src/main/res/values/dimens.xml b/sdks/android/Samples/Push/push/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..47c8224
--- /dev/null
+++ b/sdks/android/Samples/Push/push/src/main/res/values/dimens.xml
@@ -0,0 +1,5 @@
+<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/b30b60b3/sdks/android/Samples/Push/push/src/main/res/values/strings.xml
----------------------------------------------------------------------
diff --git a/sdks/android/Samples/Push/push/src/main/res/values/strings.xml b/sdks/android/Samples/Push/push/src/main/res/values/strings.xml
new file mode 100644
index 0000000..f0817ce
--- /dev/null
+++ b/sdks/android/Samples/Push/push/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">Apigee Push</string>
+</resources>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/b30b60b3/sdks/android/Samples/Push/push/src/main/res/values/styles.xml
----------------------------------------------------------------------
diff --git a/sdks/android/Samples/Push/push/src/main/res/values/styles.xml b/sdks/android/Samples/Push/push/src/main/res/values/styles.xml
new file mode 100644
index 0000000..0eb88fe
--- /dev/null
+++ b/sdks/android/Samples/Push/push/src/main/res/values/styles.xml
@@ -0,0 +1,11 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+</resources>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/b30b60b3/sdks/android/Samples/Push/push/src/test/java/org/apache/usergrid/push/ExampleUnitTest.java
----------------------------------------------------------------------
diff --git a/sdks/android/Samples/Push/push/src/test/java/org/apache/usergrid/push/ExampleUnitTest.java b/sdks/android/Samples/Push/push/src/test/java/org/apache/usergrid/push/ExampleUnitTest.java
new file mode 100644
index 0000000..fcc42bf
--- /dev/null
+++ b/sdks/android/Samples/Push/push/src/test/java/org/apache/usergrid/push/ExampleUnitTest.java
@@ -0,0 +1,15 @@
+package org.apache.usergrid.push;
+
+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/b30b60b3/sdks/android/Samples/Push/settings.gradle
----------------------------------------------------------------------
diff --git a/sdks/android/Samples/Push/settings.gradle b/sdks/android/Samples/Push/settings.gradle
new file mode 100644
index 0000000..f1ac978
--- /dev/null
+++ b/sdks/android/Samples/Push/settings.gradle
@@ -0,0 +1,2 @@
+include ':push', ':UsergridAndroidSDK'
+project (":UsergridAndroidSDK").projectDir = new File("../../UsergridAndroidSDK")

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

http://git-wip-us.apache.org/repos/asf/usergrid/blob/b30b60b3/sdks/android/UsergridAndroidSDK/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/android/UsergridAndroidSDK/build.gradle b/sdks/android/UsergridAndroidSDK/build.gradle
new file mode 100644
index 0000000..ef2db46
--- /dev/null
+++ b/sdks/android/UsergridAndroidSDK/build.gradle
@@ -0,0 +1,70 @@
+apply plugin: 'com.android.library'
+apply plugin: 'com.jfrog.bintray'
+apply plugin: 'com.github.dcendents.android-maven'
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.1.0'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
+        classpath "com.github.dcendents:android-maven-gradle-plugin:1.3"
+    }
+}
+
+android {
+    compileSdkVersion 17
+    buildToolsVersion "22.0.1"
+
+    group = 'org.apache.usergrid.android'
+    version = '2.1.0'
+
+    defaultConfig {
+        minSdkVersion 17
+        targetSdkVersion 23
+        versionCode 1
+        versionName "2.1.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    repositories {
+        mavenCentral()
+    }
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    testCompile 'junit:junit:4.12'
+}
+
+task generateSourcesJar(type: Jar) {
+    from android.sourceSets.main.java.srcDirs
+    classifier 'sources'
+}
+artifacts {
+    archives generateSourcesJar
+}
+
+bintray {
+    user = 'rwalsh'
+    key = '3ae2887b2af626dab61faffd57b99303e146feb6'
+    pkg {
+        repo = 'maven'
+        name = 'org.apache.usergrid.android'
+        version {
+            name = '2.1.0'
+            desc = 'Usergrid Android Client'
+            released  = new Date()
+        }
+
+        licenses = ['Apache-2.0']
+        vcsUrl = 'https://github.com/apache/usergrid.git'
+        websiteUrl = 'https://github.com/apache/usergrid'
+    }
+    configurations = ['archives']
+}
\ No newline at end of file

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

http://git-wip-us.apache.org/repos/asf/usergrid/blob/b30b60b3/sdks/android/UsergridAndroidSDK/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/sdks/android/UsergridAndroidSDK/gradle/wrapper/gradle-wrapper.properties b/sdks/android/UsergridAndroidSDK/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..122a0dc
--- /dev/null
+++ b/sdks/android/UsergridAndroidSDK/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#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/b30b60b3/sdks/android/UsergridAndroidSDK/gradlew
----------------------------------------------------------------------
diff --git a/sdks/android/UsergridAndroidSDK/gradlew b/sdks/android/UsergridAndroidSDK/gradlew
new file mode 100644
index 0000000..9d82f78
--- /dev/null
+++ b/sdks/android/UsergridAndroidSDK/gradlew
@@ -0,0 +1,160 @@
+#!/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/b30b60b3/sdks/android/UsergridAndroidSDK/gradlew.bat
----------------------------------------------------------------------
diff --git a/sdks/android/UsergridAndroidSDK/gradlew.bat b/sdks/android/UsergridAndroidSDK/gradlew.bat
new file mode 100644
index 0000000..aec9973
--- /dev/null
+++ b/sdks/android/UsergridAndroidSDK/gradlew.bat
@@ -0,0 +1,90 @@
+@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/b30b60b3/sdks/android/UsergridAndroidSDK/libs/usergrid-java-client-2.1.0.jar
----------------------------------------------------------------------
diff --git a/sdks/android/UsergridAndroidSDK/libs/usergrid-java-client-2.1.0.jar b/sdks/android/UsergridAndroidSDK/libs/usergrid-java-client-2.1.0.jar
new file mode 100644
index 0000000..d77cd88
Binary files /dev/null and b/sdks/android/UsergridAndroidSDK/libs/usergrid-java-client-2.1.0.jar differ

http://git-wip-us.apache.org/repos/asf/usergrid/blob/b30b60b3/sdks/android/UsergridAndroidSDK/proguard-rules.pro
----------------------------------------------------------------------
diff --git a/sdks/android/UsergridAndroidSDK/proguard-rules.pro b/sdks/android/UsergridAndroidSDK/proguard-rules.pro
new file mode 100644
index 0000000..73ed137
--- /dev/null
+++ b/sdks/android/UsergridAndroidSDK/proguard-rules.pro
@@ -0,0 +1,17 @@
+# 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 *;
+#}