Back button usage cleanup

core/assets/version.properties

@@ -1,7 +1,7 @@
 #Autogenerated file. Do not modify.
-#Thu Apr 05 22:28:48 EDT 2018
+#Fri Apr 06 17:05:53 EDT 2018
 version=release
-androidBuildCode=502
+androidBuildCode=503
 name=Mindustry
 code=3.5
 build=custom build

core/src/io/anuke/mindustry/ui/dialogs/ColorPickDialog.java

@@ -1,5 +1,6 @@
 package io.anuke.mindustry.ui.dialogs;
 
+import com.badlogic.gdx.Input.Keys;
 import com.badlogic.gdx.graphics.Color;
 import io.anuke.ucore.function.Consumer;
 import io.anuke.ucore.scene.ui.Dialog;
@@ -35,6 +36,12 @@ public class ColorPickDialog extends Dialog{
                 table.row();
             }
         }
+
+        keyDown(key->{
+            if(key == Keys.ESCAPE || key == Keys.BACK)
+                hide();
+        });
+
     }
 
     public void show(Consumer<Color> cons){

core/src/io/anuke/mindustry/ui/dialogs/FloatingDialog.java

@@ -3,8 +3,6 @@ package io.anuke.mindustry.ui.dialogs;
 import com.badlogic.gdx.Input.Keys;
 import com.badlogic.gdx.graphics.Colors;
 import com.badlogic.gdx.utils.Align;
-
-import io.anuke.ucore.core.Inputs;
 import io.anuke.ucore.scene.ui.Dialog;
 
 public class FloatingDialog extends Dialog{
@@ -26,11 +24,5 @@ public class FloatingDialog extends Dialog{
 			if(key == Keys.ESCAPE || key == Keys.BACK)
 				hide();
 		});
-
-		update(() -> {
-			if(Inputs.keyTap("menu")){
-				hide();
-			}
-		});
 	}
 }