- Die große Neuheit in dieser Applikation ist die Fusion von zwei + Die große Neuheit in dieser Applikation ist die Fusion von zwei virtuellen Sensoren: Improved Orientation Sensor 1 und Improved Orientation Sensor 2 nutzen den Android Rotation Vector mit dem - kalibrierten Gyroskopsensor und erreichen eine nie zuvor dagewesenen Präzision - und Reaktionsfähigkeit. + kalibrierten Gyroskopsensor und erreichen eine nie zuvor dagewesenen Präzision + und Reaktionsfähigkeit.
Neben diesen beiden Sensorfusionen gibt es noch weitere Sensoren @@ -23,12 +23,12 @@
Lange auf den Würfel gedrückt halten, um kurzfristig in den Raummodus zu wechseln.
+Lange auf den Würfel gedrückt halten, um kurzfristig in den Raummodus zu wechseln.
- Der Quellcode ist öffentlich verfügbar auf Bitbucket unter der MIT Lizenz.
diff --git a/assets/about/en/index.html b/app/src/main/assets/about/en/index.html similarity index 100% rename from assets/about/en/index.html rename to app/src/main/assets/about/en/index.html diff --git a/src/org/hitlabnz/sensor_fusion_demo/AboutActivity.java b/app/src/main/java/org/hitlabnz/sensor_fusion_demo/AboutActivity.java similarity index 100% rename from src/org/hitlabnz/sensor_fusion_demo/AboutActivity.java rename to app/src/main/java/org/hitlabnz/sensor_fusion_demo/AboutActivity.java diff --git a/src/org/hitlabnz/sensor_fusion_demo/Cube.java b/app/src/main/java/org/hitlabnz/sensor_fusion_demo/Cube.java similarity index 100% rename from src/org/hitlabnz/sensor_fusion_demo/Cube.java rename to app/src/main/java/org/hitlabnz/sensor_fusion_demo/Cube.java diff --git a/src/org/hitlabnz/sensor_fusion_demo/CubeRenderer.java b/app/src/main/java/org/hitlabnz/sensor_fusion_demo/CubeRenderer.java similarity index 100% rename from src/org/hitlabnz/sensor_fusion_demo/CubeRenderer.java rename to app/src/main/java/org/hitlabnz/sensor_fusion_demo/CubeRenderer.java diff --git a/src/org/hitlabnz/sensor_fusion_demo/HardwareChecker.java b/app/src/main/java/org/hitlabnz/sensor_fusion_demo/HardwareChecker.java similarity index 100% rename from src/org/hitlabnz/sensor_fusion_demo/HardwareChecker.java rename to app/src/main/java/org/hitlabnz/sensor_fusion_demo/HardwareChecker.java diff --git a/src/org/hitlabnz/sensor_fusion_demo/OrientationVisualisationFragment.java b/app/src/main/java/org/hitlabnz/sensor_fusion_demo/OrientationVisualisationFragment.java similarity index 100% rename from src/org/hitlabnz/sensor_fusion_demo/OrientationVisualisationFragment.java rename to app/src/main/java/org/hitlabnz/sensor_fusion_demo/OrientationVisualisationFragment.java diff --git a/src/org/hitlabnz/sensor_fusion_demo/SensorChecker.java b/app/src/main/java/org/hitlabnz/sensor_fusion_demo/SensorChecker.java similarity index 86% rename from src/org/hitlabnz/sensor_fusion_demo/SensorChecker.java rename to app/src/main/java/org/hitlabnz/sensor_fusion_demo/SensorChecker.java index 85a8be0..2859a62 100644 --- a/src/org/hitlabnz/sensor_fusion_demo/SensorChecker.java +++ b/app/src/main/java/org/hitlabnz/sensor_fusion_demo/SensorChecker.java @@ -7,5 +7,5 @@ public interface SensorChecker { * * @return True, if a gyroscope is available. False otherwise. */ - public boolean IsGyroscopeAvailable (); + public boolean IsGyroscopeAvailable(); } diff --git a/src/org/hitlabnz/sensor_fusion_demo/SensorSelectionActivity.java b/app/src/main/java/org/hitlabnz/sensor_fusion_demo/SensorSelectionActivity.java similarity index 100% rename from src/org/hitlabnz/sensor_fusion_demo/SensorSelectionActivity.java rename to app/src/main/java/org/hitlabnz/sensor_fusion_demo/SensorSelectionActivity.java diff --git a/src/org/hitlabnz/sensor_fusion_demo/orientationProvider/AccelerometerCompassProvider.java b/app/src/main/java/org/hitlabnz/sensor_fusion_demo/orientationProvider/AccelerometerCompassProvider.java similarity index 100% rename from src/org/hitlabnz/sensor_fusion_demo/orientationProvider/AccelerometerCompassProvider.java rename to app/src/main/java/org/hitlabnz/sensor_fusion_demo/orientationProvider/AccelerometerCompassProvider.java diff --git a/src/org/hitlabnz/sensor_fusion_demo/orientationProvider/CalibratedGyroscopeProvider.java b/app/src/main/java/org/hitlabnz/sensor_fusion_demo/orientationProvider/CalibratedGyroscopeProvider.java similarity index 100% rename from src/org/hitlabnz/sensor_fusion_demo/orientationProvider/CalibratedGyroscopeProvider.java rename to app/src/main/java/org/hitlabnz/sensor_fusion_demo/orientationProvider/CalibratedGyroscopeProvider.java diff --git a/src/org/hitlabnz/sensor_fusion_demo/orientationProvider/GravityCompassProvider.java b/app/src/main/java/org/hitlabnz/sensor_fusion_demo/orientationProvider/GravityCompassProvider.java similarity index 100% rename from src/org/hitlabnz/sensor_fusion_demo/orientationProvider/GravityCompassProvider.java rename to app/src/main/java/org/hitlabnz/sensor_fusion_demo/orientationProvider/GravityCompassProvider.java diff --git a/src/org/hitlabnz/sensor_fusion_demo/orientationProvider/ImprovedOrientationSensor1Provider.java b/app/src/main/java/org/hitlabnz/sensor_fusion_demo/orientationProvider/ImprovedOrientationSensor1Provider.java similarity index 100% rename from src/org/hitlabnz/sensor_fusion_demo/orientationProvider/ImprovedOrientationSensor1Provider.java rename to app/src/main/java/org/hitlabnz/sensor_fusion_demo/orientationProvider/ImprovedOrientationSensor1Provider.java diff --git a/src/org/hitlabnz/sensor_fusion_demo/orientationProvider/ImprovedOrientationSensor2Provider.java b/app/src/main/java/org/hitlabnz/sensor_fusion_demo/orientationProvider/ImprovedOrientationSensor2Provider.java similarity index 100% rename from src/org/hitlabnz/sensor_fusion_demo/orientationProvider/ImprovedOrientationSensor2Provider.java rename to app/src/main/java/org/hitlabnz/sensor_fusion_demo/orientationProvider/ImprovedOrientationSensor2Provider.java diff --git a/src/org/hitlabnz/sensor_fusion_demo/orientationProvider/OrientationProvider.java b/app/src/main/java/org/hitlabnz/sensor_fusion_demo/orientationProvider/OrientationProvider.java similarity index 100% rename from src/org/hitlabnz/sensor_fusion_demo/orientationProvider/OrientationProvider.java rename to app/src/main/java/org/hitlabnz/sensor_fusion_demo/orientationProvider/OrientationProvider.java diff --git a/src/org/hitlabnz/sensor_fusion_demo/orientationProvider/RotationVectorProvider.java b/app/src/main/java/org/hitlabnz/sensor_fusion_demo/orientationProvider/RotationVectorProvider.java similarity index 100% rename from src/org/hitlabnz/sensor_fusion_demo/orientationProvider/RotationVectorProvider.java rename to app/src/main/java/org/hitlabnz/sensor_fusion_demo/orientationProvider/RotationVectorProvider.java diff --git a/src/org/hitlabnz/sensor_fusion_demo/representation/EulerAngles.java b/app/src/main/java/org/hitlabnz/sensor_fusion_demo/representation/EulerAngles.java similarity index 100% rename from src/org/hitlabnz/sensor_fusion_demo/representation/EulerAngles.java rename to app/src/main/java/org/hitlabnz/sensor_fusion_demo/representation/EulerAngles.java diff --git a/src/org/hitlabnz/sensor_fusion_demo/representation/Matrix.java b/app/src/main/java/org/hitlabnz/sensor_fusion_demo/representation/Matrix.java similarity index 100% rename from src/org/hitlabnz/sensor_fusion_demo/representation/Matrix.java rename to app/src/main/java/org/hitlabnz/sensor_fusion_demo/representation/Matrix.java diff --git a/src/org/hitlabnz/sensor_fusion_demo/representation/Matrixf4x4.java b/app/src/main/java/org/hitlabnz/sensor_fusion_demo/representation/Matrixf4x4.java similarity index 100% rename from src/org/hitlabnz/sensor_fusion_demo/representation/Matrixf4x4.java rename to app/src/main/java/org/hitlabnz/sensor_fusion_demo/representation/Matrixf4x4.java diff --git a/src/org/hitlabnz/sensor_fusion_demo/representation/Quaternion.java b/app/src/main/java/org/hitlabnz/sensor_fusion_demo/representation/Quaternion.java similarity index 100% rename from src/org/hitlabnz/sensor_fusion_demo/representation/Quaternion.java rename to app/src/main/java/org/hitlabnz/sensor_fusion_demo/representation/Quaternion.java diff --git a/src/org/hitlabnz/sensor_fusion_demo/representation/Renderable.java b/app/src/main/java/org/hitlabnz/sensor_fusion_demo/representation/Renderable.java similarity index 100% rename from src/org/hitlabnz/sensor_fusion_demo/representation/Renderable.java rename to app/src/main/java/org/hitlabnz/sensor_fusion_demo/representation/Renderable.java diff --git a/src/org/hitlabnz/sensor_fusion_demo/representation/Vector3f.java b/app/src/main/java/org/hitlabnz/sensor_fusion_demo/representation/Vector3f.java similarity index 100% rename from src/org/hitlabnz/sensor_fusion_demo/representation/Vector3f.java rename to app/src/main/java/org/hitlabnz/sensor_fusion_demo/representation/Vector3f.java diff --git a/src/org/hitlabnz/sensor_fusion_demo/representation/Vector4f.java b/app/src/main/java/org/hitlabnz/sensor_fusion_demo/representation/Vector4f.java similarity index 100% rename from src/org/hitlabnz/sensor_fusion_demo/representation/Vector4f.java rename to app/src/main/java/org/hitlabnz/sensor_fusion_demo/representation/Vector4f.java diff --git a/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from res/drawable-hdpi/ic_launcher.png rename to app/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from res/drawable-mdpi/ic_launcher.png rename to app/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from res/drawable-xhdpi/ic_launcher.png rename to app/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/res/drawable-xxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from res/drawable-xxhdpi/ic_launcher.png rename to app/src/main/res/drawable-xxhdpi/ic_launcher.png diff --git a/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml similarity index 100% rename from res/layout/activity_about.xml rename to app/src/main/res/layout/activity_about.xml diff --git a/res/layout/activity_sensor_selection.xml b/app/src/main/res/layout/activity_sensor_selection.xml similarity index 100% rename from res/layout/activity_sensor_selection.xml rename to app/src/main/res/layout/activity_sensor_selection.xml diff --git a/res/menu/sensor_selection.xml b/app/src/main/res/menu/sensor_selection.xml similarity index 100% rename from res/menu/sensor_selection.xml rename to app/src/main/res/menu/sensor_selection.xml diff --git a/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml similarity index 100% rename from res/values-de/strings.xml rename to app/src/main/res/values-de/strings.xml diff --git a/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml similarity index 100% rename from res/values-sw600dp/dimens.xml rename to app/src/main/res/values-sw600dp/dimens.xml diff --git a/res/values-sw720dp-land/dimens.xml b/app/src/main/res/values-sw720dp-land/dimens.xml similarity index 100% rename from res/values-sw720dp-land/dimens.xml rename to app/src/main/res/values-sw720dp-land/dimens.xml diff --git a/res/values-v11/styles.xml b/app/src/main/res/values-v11/styles.xml similarity index 100% rename from res/values-v11/styles.xml rename to app/src/main/res/values-v11/styles.xml diff --git a/res/values-v14/styles.xml b/app/src/main/res/values-v14/styles.xml similarity index 100% rename from res/values-v14/styles.xml rename to app/src/main/res/values-v14/styles.xml diff --git a/res/values/dimens.xml b/app/src/main/res/values/dimens.xml similarity index 100% rename from res/values/dimens.xml rename to app/src/main/res/values/dimens.xml diff --git a/res/values/strings.xml b/app/src/main/res/values/strings.xml similarity index 100% rename from res/values/strings.xml rename to app/src/main/res/values/strings.xml diff --git a/res/values/styles.xml b/app/src/main/res/values/styles.xml similarity index 100% rename from res/values/styles.xml rename to app/src/main/res/values/styles.xml diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..dacffba --- /dev/null +++ b/build.gradle @@ -0,0 +1,15 @@ +// 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.0.0-beta5' + } +} + +allprojects { + repositories { + jcenter() + } +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..13372ae 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..122a0dc --- /dev/null +++ b/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 diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..9d82f78 --- /dev/null +++ b/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 "$@" 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/libs/android-support-v4.jar b/libs/android-support-v4.jar deleted file mode 100644 index cf12d28..0000000 Binary files a/libs/android-support-v4.jar and /dev/null differ diff --git a/proguard-project.txt b/proguard-project.txt deleted file mode 100644 index f2fe155..0000000 --- a/proguard-project.txt +++ /dev/null @@ -1,20 +0,0 @@ -# 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. -# -# 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 *; -#} diff --git a/project.properties b/project.properties deleted file mode 100644 index 4ab1256..0000000 --- a/project.properties +++ /dev/null @@ -1,14 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=android-19 diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..e7b4def --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +include ':app' diff --git a/suppressions.xml b/suppressions.xml deleted file mode 100644 index 20d240c..0000000 --- a/suppressions.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - -