Revert "fix(map): make filter panel compact and scrollable"

This reverts commit dc63fffb67.

app/src/main/java/com/wytehat/btlogger/MapActivity.java

@@ -22,7 +22,6 @@ import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.LinearLayout;
-import android.widget.ScrollView;
 import android.widget.Spinner;
 import android.widget.TextView;
 
@@ -49,8 +48,6 @@ implements SensorEventListener {
 
 	private LinearLayout filterPanel;  
 
-	private ScrollView filterScroll;
-
 	private Spinner categorySpinner;  
 	private Spinner deviceSpinner;  
 
@@ -210,6 +207,7 @@ implements SensorEventListener {
 			dp(4)  
 		);  
 
+		filterPanel.setVisibility(View.GONE);  
 
 		/*  
 		 * Category.  
@@ -389,30 +387,13 @@ implements SensorEventListener {
 
 		filterPanel.addView(showAll);  
 
-		/*
+		root.addView(  
-		 * Bounded to a third of the screen and scrollable, so every
+			filterPanel,  
-		 * control stays reachable on short screens.
+			new LinearLayout.LayoutParams(  
-		 */
+				LinearLayout.LayoutParams.MATCH_PARENT,  
-		filterScroll = new ScrollView(this);
+				LinearLayout.LayoutParams.WRAP_CONTENT  
-
+			)  
-		filterScroll.setVisibility(View.GONE);
+		);  
-
-		filterScroll.addView(
-			filterPanel,
-			new android.widget.FrameLayout.LayoutParams(
-				android.widget.FrameLayout.LayoutParams.MATCH_PARENT,
-				android.widget.FrameLayout.LayoutParams.WRAP_CONTENT
-			)
-		);
-
-		root.addView(
-			filterScroll,
-			new LinearLayout.LayoutParams(
-				LinearLayout.LayoutParams.MATCH_PARENT,
-				0,
-				1
-			)
-		);
 
 		/*  
 		 * WebView map.  
@@ -455,13 +436,13 @@ implements SensorEventListener {
 			}  
 		);  
 
-		root.addView(
+		root.addView(  
-			web,
+			web,  
-			new LinearLayout.LayoutParams(
+			new LinearLayout.LayoutParams(  
-				LinearLayout.LayoutParams.MATCH_PARENT,
+				LinearLayout.LayoutParams.MATCH_PARENT,  
-				0,
+				0,  
-				2
+				1  
-			)
+			)  
 		);  
 
 		setContentView(root);  
@@ -495,12 +476,19 @@ implements SensorEventListener {
 				@Override  
 				public void onClick(View view) {  
 
-					filterScroll.setVisibility(
+					if (filterPanel.getVisibility()  
-						filterScroll.getVisibility()
+						== View.VISIBLE) {  
-						== View.VISIBLE
+
-							? View.GONE
+						filterPanel.setVisibility(  
-							: View.VISIBLE
+							View.GONE  
-					);  
+						);  
+
+					} else {  
+
+						filterPanel.setVisibility(  
+							View.VISIBLE  
+						);  
+					}  
 				}  
 			}  
 		);  
@@ -658,8 +646,8 @@ implements SensorEventListener {
 					/*  
 					 * Collapse after applying.  
 					 */  
-					filterScroll.setVisibility(
+					filterPanel.setVisibility(  
-						View.GONE
+						View.GONE  
 					);  
 				}  
 			}  
@@ -708,10 +696,10 @@ implements SensorEventListener {
 
 	private LinearLayout.LayoutParams compactParams() {  
 
-		return new LinearLayout.LayoutParams(
+		return new LinearLayout.LayoutParams(  
-			LinearLayout.LayoutParams.MATCH_PARENT,
+			LinearLayout.LayoutParams.MATCH_PARENT,  
-			dp(38)
+			dp(42)  
-			);  
+		);  
 	}  
 
 	private TextView smallLabel(String text) {