Merge pull request #14 from NathanRussakAtBrickSimple/master

Animation Fix
faizmalkani · Aug 30, 2014 · d48d8f3 · d48d8f3
2 parents 034553d + 43f23b8
commit d48d8f3
Show file tree

Hide file tree

Showing 74 changed files with 47 additions and 620 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,3 +28,4 @@ gen/
 # Gradle
 build/
 .gradle
+/build
diff --git a/FloatingActionButton-Sample/FloatingActionButton-Sample.iml b/FloatingActionButton-Sample/FloatingActionButton-Sample.iml
diff --git a/FloatingActionButton-Sample/bin/AndroidManifest.xml b/FloatingActionButton-Sample/bin/AndroidManifest.xml
diff --git a/FloatingActionButton-Sample/bin/FloatingActionButton-Sample.apk b/FloatingActionButton-Sample/bin/FloatingActionButton-Sample.apk
diff --git a/FloatingActionButton-Sample/bin/classes.dex b/FloatingActionButton-Sample/bin/classes.dex
diff --git a/...ingActionButton-Sample/bin/classes/com/faizmalkani/floatingactionbutton/BuildConfig.class b/...ingActionButton-Sample/bin/classes/com/faizmalkani/floatingactionbutton/BuildConfig.class
diff --git a/FloatingActionButton-Sample/bin/classes/com/faizmalkani/floatingactionbutton/R$attr.class b/FloatingActionButton-Sample/bin/classes/com/faizmalkani/floatingactionbutton/R$attr.class
diff --git a/FloatingActionButton-Sample/bin/classes/com/faizmalkani/floatingactionbutton/R$dimen.class b/FloatingActionButton-Sample/bin/classes/com/faizmalkani/floatingactionbutton/R$dimen.class
diff --git a/...tingActionButton-Sample/bin/classes/com/faizmalkani/floatingactionbutton/R$drawable.class b/...tingActionButton-Sample/bin/classes/com/faizmalkani/floatingactionbutton/R$drawable.class
diff --git a/FloatingActionButton-Sample/bin/classes/com/faizmalkani/floatingactionbutton/R$id.class b/FloatingActionButton-Sample/bin/classes/com/faizmalkani/floatingactionbutton/R$id.class
diff --git a/FloatingActionButton-Sample/bin/classes/com/faizmalkani/floatingactionbutton/R$layout.class b/FloatingActionButton-Sample/bin/classes/com/faizmalkani/floatingactionbutton/R$layout.class
diff --git a/FloatingActionButton-Sample/bin/classes/com/faizmalkani/floatingactionbutton/R$menu.class b/FloatingActionButton-Sample/bin/classes/com/faizmalkani/floatingactionbutton/R$menu.class
diff --git a/FloatingActionButton-Sample/bin/classes/com/faizmalkani/floatingactionbutton/R$string.class b/FloatingActionButton-Sample/bin/classes/com/faizmalkani/floatingactionbutton/R$string.class
diff --git a/FloatingActionButton-Sample/bin/classes/com/faizmalkani/floatingactionbutton/R$style.class b/FloatingActionButton-Sample/bin/classes/com/faizmalkani/floatingactionbutton/R$style.class
diff --git a/FloatingActionButton-Sample/bin/classes/com/faizmalkani/floatingactionbutton/R.class b/FloatingActionButton-Sample/bin/classes/com/faizmalkani/floatingactionbutton/R.class
diff --git a/...ngActionButton-Sample/bin/classes/com/faizmalkani/floatingactionbutton/sample/About.class b/...ngActionButton-Sample/bin/classes/com/faizmalkani/floatingactionbutton/sample/About.class
diff --git a/...tingActionButton-Sample/bin/classes/com/faizmalkani/floatingactionbutton/sample/Fab.class b/...tingActionButton-Sample/bin/classes/com/faizmalkani/floatingactionbutton/sample/Fab.class
diff --git a/...nButton-Sample/bin/classes/com/faizmalkani/floatingactionbutton/sample/MainActivity.class b/...nButton-Sample/bin/classes/com/faizmalkani/floatingactionbutton/sample/MainActivity.class
diff --git a/...ActionButton-Sample/bin/dexedLibs/android-support-v4-396db17685afe747dc46bcda681a0fdd.jar b/...ActionButton-Sample/bin/dexedLibs/android-support-v4-396db17685afe747dc46bcda681a0fdd.jar
diff --git a/...tionButton-Sample/bin/dexedLibs/floatingactionbutton-4e22c75e0b26ec4138becaf404e3df8c.jar b/...tionButton-Sample/bin/dexedLibs/floatingactionbutton-4e22c75e0b26ec4138becaf404e3df8c.jar
diff --git a/FloatingActionButton-Sample/bin/jarlist.cache b/FloatingActionButton-Sample/bin/jarlist.cache
diff --git a/FloatingActionButton-Sample/bin/res/crunch/drawable-hdpi/ic_av_play.png b/FloatingActionButton-Sample/bin/res/crunch/drawable-hdpi/ic_av_play.png
diff --git a/FloatingActionButton-Sample/bin/res/crunch/drawable-hdpi/ic_content_discard.png b/FloatingActionButton-Sample/bin/res/crunch/drawable-hdpi/ic_content_discard.png
diff --git a/FloatingActionButton-Sample/bin/res/crunch/drawable-hdpi/ic_content_edit.png b/FloatingActionButton-Sample/bin/res/crunch/drawable-hdpi/ic_content_edit.png
diff --git a/FloatingActionButton-Sample/bin/res/crunch/drawable-hdpi/ic_content_new.png b/FloatingActionButton-Sample/bin/res/crunch/drawable-hdpi/ic_content_new.png
diff --git a/FloatingActionButton-Sample/bin/res/crunch/drawable-hdpi/ic_launcher.png b/FloatingActionButton-Sample/bin/res/crunch/drawable-hdpi/ic_launcher.png
diff --git a/FloatingActionButton-Sample/bin/res/crunch/drawable-hdpi/ic_navigation_accept.png b/FloatingActionButton-Sample/bin/res/crunch/drawable-hdpi/ic_navigation_accept.png
diff --git a/FloatingActionButton-Sample/bin/res/crunch/drawable-hdpi/ic_social_add_person.png b/FloatingActionButton-Sample/bin/res/crunch/drawable-hdpi/ic_social_add_person.png
diff --git a/FloatingActionButton-Sample/bin/res/crunch/drawable-mdpi/ic_av_play.png b/FloatingActionButton-Sample/bin/res/crunch/drawable-mdpi/ic_av_play.png
diff --git a/FloatingActionButton-Sample/bin/res/crunch/drawable-mdpi/ic_content_discard.png b/FloatingActionButton-Sample/bin/res/crunch/drawable-mdpi/ic_content_discard.png
diff --git a/FloatingActionButton-Sample/bin/res/crunch/drawable-mdpi/ic_content_edit.png b/FloatingActionButton-Sample/bin/res/crunch/drawable-mdpi/ic_content_edit.png
diff --git a/FloatingActionButton-Sample/bin/res/crunch/drawable-mdpi/ic_content_new.png b/FloatingActionButton-Sample/bin/res/crunch/drawable-mdpi/ic_content_new.png
diff --git a/FloatingActionButton-Sample/bin/res/crunch/drawable-mdpi/ic_launcher.png b/FloatingActionButton-Sample/bin/res/crunch/drawable-mdpi/ic_launcher.png
diff --git a/FloatingActionButton-Sample/bin/res/crunch/drawable-mdpi/ic_navigation_accept.png b/FloatingActionButton-Sample/bin/res/crunch/drawable-mdpi/ic_navigation_accept.png
diff --git a/FloatingActionButton-Sample/bin/res/crunch/drawable-mdpi/ic_social_add_person.png b/FloatingActionButton-Sample/bin/res/crunch/drawable-mdpi/ic_social_add_person.png
diff --git a/FloatingActionButton-Sample/bin/res/crunch/drawable-xhdpi/ic_av_play.png b/FloatingActionButton-Sample/bin/res/crunch/drawable-xhdpi/ic_av_play.png
diff --git a/FloatingActionButton-Sample/bin/res/crunch/drawable-xhdpi/ic_content_discard.png b/FloatingActionButton-Sample/bin/res/crunch/drawable-xhdpi/ic_content_discard.png
diff --git a/FloatingActionButton-Sample/bin/res/crunch/drawable-xhdpi/ic_content_edit.png b/FloatingActionButton-Sample/bin/res/crunch/drawable-xhdpi/ic_content_edit.png
diff --git a/FloatingActionButton-Sample/bin/res/crunch/drawable-xhdpi/ic_content_new.png b/FloatingActionButton-Sample/bin/res/crunch/drawable-xhdpi/ic_content_new.png
diff --git a/FloatingActionButton-Sample/bin/res/crunch/drawable-xhdpi/ic_launcher.png b/FloatingActionButton-Sample/bin/res/crunch/drawable-xhdpi/ic_launcher.png
diff --git a/FloatingActionButton-Sample/bin/res/crunch/drawable-xhdpi/ic_navigation_accept.png b/FloatingActionButton-Sample/bin/res/crunch/drawable-xhdpi/ic_navigation_accept.png
diff --git a/FloatingActionButton-Sample/bin/res/crunch/drawable-xhdpi/ic_social_add_person.png b/FloatingActionButton-Sample/bin/res/crunch/drawable-xhdpi/ic_social_add_person.png
diff --git a/FloatingActionButton-Sample/bin/res/crunch/drawable-xxhdpi/ic_av_play.png b/FloatingActionButton-Sample/bin/res/crunch/drawable-xxhdpi/ic_av_play.png
diff --git a/FloatingActionButton-Sample/bin/res/crunch/drawable-xxhdpi/ic_content_discard.png b/FloatingActionButton-Sample/bin/res/crunch/drawable-xxhdpi/ic_content_discard.png
diff --git a/FloatingActionButton-Sample/bin/res/crunch/drawable-xxhdpi/ic_content_edit.png b/FloatingActionButton-Sample/bin/res/crunch/drawable-xxhdpi/ic_content_edit.png
diff --git a/FloatingActionButton-Sample/bin/res/crunch/drawable-xxhdpi/ic_content_new.png b/FloatingActionButton-Sample/bin/res/crunch/drawable-xxhdpi/ic_content_new.png
diff --git a/FloatingActionButton-Sample/bin/res/crunch/drawable-xxhdpi/ic_launcher.png b/FloatingActionButton-Sample/bin/res/crunch/drawable-xxhdpi/ic_launcher.png
diff --git a/...tingActionButton-Sample/bin/res/crunch/drawable-xxhdpi/ic_navigation_accept.png b/...tingActionButton-Sample/bin/res/crunch/drawable-xxhdpi/ic_navigation_accept.png
diff --git a/...tingActionButton-Sample/bin/res/crunch/drawable-xxhdpi/ic_social_add_person.png b/...tingActionButton-Sample/bin/res/crunch/drawable-xxhdpi/ic_social_add_person.png
diff --git a/FloatingActionButton-Sample/bin/res/crunch/drawable-xxxhdpi/ic_launcher.png b/FloatingActionButton-Sample/bin/res/crunch/drawable-xxxhdpi/ic_launcher.png
diff --git a/FloatingActionButton-Sample/bin/res/crunch/drawable/new_accessibility.png b/FloatingActionButton-Sample/bin/res/crunch/drawable/new_accessibility.png
diff --git a/FloatingActionButton-Sample/bin/res/crunch/drawable/shadow2.9.png b/FloatingActionButton-Sample/bin/res/crunch/drawable/shadow2.9.png
diff --git a/FloatingActionButton-Sample/bin/resources.ap_ b/FloatingActionButton-Sample/bin/resources.ap_
diff --git a/FloatingActionButton-Sample/gen/com/faizmalkani/floatingactionbutton/BuildConfig.java b/FloatingActionButton-Sample/gen/com/faizmalkani/floatingactionbutton/BuildConfig.java
diff --git a/FloatingActionButton-Sample/gen/com/faizmalkani/floatingactionbutton/R.java b/FloatingActionButton-Sample/gen/com/faizmalkani/floatingactionbutton/R.java
diff --git a/FloatingActionButton.iml b/FloatingActionButton.iml
diff --git a/FloatingActionButton/FloatingActionButton-FloatingActionButton.iml b/FloatingActionButton/FloatingActionButton-FloatingActionButton.iml
diff --git a/FloatingActionButton/bin/AndroidManifest.xml b/FloatingActionButton/bin/AndroidManifest.xml
diff --git a/FloatingActionButton/bin/R.txt b/FloatingActionButton/bin/R.txt
diff --git a/FloatingActionButton/bin/classes/com/faizmalkani/floatingactionbutton/BuildConfig.class b/FloatingActionButton/bin/classes/com/faizmalkani/floatingactionbutton/BuildConfig.class
diff --git a/FloatingActionButton/bin/classes/com/faizmalkani/floatingactionbutton/Fab.class b/FloatingActionButton/bin/classes/com/faizmalkani/floatingactionbutton/Fab.class
diff --git a/FloatingActionButton/bin/classes/com/faizmalkani/floatingactionbutton/R$attr.class b/FloatingActionButton/bin/classes/com/faizmalkani/floatingactionbutton/R$attr.class
diff --git a/FloatingActionButton/bin/classes/com/faizmalkani/floatingactionbutton/R$drawable.class b/FloatingActionButton/bin/classes/com/faizmalkani/floatingactionbutton/R$drawable.class
diff --git a/FloatingActionButton/bin/classes/com/faizmalkani/floatingactionbutton/R.class b/FloatingActionButton/bin/classes/com/faizmalkani/floatingactionbutton/R.class
diff --git a/FloatingActionButton/bin/floatingactionbutton.jar b/FloatingActionButton/bin/floatingactionbutton.jar
diff --git a/FloatingActionButton/build.gradle b/FloatingActionButton/build.gradle
@@ -1,14 +1,14 @@
 apply plugin: 'com.android.library'
 android {
-    compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
-    buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION
+    compileSdkVersion 19
+    buildToolsVersion "20.0.0"
 
     defaultConfig {
         applicationId 'com.faizmalkani.floatingactionbutton'
-        minSdkVersion Integer.parseInt(project.ANDROID_BUILD_MIN_SDK_VERSION)
-        targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION)
-        versionName project.VERSION_NAME
-        versionCode Integer.parseInt(project.VERSION_CODE)
+	minSdkVersion 14
+        targetSdkVersion 19
+        versionName "1.0"
+        versionCode 1
     }
 
     sourceSets {

diff --git a/FloatingActionButton/gen/com/faizmalkani/floatingactionbutton/BuildConfig.java b/FloatingActionButton/gen/com/faizmalkani/floatingactionbutton/BuildConfig.java
diff --git a/FloatingActionButton/gen/com/faizmalkani/floatingactionbutton/R.java b/FloatingActionButton/gen/com/faizmalkani/floatingactionbutton/R.java
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,3 +28,4 @@ gen/ @@
     # Gradle
     build/
     .gradle
+    /build