+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+
+
2. Grant of Copyright License.
+ Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+
+
3. Grant of Patent License.
+ Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+
+
4. Redistribution.
+ You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+
+
You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+
+
You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+
+
You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+
+
If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+
+You may add Your own copyright statement to Your modifications and
+may provide additional or different license terms and conditions
+for use, reproduction, or distribution of Your modifications, or
+for any such Derivative Works as a whole, provided Your use,
+reproduction, and distribution of the Work otherwise complies with
+the conditions stated in this License.
+
+
5. Submission of Contributions.
+ Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+
+
6. Trademarks.
+ This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+
+
7. Disclaimer of Warranty.
+ Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+
+
8. Limitation of Liability.
+ In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+
+
9. Accepting Warranty or Additional Liability.
+ While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+
+
+ END OF TERMS AND CONDITIONS
+
+
+
\ No newline at end of file
diff --git a/bluetooth-le-library.iml b/bluetooth-le-library.iml
new file mode 100644
index 0000000..cf2c73f
--- /dev/null
+++ b/bluetooth-le-library.iml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..76f346d
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,21 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+ext.compileSdkVersion = 18
+ext.buildToolsVersion = "21.1.1"
+ext.minSdkVersion = 18
+ext.targetSdkVersion = 18
+
+buildscript {
+ repositories {
+ jcenter()
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:1.1.0'
+ }
+}
+
+allprojects {
+ repositories {
+ jcenter()
+ }
+}
diff --git a/dist/BluetoothLeLibrary-0.0.1-javadoc.jar b/dist/BluetoothLeLibrary-0.0.1-javadoc.jar
new file mode 100644
index 0000000..e0e1a58
Binary files /dev/null and b/dist/BluetoothLeLibrary-0.0.1-javadoc.jar differ
diff --git a/dist/BluetoothLeLibrary-0.0.1.jar b/dist/BluetoothLeLibrary-0.0.1.jar
new file mode 100644
index 0000000..d660473
Binary files /dev/null and b/dist/BluetoothLeLibrary-0.0.1.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..8c0fb64
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..0c71e76
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Wed Apr 10 15:27:10 PDT 2013
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..91a7e26
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,164 @@
+#!/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
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# 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\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+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"`
+
+ # 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 "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..8a0b282
--- /dev/null
+++ b/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
diff --git a/library/.classpath b/library/.classpath
deleted file mode 100644
index 7bc01d9..0000000
--- a/library/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/library/.gitignore b/library/.gitignore
index 7211978..796b96d 100644
--- a/library/.gitignore
+++ b/library/.gitignore
@@ -1,7 +1 @@
-/bin
-/gen
-local.properties
-.idea/
-lint.xml
-/.apt_generated
-/dist
+/build
diff --git a/library/.project b/library/.project
deleted file mode 100644
index db0e780..0000000
--- a/library/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
- Bluetooth LE Library
-
-
-
-
-
- com.android.ide.eclipse.adt.ResourceManagerBuilder
-
-
-
-
- com.android.ide.eclipse.adt.PreCompilerBuilder
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- com.android.ide.eclipse.adt.ApkBuilder
-
-
-
-
-
- com.android.ide.eclipse.adt.AndroidNature
- org.eclipse.jdt.core.javanature
-
-
diff --git a/library/.settings/org.eclipse.jdt.core.prefs b/library/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index b080d2d..0000000
--- a/library/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/library/build.gradle b/library/build.gradle
new file mode 100644
index 0000000..3e5778d
--- /dev/null
+++ b/library/build.gradle
@@ -0,0 +1,34 @@
+apply plugin: 'com.android.library'
+
+def versionMajor = 0
+def versionMinor = 0
+def versionPatch = 2
+def androidVersionCode = 2
+
+def targetSdk = rootProject.targetSdkVersion;
+def minSdkRed = rootProject.minSdkVersion;
+
+android {
+ compileSdkVersion rootProject.compileSdkVersion
+ buildToolsVersion rootProject.buildToolsVersion
+
+ defaultConfig {
+ minSdkVersion minSdkRed
+ targetSdkVersion targetSdk
+ versionCode androidVersionCode
+ versionName "${versionMajor}.${versionMinor}.${versionPatch}"
+ }
+
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ }
+ }
+ productFlavors {
+ }
+}
+
+dependencies {
+ compile fileTree(include: ['*.jar'], dir: 'libs')
+}
diff --git a/library/build.xml b/library/build.xml
deleted file mode 100644
index 4aa9f98..0000000
--- a/library/build.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/library/library.iml b/library/library.iml
new file mode 100644
index 0000000..380a1e3
--- /dev/null
+++ b/library/library.iml
@@ -0,0 +1,91 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/library/libs/android-support-v4.jar b/library/libs/android-support-v4.jar
deleted file mode 100644
index 96644ed..0000000
Binary files a/library/libs/android-support-v4.jar and /dev/null differ
diff --git a/library/proguard-project.txt b/library/proguard-rules.pro
similarity index 62%
rename from library/proguard-project.txt
rename to library/proguard-rules.pro
index f2fe155..f8c620f 100644
--- a/library/proguard-project.txt
+++ b/library/proguard-rules.pro
@@ -1,11 +1,8 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
# Add project specific ProGuard rules here.
# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
+# in /home/alex/Dev/android-sdk-linux/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
diff --git a/library/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
similarity index 100%
rename from library/AndroidManifest.xml
rename to library/src/main/AndroidManifest.xml
diff --git a/library/src/uk/co/alt236/bluetoothlelib/device/BluetoothLeDevice.java b/library/src/main/java/uk/co/alt236/bluetoothlelib/device/BluetoothLeDevice.java
similarity index 100%
rename from library/src/uk/co/alt236/bluetoothlelib/device/BluetoothLeDevice.java
rename to library/src/main/java/uk/co/alt236/bluetoothlelib/device/BluetoothLeDevice.java
diff --git a/library/src/uk/co/alt236/bluetoothlelib/device/IBeaconDevice.java b/library/src/main/java/uk/co/alt236/bluetoothlelib/device/IBeaconDevice.java
similarity index 93%
rename from library/src/uk/co/alt236/bluetoothlelib/device/IBeaconDevice.java
rename to library/src/main/java/uk/co/alt236/bluetoothlelib/device/IBeaconDevice.java
index 9a4b90f..8cd3542 100644
--- a/library/src/uk/co/alt236/bluetoothlelib/device/IBeaconDevice.java
+++ b/library/src/main/java/uk/co/alt236/bluetoothlelib/device/IBeaconDevice.java
@@ -17,7 +17,7 @@ public class IBeaconDevice extends BluetoothLeDevice{
* @param device the device
* @param rssi the RSSI value
* @param scanRecord the scanRecord
- * @throws IllegalArguementException if the passed device is not an iBecon
+ * @throws IllegalArgumentException if the passed device is not an iBeacon
*/
public IBeaconDevice(BluetoothDevice device, int rssi, byte[] scanRecord) {
super(device, rssi, scanRecord, 0);
@@ -32,7 +32,7 @@ public class IBeaconDevice extends BluetoothLeDevice{
* @param rssi the RSSI value of the RSSI measurement
* @param scanRecord the scan record
* @param timestamp the timestamp of the RSSI measurement
- * @throws IllegalArguementException if the passed device is not an iBecon
+ * @throws IllegalArgumentException if the passed device is not an iBeacon
*/
public IBeaconDevice(BluetoothDevice device, int rssi, byte[] scanRecord, long timestamp){
super(device, rssi, scanRecord, timestamp);
@@ -45,7 +45,7 @@ public class IBeaconDevice extends BluetoothLeDevice{
* iBeacon Device.
*
* @param device the device
- * @throws IllegalArguementException if the passed device is not an iBecon
+ * @throws IllegalArgumentException if the passed device is not an iBeacon
*/
public IBeaconDevice(BluetoothLeDevice device){
super(device);
diff --git a/library/src/uk/co/alt236/bluetoothlelib/device/adrecord/AdRecord.java b/library/src/main/java/uk/co/alt236/bluetoothlelib/device/adrecord/AdRecord.java
similarity index 100%
rename from library/src/uk/co/alt236/bluetoothlelib/device/adrecord/AdRecord.java
rename to library/src/main/java/uk/co/alt236/bluetoothlelib/device/adrecord/AdRecord.java
diff --git a/library/src/uk/co/alt236/bluetoothlelib/device/adrecord/AdRecordStore.java b/library/src/main/java/uk/co/alt236/bluetoothlelib/device/adrecord/AdRecordStore.java
similarity index 100%
rename from library/src/uk/co/alt236/bluetoothlelib/device/adrecord/AdRecordStore.java
rename to library/src/main/java/uk/co/alt236/bluetoothlelib/device/adrecord/AdRecordStore.java
diff --git a/library/src/uk/co/alt236/bluetoothlelib/device/mfdata/IBeaconManufacturerData.java b/library/src/main/java/uk/co/alt236/bluetoothlelib/device/mfdata/IBeaconManufacturerData.java
similarity index 96%
rename from library/src/uk/co/alt236/bluetoothlelib/device/mfdata/IBeaconManufacturerData.java
rename to library/src/main/java/uk/co/alt236/bluetoothlelib/device/mfdata/IBeaconManufacturerData.java
index 07888d9..2bb555e 100644
--- a/library/src/uk/co/alt236/bluetoothlelib/device/mfdata/IBeaconManufacturerData.java
+++ b/library/src/main/java/uk/co/alt236/bluetoothlelib/device/mfdata/IBeaconManufacturerData.java
@@ -60,7 +60,7 @@ public final class IBeaconManufacturerData {
/**
* Instantiates a new iBeacon manufacturer data object.
- * @param data the {@link #uk.co.alt236.bluetoothlelib.device.adrecord.AdRecord.TYPE_MANUFACTURER_SPECIFIC_DATA} data array
+ * @param data the {@link uk.co.alt236.bluetoothlelib.device.adrecord.AdRecord#TYPE_MANUFACTURER_SPECIFIC_DATA} data array
* @throws IndexOutOfBoundsException if the data array is shorter than expected
*/
public IBeaconManufacturerData(byte[] data){
diff --git a/library/src/uk/co/alt236/bluetoothlelib/resolvers/BluetoothClassResolver.java b/library/src/main/java/uk/co/alt236/bluetoothlelib/resolvers/BluetoothClassResolver.java
similarity index 100%
rename from library/src/uk/co/alt236/bluetoothlelib/resolvers/BluetoothClassResolver.java
rename to library/src/main/java/uk/co/alt236/bluetoothlelib/resolvers/BluetoothClassResolver.java
diff --git a/library/src/uk/co/alt236/bluetoothlelib/resolvers/CompanyIdentifierResolver.java b/library/src/main/java/uk/co/alt236/bluetoothlelib/resolvers/CompanyIdentifierResolver.java
similarity index 100%
rename from library/src/uk/co/alt236/bluetoothlelib/resolvers/CompanyIdentifierResolver.java
rename to library/src/main/java/uk/co/alt236/bluetoothlelib/resolvers/CompanyIdentifierResolver.java
diff --git a/library/src/uk/co/alt236/bluetoothlelib/resolvers/GattAttributeResolver.java b/library/src/main/java/uk/co/alt236/bluetoothlelib/resolvers/GattAttributeResolver.java
similarity index 100%
rename from library/src/uk/co/alt236/bluetoothlelib/resolvers/GattAttributeResolver.java
rename to library/src/main/java/uk/co/alt236/bluetoothlelib/resolvers/GattAttributeResolver.java
diff --git a/library/src/uk/co/alt236/bluetoothlelib/util/AdRecordUtils.java b/library/src/main/java/uk/co/alt236/bluetoothlelib/util/AdRecordUtils.java
similarity index 100%
rename from library/src/uk/co/alt236/bluetoothlelib/util/AdRecordUtils.java
rename to library/src/main/java/uk/co/alt236/bluetoothlelib/util/AdRecordUtils.java
diff --git a/library/src/uk/co/alt236/bluetoothlelib/util/ByteUtils.java b/library/src/main/java/uk/co/alt236/bluetoothlelib/util/ByteUtils.java
similarity index 100%
rename from library/src/uk/co/alt236/bluetoothlelib/util/ByteUtils.java
rename to library/src/main/java/uk/co/alt236/bluetoothlelib/util/ByteUtils.java
diff --git a/library/src/uk/co/alt236/bluetoothlelib/util/IBeaconUtils.java b/library/src/main/java/uk/co/alt236/bluetoothlelib/util/IBeaconUtils.java
similarity index 89%
rename from library/src/uk/co/alt236/bluetoothlelib/util/IBeaconUtils.java
rename to library/src/main/java/uk/co/alt236/bluetoothlelib/util/IBeaconUtils.java
index 2fe5e1c..92cc185 100644
--- a/library/src/uk/co/alt236/bluetoothlelib/util/IBeaconUtils.java
+++ b/library/src/main/java/uk/co/alt236/bluetoothlelib/util/IBeaconUtils.java
@@ -29,11 +29,11 @@ public class IBeaconUtils {
/**
* Calculates the accuracy of an RSSI reading.
*
- * The code was taken from {@link http://stackoverflow.com/questions/20416218/understanding-ibeacon-distancing}
+ * The code was taken from {@linktourl http://stackoverflow.com/questions/20416218/understanding-ibeacon-distancing}
*
* @param txPower the calibrated TX power of an iBeacon
* @param rssi the RSSI value of the iBeacon
- * @return
+ * @return the calculated Accuracy
*/
public static double calculateAccuracy(int txPower, double rssi) {
if (rssi == 0) {
@@ -54,7 +54,7 @@ public class IBeaconUtils {
* Ascertains whether a {@link uk.co.alt236.bluetoothlelib.device.BluetoothLeDevice} is an iBeacon;
*
* @param device a {@link uk.co.alt236.bluetoothlelib.device.BluetoothLeDevice} device.
- * @return
+ * @return true if the device is an iBeacon, false otherwise
*/
public static boolean isThisAnIBeacon(BluetoothLeDevice device){
return isThisAnIBeacon(
@@ -64,7 +64,7 @@ public class IBeaconUtils {
/**
* Ascertains whether a Manufacturer Data byte array belongs to an iBeacon;
*
- * @param scanRecord a Bluetooth LE device's manufacturerData.
+ * @param manufacturerData a Bluetooth LE device's raw manufacturerData.
* @return
*/
public static boolean isThisAnIBeacon(byte[] manufacturerData){
diff --git a/library/src/uk/co/alt236/bluetoothlelib/util/LimitedLinkHashMap.java b/library/src/main/java/uk/co/alt236/bluetoothlelib/util/LimitedLinkHashMap.java
similarity index 100%
rename from library/src/uk/co/alt236/bluetoothlelib/util/LimitedLinkHashMap.java
rename to library/src/main/java/uk/co/alt236/bluetoothlelib/util/LimitedLinkHashMap.java
diff --git a/library/res/drawable-hdpi/ic_launcher.png b/library/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from library/res/drawable-hdpi/ic_launcher.png
rename to library/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/library/res/drawable-mdpi/ic_launcher.png b/library/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from library/res/drawable-mdpi/ic_launcher.png
rename to library/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/library/res/drawable-xhdpi/ic_launcher.png b/library/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from library/res/drawable-xhdpi/ic_launcher.png
rename to library/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/library/res/drawable-xxhdpi/ic_launcher.png b/library/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from library/res/drawable-xxhdpi/ic_launcher.png
rename to library/src/main/res/drawable-xxhdpi/ic_launcher.png
diff --git a/library/res/values-v11/styles.xml b/library/src/main/res/values-v11/styles.xml
similarity index 100%
rename from library/res/values-v11/styles.xml
rename to library/src/main/res/values-v11/styles.xml
diff --git a/library/res/values-v14/styles.xml b/library/src/main/res/values-v14/styles.xml
similarity index 100%
rename from library/res/values-v14/styles.xml
rename to library/src/main/res/values-v14/styles.xml
diff --git a/library/res/values/strings.xml b/library/src/main/res/values/strings.xml
similarity index 100%
rename from library/res/values/strings.xml
rename to library/src/main/res/values/strings.xml
diff --git a/library/res/values/styles.xml b/library/src/main/res/values/styles.xml
similarity index 100%
rename from library/res/values/styles.xml
rename to library/src/main/res/values/styles.xml
diff --git a/sample_app/.classpath b/sample_app/.classpath
deleted file mode 100644
index c54e8eb..0000000
--- a/sample_app/.classpath
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sample_app/.factorypath b/sample_app/.factorypath
deleted file mode 100644
index 946a26f..0000000
--- a/sample_app/.factorypath
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/sample_app/.gitignore b/sample_app/.gitignore
index 47ab45a..796b96d 100644
--- a/sample_app/.gitignore
+++ b/sample_app/.gitignore
@@ -1,6 +1 @@
-/bin
-/gen
-local.properties
-.idea/
-lint.xml
-/.apt_generated
+/build
diff --git a/sample_app/.project b/sample_app/.project
deleted file mode 100644
index f0df143..0000000
--- a/sample_app/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
- Bluetooth LE Scanner
-
-
-
-
-
- com.android.ide.eclipse.adt.ResourceManagerBuilder
-
-
-
-
- com.android.ide.eclipse.adt.PreCompilerBuilder
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- com.android.ide.eclipse.adt.ApkBuilder
-
-
-
-
-
- com.android.ide.eclipse.adt.AndroidNature
- org.eclipse.jdt.core.javanature
-
-
diff --git a/sample_app/.settings/org.eclipse.jdt.apt.core.prefs b/sample_app/.settings/org.eclipse.jdt.apt.core.prefs
deleted file mode 100644
index 7d52ece..0000000
--- a/sample_app/.settings/org.eclipse.jdt.apt.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.apt.aptEnabled=true
-org.eclipse.jdt.apt.genSrcDir=.apt_generated
-org.eclipse.jdt.apt.reconcileEnabled=true
diff --git a/sample_app/.settings/org.eclipse.jdt.core.prefs b/sample_app/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f2b863f..0000000
--- a/sample_app/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.processAnnotations=enabled
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/sample_app/build.gradle b/sample_app/build.gradle
new file mode 100644
index 0000000..8f66637
--- /dev/null
+++ b/sample_app/build.gradle
@@ -0,0 +1,35 @@
+apply plugin: 'com.android.application'
+
+def versionMajor = 0
+def versionMinor = 0
+def versionPatch = 3
+def androidVersionCode = 3
+
+def targetSdk = rootProject.targetSdkVersion;
+def minSdkRed = rootProject.minSdkVersion;
+
+android {
+ compileSdkVersion rootProject.compileSdkVersion
+ buildToolsVersion rootProject.buildToolsVersion
+
+ defaultConfig {
+ minSdkVersion minSdkRed
+ targetSdkVersion targetSdk
+ versionCode androidVersionCode
+ versionName "${versionMajor}.${versionMinor}.${versionPatch}"
+ }
+
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ }
+ }
+ productFlavors {
+ }
+}
+
+dependencies {
+ compile fileTree(include: ['*.jar'], dir: 'libs')
+ compile project(':library')
+}
diff --git a/sample_app/proguard-project.txt b/sample_app/proguard-rules.pro
similarity index 62%
rename from sample_app/proguard-project.txt
rename to sample_app/proguard-rules.pro
index f2fe155..f8c620f 100644
--- a/sample_app/proguard-project.txt
+++ b/sample_app/proguard-rules.pro
@@ -1,11 +1,8 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
# Add project specific ProGuard rules here.
# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
+# in /home/alex/Dev/android-sdk-linux/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
diff --git a/sample_app/sample_app.iml b/sample_app/sample_app.iml
new file mode 100644
index 0000000..9610873
--- /dev/null
+++ b/sample_app/sample_app.iml
@@ -0,0 +1,96 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/sample_app/AndroidManifest.xml b/sample_app/src/main/AndroidManifest.xml
similarity index 100%
rename from sample_app/AndroidManifest.xml
rename to sample_app/src/main/AndroidManifest.xml
diff --git a/sample_app/src/uk/co/alt236/btlescan/activities/DeviceControlActivity.java b/sample_app/src/main/java/uk/co/alt236/btlescan/activities/DeviceControlActivity.java
similarity index 100%
rename from sample_app/src/uk/co/alt236/btlescan/activities/DeviceControlActivity.java
rename to sample_app/src/main/java/uk/co/alt236/btlescan/activities/DeviceControlActivity.java
diff --git a/sample_app/src/uk/co/alt236/btlescan/activities/DeviceDetailsActivity.java b/sample_app/src/main/java/uk/co/alt236/btlescan/activities/DeviceDetailsActivity.java
similarity index 100%
rename from sample_app/src/uk/co/alt236/btlescan/activities/DeviceDetailsActivity.java
rename to sample_app/src/main/java/uk/co/alt236/btlescan/activities/DeviceDetailsActivity.java
diff --git a/sample_app/src/uk/co/alt236/btlescan/activities/MainActivity.java b/sample_app/src/main/java/uk/co/alt236/btlescan/activities/MainActivity.java
similarity index 100%
rename from sample_app/src/uk/co/alt236/btlescan/activities/MainActivity.java
rename to sample_app/src/main/java/uk/co/alt236/btlescan/activities/MainActivity.java
diff --git a/sample_app/src/uk/co/alt236/btlescan/adapters/LeDeviceListAdapter.java b/sample_app/src/main/java/uk/co/alt236/btlescan/adapters/LeDeviceListAdapter.java
similarity index 100%
rename from sample_app/src/uk/co/alt236/btlescan/adapters/LeDeviceListAdapter.java
rename to sample_app/src/main/java/uk/co/alt236/btlescan/adapters/LeDeviceListAdapter.java
diff --git a/sample_app/src/uk/co/alt236/btlescan/containers/BluetoothLeDeviceStore.java b/sample_app/src/main/java/uk/co/alt236/btlescan/containers/BluetoothLeDeviceStore.java
similarity index 100%
rename from sample_app/src/uk/co/alt236/btlescan/containers/BluetoothLeDeviceStore.java
rename to sample_app/src/main/java/uk/co/alt236/btlescan/containers/BluetoothLeDeviceStore.java
diff --git a/sample_app/src/uk/co/alt236/btlescan/services/BluetoothLeService.java b/sample_app/src/main/java/uk/co/alt236/btlescan/services/BluetoothLeService.java
similarity index 100%
rename from sample_app/src/uk/co/alt236/btlescan/services/BluetoothLeService.java
rename to sample_app/src/main/java/uk/co/alt236/btlescan/services/BluetoothLeService.java
diff --git a/sample_app/src/uk/co/alt236/btlescan/util/BluetoothLeScanner.java b/sample_app/src/main/java/uk/co/alt236/btlescan/util/BluetoothLeScanner.java
similarity index 100%
rename from sample_app/src/uk/co/alt236/btlescan/util/BluetoothLeScanner.java
rename to sample_app/src/main/java/uk/co/alt236/btlescan/util/BluetoothLeScanner.java
diff --git a/sample_app/src/uk/co/alt236/btlescan/util/BluetoothUtils.java b/sample_app/src/main/java/uk/co/alt236/btlescan/util/BluetoothUtils.java
similarity index 100%
rename from sample_app/src/uk/co/alt236/btlescan/util/BluetoothUtils.java
rename to sample_app/src/main/java/uk/co/alt236/btlescan/util/BluetoothUtils.java
diff --git a/sample_app/src/uk/co/alt236/btlescan/util/Constants.java b/sample_app/src/main/java/uk/co/alt236/btlescan/util/Constants.java
similarity index 100%
rename from sample_app/src/uk/co/alt236/btlescan/util/Constants.java
rename to sample_app/src/main/java/uk/co/alt236/btlescan/util/Constants.java
diff --git a/sample_app/src/uk/co/alt236/btlescan/util/CsvWriterHelper.java b/sample_app/src/main/java/uk/co/alt236/btlescan/util/CsvWriterHelper.java
similarity index 100%
rename from sample_app/src/uk/co/alt236/btlescan/util/CsvWriterHelper.java
rename to sample_app/src/main/java/uk/co/alt236/btlescan/util/CsvWriterHelper.java
diff --git a/sample_app/src/uk/co/alt236/btlescan/util/TimeFormatter.java b/sample_app/src/main/java/uk/co/alt236/btlescan/util/TimeFormatter.java
similarity index 100%
rename from sample_app/src/uk/co/alt236/btlescan/util/TimeFormatter.java
rename to sample_app/src/main/java/uk/co/alt236/btlescan/util/TimeFormatter.java
diff --git a/sample_app/src/uk/co/alt236/btlescan/util/UtcDateFormatter.java b/sample_app/src/main/java/uk/co/alt236/btlescan/util/UtcDateFormatter.java
similarity index 100%
rename from sample_app/src/uk/co/alt236/btlescan/util/UtcDateFormatter.java
rename to sample_app/src/main/java/uk/co/alt236/btlescan/util/UtcDateFormatter.java
diff --git a/sample_app/res/drawable-hdpi/ic_action_share.png b/sample_app/src/main/res/drawable-hdpi/ic_action_share.png
similarity index 100%
rename from sample_app/res/drawable-hdpi/ic_action_share.png
rename to sample_app/src/main/res/drawable-hdpi/ic_action_share.png
diff --git a/sample_app/res/drawable-hdpi/ic_launcher.png b/sample_app/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from sample_app/res/drawable-hdpi/ic_launcher.png
rename to sample_app/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/sample_app/res/drawable-mdpi/ic_action_share.png b/sample_app/src/main/res/drawable-mdpi/ic_action_share.png
similarity index 100%
rename from sample_app/res/drawable-mdpi/ic_action_share.png
rename to sample_app/src/main/res/drawable-mdpi/ic_action_share.png
diff --git a/sample_app/res/drawable-mdpi/ic_launcher.png b/sample_app/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from sample_app/res/drawable-mdpi/ic_launcher.png
rename to sample_app/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/sample_app/res/drawable-xhdpi/ic_action_share.png b/sample_app/src/main/res/drawable-xhdpi/ic_action_share.png
similarity index 100%
rename from sample_app/res/drawable-xhdpi/ic_action_share.png
rename to sample_app/src/main/res/drawable-xhdpi/ic_action_share.png
diff --git a/sample_app/res/drawable-xhdpi/ic_bluetooth.png b/sample_app/src/main/res/drawable-xhdpi/ic_bluetooth.png
similarity index 100%
rename from sample_app/res/drawable-xhdpi/ic_bluetooth.png
rename to sample_app/src/main/res/drawable-xhdpi/ic_bluetooth.png
diff --git a/sample_app/res/drawable-xhdpi/ic_bluetooth_on.png b/sample_app/src/main/res/drawable-xhdpi/ic_bluetooth_on.png
similarity index 100%
rename from sample_app/res/drawable-xhdpi/ic_bluetooth_on.png
rename to sample_app/src/main/res/drawable-xhdpi/ic_bluetooth_on.png
diff --git a/sample_app/res/drawable-xhdpi/ic_device_ibeacon.png b/sample_app/src/main/res/drawable-xhdpi/ic_device_ibeacon.png
similarity index 100%
rename from sample_app/res/drawable-xhdpi/ic_device_ibeacon.png
rename to sample_app/src/main/res/drawable-xhdpi/ic_device_ibeacon.png
diff --git a/sample_app/res/drawable-xhdpi/ic_launcher.png b/sample_app/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from sample_app/res/drawable-xhdpi/ic_launcher.png
rename to sample_app/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/sample_app/res/drawable-xxhdpi/ic_action_share.png b/sample_app/src/main/res/drawable-xxhdpi/ic_action_share.png
similarity index 100%
rename from sample_app/res/drawable-xxhdpi/ic_action_share.png
rename to sample_app/src/main/res/drawable-xxhdpi/ic_action_share.png
diff --git a/sample_app/res/drawable-xxhdpi/ic_launcher.png b/sample_app/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from sample_app/res/drawable-xxhdpi/ic_launcher.png
rename to sample_app/src/main/res/drawable-xxhdpi/ic_launcher.png
diff --git a/sample_app/res/layout/actionbar_progress_indeterminate.xml b/sample_app/src/main/res/layout/actionbar_progress_indeterminate.xml
similarity index 100%
rename from sample_app/res/layout/actionbar_progress_indeterminate.xml
rename to sample_app/src/main/res/layout/actionbar_progress_indeterminate.xml
diff --git a/sample_app/res/layout/activity_details.xml b/sample_app/src/main/res/layout/activity_details.xml
similarity index 100%
rename from sample_app/res/layout/activity_details.xml
rename to sample_app/src/main/res/layout/activity_details.xml
diff --git a/sample_app/res/layout/activity_gatt_services.xml b/sample_app/src/main/res/layout/activity_gatt_services.xml
similarity index 100%
rename from sample_app/res/layout/activity_gatt_services.xml
rename to sample_app/src/main/res/layout/activity_gatt_services.xml
diff --git a/sample_app/res/layout/activity_main.xml b/sample_app/src/main/res/layout/activity_main.xml
similarity index 100%
rename from sample_app/res/layout/activity_main.xml
rename to sample_app/src/main/res/layout/activity_main.xml
diff --git a/sample_app/res/layout/list_item_device.xml b/sample_app/src/main/res/layout/list_item_device.xml
similarity index 100%
rename from sample_app/res/layout/list_item_device.xml
rename to sample_app/src/main/res/layout/list_item_device.xml
diff --git a/sample_app/res/layout/list_item_view_adrecord.xml b/sample_app/src/main/res/layout/list_item_view_adrecord.xml
similarity index 100%
rename from sample_app/res/layout/list_item_view_adrecord.xml
rename to sample_app/src/main/res/layout/list_item_view_adrecord.xml
diff --git a/sample_app/res/layout/list_item_view_device_info.xml b/sample_app/src/main/res/layout/list_item_view_device_info.xml
similarity index 100%
rename from sample_app/res/layout/list_item_view_device_info.xml
rename to sample_app/src/main/res/layout/list_item_view_device_info.xml
diff --git a/sample_app/res/layout/list_item_view_header.xml b/sample_app/src/main/res/layout/list_item_view_header.xml
similarity index 100%
rename from sample_app/res/layout/list_item_view_header.xml
rename to sample_app/src/main/res/layout/list_item_view_header.xml
diff --git a/sample_app/res/layout/list_item_view_ibeacon_details.xml b/sample_app/src/main/res/layout/list_item_view_ibeacon_details.xml
similarity index 100%
rename from sample_app/res/layout/list_item_view_ibeacon_details.xml
rename to sample_app/src/main/res/layout/list_item_view_ibeacon_details.xml
diff --git a/sample_app/res/layout/list_item_view_rssi_info.xml b/sample_app/src/main/res/layout/list_item_view_rssi_info.xml
similarity index 100%
rename from sample_app/res/layout/list_item_view_rssi_info.xml
rename to sample_app/src/main/res/layout/list_item_view_rssi_info.xml
diff --git a/sample_app/res/layout/list_item_view_textview.xml b/sample_app/src/main/res/layout/list_item_view_textview.xml
similarity index 100%
rename from sample_app/res/layout/list_item_view_textview.xml
rename to sample_app/src/main/res/layout/list_item_view_textview.xml
diff --git a/sample_app/res/menu/details.xml b/sample_app/src/main/res/menu/details.xml
similarity index 100%
rename from sample_app/res/menu/details.xml
rename to sample_app/src/main/res/menu/details.xml
diff --git a/sample_app/res/menu/gatt_services.xml b/sample_app/src/main/res/menu/gatt_services.xml
similarity index 100%
rename from sample_app/res/menu/gatt_services.xml
rename to sample_app/src/main/res/menu/gatt_services.xml
diff --git a/sample_app/res/menu/main.xml b/sample_app/src/main/res/menu/main.xml
similarity index 100%
rename from sample_app/res/menu/main.xml
rename to sample_app/src/main/res/menu/main.xml
diff --git a/sample_app/res/values-sw600dp/dimens.xml b/sample_app/src/main/res/values-sw600dp/dimens.xml
similarity index 100%
rename from sample_app/res/values-sw600dp/dimens.xml
rename to sample_app/src/main/res/values-sw600dp/dimens.xml
diff --git a/sample_app/res/values-sw720dp-land/dimens.xml b/sample_app/src/main/res/values-sw720dp-land/dimens.xml
similarity index 100%
rename from sample_app/res/values-sw720dp-land/dimens.xml
rename to sample_app/src/main/res/values-sw720dp-land/dimens.xml
diff --git a/sample_app/res/values-v11/styles.xml b/sample_app/src/main/res/values-v11/styles.xml
similarity index 100%
rename from sample_app/res/values-v11/styles.xml
rename to sample_app/src/main/res/values-v11/styles.xml
diff --git a/sample_app/res/values-v14/styles.xml b/sample_app/src/main/res/values-v14/styles.xml
similarity index 100%
rename from sample_app/res/values-v14/styles.xml
rename to sample_app/src/main/res/values-v14/styles.xml
diff --git a/sample_app/res/values/colors.xml b/sample_app/src/main/res/values/colors.xml
similarity index 100%
rename from sample_app/res/values/colors.xml
rename to sample_app/src/main/res/values/colors.xml
diff --git a/sample_app/res/values/dimens.xml b/sample_app/src/main/res/values/dimens.xml
similarity index 100%
rename from sample_app/res/values/dimens.xml
rename to sample_app/src/main/res/values/dimens.xml
diff --git a/sample_app/res/values/strings.xml b/sample_app/src/main/res/values/strings.xml
similarity index 100%
rename from sample_app/res/values/strings.xml
rename to sample_app/src/main/res/values/strings.xml
diff --git a/sample_app/res/values/styles.xml b/sample_app/src/main/res/values/styles.xml
similarity index 100%
rename from sample_app/res/values/styles.xml
rename to sample_app/src/main/res/values/styles.xml
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..ca218b5
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,2 @@
+include ':library'
+include ':sample_app'