Merge branch 'hotfix'

Unknownhacker12337 · Dec 25, 2015 · 8a29337 · 8a29337
2 parents 5963418 + 539f982
commit 8a29337
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 17 deletions.
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.4.0-beta6'
+        classpath 'com.android.tools.build:gradle:1.5.0'
     }
 }
 

diff --git a/cSploit/build.gradle b/cSploit/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.4.0-beta6'
+        classpath 'com.android.tools.build:gradle:1.5.0'
     }
 }
 
@@ -52,8 +52,8 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 22
-        versionCode 4
-        versionName "1.6.2"
+        versionCode 5
+        versionName "1.6.3"
         if(System.getenv("NIGHTLY_BUILD")) {
             versionName += "+" + System.getenv("NIGHTLY_BUILD_COMMIT").substring(0, 7)
         }

diff --git a/cSploit/res/layout/plugin_inspector.xml b/cSploit/res/layout/plugin_inspector.xml
@@ -6,19 +6,6 @@
     android:paddingTop="16sp"
     android:id="@+id/whatever">
 
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/inspectToggleButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="20dp"
-        android:src="@drawable/ic_play_arrow_24dp"
-        android:checked="false"
-        android:translationZ="8dp"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:layout_margin="20dp"
-        android:focusableInTouchMode="true" />
-
     <ProgressBar
         android:id="@+id/inspectActivity"
         android:layout_width="wrap_content"
@@ -156,4 +143,21 @@
         android:gravity="center_vertical"
         />
     </ScrollView>
+
+    <!--
+    Later children in a RelativeLayout tend to float over earlier children in a RelativeLayout.
+    https://www.stackoverflow.com/a/28651543
+    -->
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/inspectToggleButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="20dp"
+        android:src="@drawable/ic_play_arrow_24dp"
+        android:checked="false"
+        android:translationZ="8dp"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        android:layout_margin="20dp"
+        android:focusableInTouchMode="true" />
 </RelativeLayout>