From 9b9d77bb60ba47c57ef01dbf3f371f79aaeedc0f Mon Sep 17 00:00:00 2001
From: ne0fhyk <fhuyakou@gmail.com>
Date: Tue, 21 Oct 2014 23:26:22 -0700
Subject: [PATCH 1/2] fixed issue #1080

---
 Android/res/layout/fragment_mode_auto.xml     |  52 +-----
 Android/res/layout/fragment_mode_circle.xml   | 167 +-----------------
 Android/res/layout/fragment_mode_loiter.xml   |  43 +----
 Android/res/layout/fragment_mode_rtl.xml      |  54 +-----
 .../res/layout/fragment_mode_stabilize.xml    |  67 +------
 .../fragments/mode/FlightModePanel.java       |  21 +++
 .../fragments/mode/ModeAcroFragment.java      |   3 +-
 .../fragments/mode/ModeAutoFragment.java      |   3 +-
 .../fragments/mode/ModeCircleFragment.java    |   3 +-
 .../fragments/mode/ModeLoiterFragment.java    |   3 +-
 .../fragments/mode/ModeRTLFragment.java       |   3 +-
 .../fragments/mode/ModeStabilizeFragment.java |   3 +-
 12 files changed, 58 insertions(+), 364 deletions(-)

diff --git a/Android/res/layout/fragment_mode_auto.xml b/Android/res/layout/fragment_mode_auto.xml
index 839862c791..2335ab896c 100644
--- a/Android/res/layout/fragment_mode_auto.xml
+++ b/Android/res/layout/fragment_mode_auto.xml
@@ -1,50 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<TextView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:custom="http://schemas.android.com/apk/res/org.droidplanner"
-    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/ModeDetail"
+    style="@style/ModeDetailText"
+    android:background="@drawable/mode_desc_rectangle"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-	tools:ignore="HardcodedText"
-    style="@style/flyoutPanelLayout"
-    >
+    android:layout_height="wrap_content"
+    android:text="@string/mode_auto"/>
 
-	<!--  Description -->
-	<View
-		android:id="@+id/desc_rect"
-		android:layout_width="match_parent"
-		android:layout_height="96dp"
-		android:layout_alignParentTop="true"
-		android:background="@drawable/mode_desc_rectangle"/>
-
-	<TextView
-		android:id="@+id/ModeDetail"
-		style="@style/ModeDetailText"
-		android:layout_alignTop="@id/desc_rect"
-		android:layout_alignLeft="@id/desc_rect"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:text="@string/mode_auto" />
-
-	<!--  Controls -->
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-        android:padding="16dp"
-		android:layout_below="@id/desc_rect"
-		android:orientation="vertical" >
-
-		<!--  Pause button -->
-		<Button
-			android:id="@+id/PauseButton"
-			style="@style/modeControl"
-			android:visibility="gone"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:text="@string/Pause"
-	        android:background="@drawable/button_mode_options"
-			/>
-
-	</LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/Android/res/layout/fragment_mode_circle.xml b/Android/res/layout/fragment_mode_circle.xml
index 1efd09df1b..3705ba04ca 100644
--- a/Android/res/layout/fragment_mode_circle.xml
+++ b/Android/res/layout/fragment_mode_circle.xml
@@ -1,163 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<TextView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/ModeDetail"
+    style="@style/ModeDetailText"
+    android:layout_alignParentTop="true"
+    android:background="@drawable/mode_desc_rectangle"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-	tools:ignore="HardcodedText"
-    style="@style/flyoutPanelLayout"
-    >
-
-	<!--  Description -->
-	<View
-		android:id="@+id/desc_rect"
-		android:layout_width="match_parent"
-		android:layout_height="96dp"
-		android:layout_alignParentTop="true"
-		android:background="@drawable/mode_desc_rectangle"/>
-
-	<TextView
-		android:id="@+id/ModeDetail"
-		style="@style/ModeDetailText"
-		android:layout_alignTop="@id/desc_rect"
-		android:layout_alignLeft="@id/desc_rect"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:text="@string/mode_circle" />
-
-	<!--  Controls -->
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-        android:padding="16dp"
-		android:layout_below="@id/desc_rect"
-		android:orientation="vertical" >
-
-		<!--  Pause button -->
-		<Button
-			android:id="@+id/Pause_02"
-			style="@style/modeControl"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-	        android:visibility="gone"
-			android:text="@string/Pause"
-	        android:background="@drawable/button_mode_options"
-			/>
-
-		<!--  Radius buttons -->
-		<TextView
-			android:id="@+id/RadiusLabel"
-			style="@style/modeLabel"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="Radius 10m" />
-
-		<LinearLayout
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:orientation="horizontal" >
-
-			<RelativeLayout
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content" >
-
-				<Button
-				android:id="@+id/button_grow_radius"
-				style="@style/modeControl"
-				android:layout_width="64dp"
-				android:layout_height="64dp"
-				android:background="@drawable/button_mode_options"
-				/>
-
-				<ImageView
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_centerInParent="true"
-				android:src="@drawable/ic_plus"
-				/>
-
-			</RelativeLayout>
-
-			<RelativeLayout
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:gravity="right"
-				>
-
-				<Button
-				android:id="@+id/button_shrink_radius"
-				style="@style/modeControl"
-				android:layout_width="64dp"
-				android:layout_height="64dp"
-				android:background="@drawable/button_mode_options"
-				/>
-
-				<ImageView
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_centerInParent="true"
-				android:src="@drawable/ic_minus"
-				/>
-			</RelativeLayout>
-		</LinearLayout>
-
-		<!--  Radius buttons -->
-		<TextView
-			android:id="@+id/DistanceLabel"
-			style="@style/modeLabel"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="Direction" />
-
-		<LinearLayout
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:orientation="horizontal" >
-
-			<RelativeLayout
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content" >
-
-				<Button
-				android:id="@+id/rotation_CCW"
-				style="@style/modeControl"
-				android:layout_width="64dp"
-				android:layout_height="64dp"
-				android:background="@drawable/button_mode_options"
-				/>
-
-				<ImageView
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_centerInParent="true"
-				android:src="@drawable/ic_rotate_ccw"
-				/>
-
-			</RelativeLayout>
-
-			<RelativeLayout
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:gravity="right"
-				>
-
-				<Button
-				android:id="@+id/rotation_CW"
-				style="@style/modeControl"
-				android:layout_width="64dp"
-				android:layout_height="64dp"
-				android:background="@drawable/button_mode_options"
-				/>
-
-				<ImageView
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_centerInParent="true"
-				android:src="@drawable/ic_rotate_cw"
-				/>
-			</RelativeLayout>
-		</LinearLayout>
-
-	</LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
+    android:layout_height="wrap_content"
+    android:text="@string/mode_circle"/>
diff --git a/Android/res/layout/fragment_mode_loiter.xml b/Android/res/layout/fragment_mode_loiter.xml
index d9d972dbd3..10db87726c 100644
--- a/Android/res/layout/fragment_mode_loiter.xml
+++ b/Android/res/layout/fragment_mode_loiter.xml
@@ -1,40 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<TextView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:custom="http://schemas.android.com/apk/res/org.droidplanner"
-    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/ModeDetail"
+    style="@style/ModeDetailText"
+    android:background="@drawable/mode_desc_rectangle"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-	tools:ignore="HardcodedText"
-    style="@style/flyoutPanelLayout"
-    >
-
-	<!--  Description -->
-	<View
-		android:id="@+id/desc_rect"
-		android:layout_width="match_parent"
-		android:layout_height="96dp"
-		android:layout_alignParentTop="true"
-		android:background="@drawable/mode_desc_rectangle"/>
-
-	<TextView
-		android:id="@+id/ModeDetail"
-		style="@style/ModeDetailText"
-		android:layout_alignTop="@id/desc_rect"
-		android:layout_alignLeft="@id/desc_rect"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:text="@string/mode_loiter" />
-
-	<!--  Controls -->
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-        android:padding="16dp"
-		android:layout_below="@id/desc_rect"
-		android:orientation="vertical" >
-
-
-	</LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
+    android:layout_height="wrap_content"
+    android:text="@string/mode_loiter"/>
\ No newline at end of file
diff --git a/Android/res/layout/fragment_mode_rtl.xml b/Android/res/layout/fragment_mode_rtl.xml
index 817db2c4c8..43235fece9 100644
--- a/Android/res/layout/fragment_mode_rtl.xml
+++ b/Android/res/layout/fragment_mode_rtl.xml
@@ -1,51 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<TextView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:custom="http://schemas.android.com/apk/res/org.droidplanner"
-    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/ModeDetail"
+    style="@style/ModeDetailText"
+    android:background="@drawable/mode_desc_rectangle"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-	tools:ignore="HardcodedText"
-    style="@style/flyoutPanelLayout"
-    >
-
-	<!--  Description -->
-	<View
-		android:id="@+id/desc_rect"
-		android:layout_width="match_parent"
-		android:layout_height="96dp"
-		android:layout_alignParentTop="true"
-		android:background="@drawable/mode_desc_rectangle"/>
-
-	<TextView
-		android:id="@+id/ModeDetail"
-		style="@style/ModeDetailText"
-		android:layout_alignTop="@id/desc_rect"
-		android:layout_alignLeft="@id/desc_rect"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:text="@string/mode_rtl" />
-
-	<!--  Controls -->
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-        android:padding="16dp"
-		android:visibility="gone"
-		android:layout_below="@id/desc_rect"
-		android:orientation="vertical" >
-
-		<!--  Pause button -->
-		<Button
-			android:id="@+id/Pause_02"
-			style="@style/modeControl"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:text="@string/Pause"
-	        android:background="@drawable/button_mode_options"
-        	android:visibility="gone"
-			/>
-
-	</LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
+    android:layout_height="wrap_content"
+    android:text="@string/mode_rtl"/>
\ No newline at end of file
diff --git a/Android/res/layout/fragment_mode_stabilize.xml b/Android/res/layout/fragment_mode_stabilize.xml
index e1f776029c..16a75307e9 100644
--- a/Android/res/layout/fragment_mode_stabilize.xml
+++ b/Android/res/layout/fragment_mode_stabilize.xml
@@ -1,64 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<TextView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/ModeDetail"
+    style="@style/ModeDetailText"
+    android:background="@drawable/mode_desc_rectangle"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-	tools:ignore="HardcodedText"
-    style="@style/flyoutPanelLayout"
-    >
-
-	<!--  Description -->
-	<View
-		android:id="@+id/desc_rect"
-		android:layout_width="match_parent"
-		android:layout_height="84dp"
-		android:layout_alignParentTop="true"
-		android:background="@drawable/mode_desc_rectangle"/>
-
-	<TextView
-		android:id="@+id/ModeDetail"
-		style="@style/ModeDetailText"
-		android:layout_alignTop="@id/desc_rect"
-		android:layout_alignLeft="@id/desc_rect"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:text="@string/mode_stabilize" />
-
-	<!--  Controls -->
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-        android:padding="16dp"
-		android:layout_below="@id/desc_rect"
-		android:orientation="vertical" >
-
-		<!--  Mission control -->
-		<!--
-		<TextView
-			android:id="@+id/DistanceLabel"
-			style="@style/modeLabel"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="Mission recording" />
-		<Button
-			android:id="@+id/SaveWaypoint"
-			style="@style/modeControl"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:text="Save waypoint"
-	        android:background="@drawable/button_mode_options"
-			/>
-		<Button
-			android:id="@+id/ClearMission"
-			style="@style/modeControl"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:text="Clear mission"
-	        android:background="@drawable/button_mode_options"
-			/>
-			-->
-
-	</LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
+    android:layout_height="wrap_content"
+    android:text="@string/mode_stabilize"/>
diff --git a/Android/src/org/droidplanner/android/fragments/mode/FlightModePanel.java b/Android/src/org/droidplanner/android/fragments/mode/FlightModePanel.java
index 79f1f7d635..6cba9e9b7c 100644
--- a/Android/src/org/droidplanner/android/fragments/mode/FlightModePanel.java
+++ b/Android/src/org/droidplanner/android/fragments/mode/FlightModePanel.java
@@ -100,45 +100,66 @@ private void onModeUpdate(ApmModes mode) {
 		} else {
 			switch (mode) {
 			case ROTOR_RTL:
+			case FIXED_WING_RTL:
+			case ROVER_RTL:
 				infoPanel = new ModeRTLFragment();
 				break;
+
 			case ROTOR_AUTO:
+			case FIXED_WING_AUTO:
+			case ROVER_AUTO:
 				infoPanel = new ModeAutoFragment();
 				break;
+
 			case ROTOR_LAND:
 				infoPanel = new ModeLandFragment();
 				break;
+
 			case ROTOR_LOITER:
+			case FIXED_WING_LOITER:
 				infoPanel = new ModeLoiterFragment();
 				break;
+
 			case ROTOR_STABILIZE:
+			case FIXED_WING_STABILIZE:
 				infoPanel = new ModeStabilizeFragment();
 				break;
+
 			case ROTOR_ACRO:
 				infoPanel = new ModeAcroFragment();
 				break;
+
 			case ROTOR_ALT_HOLD:
 				infoPanel = new ModeAltholdFragment();
 				break;
+
 			case ROTOR_CIRCLE:
+			case FIXED_WING_CIRCLE:
 				infoPanel = new ModeCircleFragment();
 				break;
+
 			case ROTOR_GUIDED:
+			case FIXED_WING_GUIDED:
+			case ROVER_GUIDED:
 				if (((DroidPlannerApp) getActivity().getApplication()).getFollowMe().isEnabled()) {
 					infoPanel = new ModeFollowFragment();
 				} else {
 					infoPanel = new ModeGuidedFragment();
 				}
 				break;
+
 			case ROTOR_TOY:
 				infoPanel = new ModeDriftFragment();
 				break;
+
 			case ROTOR_SPORT:
 				infoPanel = new ModeSportFragment();
 				break;
+
 			case ROTOR_POSHOLD:
 				infoPanel = new ModePosHoldFragment();
 				break;
+
 			default:
 				infoPanel = new ModeDisconnectedFragment();
 				break;
diff --git a/Android/src/org/droidplanner/android/fragments/mode/ModeAcroFragment.java b/Android/src/org/droidplanner/android/fragments/mode/ModeAcroFragment.java
index b2bc3358e7..c3ac7f304e 100644
--- a/Android/src/org/droidplanner/android/fragments/mode/ModeAcroFragment.java
+++ b/Android/src/org/droidplanner/android/fragments/mode/ModeAcroFragment.java
@@ -12,8 +12,7 @@ public class ModeAcroFragment extends Fragment {
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-		View view = inflater.inflate(R.layout.fragment_mode_acro, container, false);
-		return view;
+		return inflater.inflate(R.layout.fragment_mode_acro, container, false);
 	}
 
 }
diff --git a/Android/src/org/droidplanner/android/fragments/mode/ModeAutoFragment.java b/Android/src/org/droidplanner/android/fragments/mode/ModeAutoFragment.java
index 98ea1f30f4..1161b23977 100644
--- a/Android/src/org/droidplanner/android/fragments/mode/ModeAutoFragment.java
+++ b/Android/src/org/droidplanner/android/fragments/mode/ModeAutoFragment.java
@@ -12,7 +12,6 @@ public class ModeAutoFragment extends Fragment {
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-		View view = inflater.inflate(R.layout.fragment_mode_auto, container, false);
-		return view;
+		return inflater.inflate(R.layout.fragment_mode_auto, container, false);
 	}
 }
diff --git a/Android/src/org/droidplanner/android/fragments/mode/ModeCircleFragment.java b/Android/src/org/droidplanner/android/fragments/mode/ModeCircleFragment.java
index d782e817ba..59a1df55c1 100644
--- a/Android/src/org/droidplanner/android/fragments/mode/ModeCircleFragment.java
+++ b/Android/src/org/droidplanner/android/fragments/mode/ModeCircleFragment.java
@@ -12,7 +12,6 @@ public class ModeCircleFragment extends Fragment {
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-		View view = inflater.inflate(R.layout.fragment_mode_circle, container, false);
-		return view;
+		return inflater.inflate(R.layout.fragment_mode_circle, container, false);
 	}
 }
diff --git a/Android/src/org/droidplanner/android/fragments/mode/ModeLoiterFragment.java b/Android/src/org/droidplanner/android/fragments/mode/ModeLoiterFragment.java
index d1c936bdf6..734d6d8b81 100644
--- a/Android/src/org/droidplanner/android/fragments/mode/ModeLoiterFragment.java
+++ b/Android/src/org/droidplanner/android/fragments/mode/ModeLoiterFragment.java
@@ -12,7 +12,6 @@ public class ModeLoiterFragment extends Fragment {
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-		View view = inflater.inflate(R.layout.fragment_mode_loiter, container, false);
-		return view;
+		return inflater.inflate(R.layout.fragment_mode_loiter, container, false);
 	}
 }
diff --git a/Android/src/org/droidplanner/android/fragments/mode/ModeRTLFragment.java b/Android/src/org/droidplanner/android/fragments/mode/ModeRTLFragment.java
index c461bd9028..e423bad5a1 100644
--- a/Android/src/org/droidplanner/android/fragments/mode/ModeRTLFragment.java
+++ b/Android/src/org/droidplanner/android/fragments/mode/ModeRTLFragment.java
@@ -12,7 +12,6 @@ public class ModeRTLFragment extends Fragment {
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-		View view = inflater.inflate(R.layout.fragment_mode_rtl, container, false);
-		return view;
+		return inflater.inflate(R.layout.fragment_mode_rtl, container, false);
 	}
 }
diff --git a/Android/src/org/droidplanner/android/fragments/mode/ModeStabilizeFragment.java b/Android/src/org/droidplanner/android/fragments/mode/ModeStabilizeFragment.java
index 36283497f8..8eab3d1843 100644
--- a/Android/src/org/droidplanner/android/fragments/mode/ModeStabilizeFragment.java
+++ b/Android/src/org/droidplanner/android/fragments/mode/ModeStabilizeFragment.java
@@ -12,7 +12,6 @@ public class ModeStabilizeFragment extends Fragment {
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-		View view = inflater.inflate(R.layout.fragment_mode_stabilize, container, false);
-		return view;
+		return inflater.inflate(R.layout.fragment_mode_stabilize, container, false);
 	}
 }

From 0775040e313c806c732668e0a016d6e9ffe7f5bc Mon Sep 17 00:00:00 2001
From: ne0fhyk <fhuyakou@gmail.com>
Date: Tue, 21 Oct 2014 23:35:11 -0700
Subject: [PATCH 2/2] code cleanup.

---
 Android/res/layout/fragment_mode_acro.xml     | 41 ++---------
 Android/res/layout/fragment_mode_althold.xml  | 71 ++-----------------
 .../res/layout/fragment_mode_disconnect.xml   | 42 ++---------
 Android/res/layout/fragment_mode_drift.xml    | 43 ++---------
 Android/res/layout/fragment_mode_land.xml     | 54 ++------------
 Android/res/layout/fragment_mode_ofloiter.xml | 40 -----------
 Android/res/layout/fragment_mode_poshold.xml  | 32 ++-------
 Android/res/layout/fragment_mode_position.xml | 40 -----------
 Android/res/layout/fragment_mode_sport.xml    | 43 ++---------
 .../fragments/mode/ModeAltholdFragment.java   |  3 +-
 .../mode/ModeDisconnectedFragment.java        |  3 +-
 .../fragments/mode/ModeDriftFragment.java     |  3 +-
 .../fragments/mode/ModeLandFragment.java      |  3 +-
 .../fragments/mode/ModeOFLoiterFragment.java  | 18 -----
 .../fragments/mode/ModePosHoldFragment.java   |  3 +-
 .../fragments/mode/ModePositionFragment.java  | 18 -----
 .../fragments/mode/ModeSportFragment.java     |  3 +-
 17 files changed, 54 insertions(+), 406 deletions(-)
 delete mode 100644 Android/res/layout/fragment_mode_ofloiter.xml
 delete mode 100644 Android/res/layout/fragment_mode_position.xml
 delete mode 100644 Android/src/org/droidplanner/android/fragments/mode/ModeOFLoiterFragment.java
 delete mode 100644 Android/src/org/droidplanner/android/fragments/mode/ModePositionFragment.java

diff --git a/Android/res/layout/fragment_mode_acro.xml b/Android/res/layout/fragment_mode_acro.xml
index 1745c44946..8e189bcfc9 100644
--- a/Android/res/layout/fragment_mode_acro.xml
+++ b/Android/res/layout/fragment_mode_acro.xml
@@ -1,39 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<TextView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:custom="http://schemas.android.com/apk/res/org.droidplanner"
-    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/ModeDetail"
+    style="@style/ModeDetailText"
+    android:background="@drawable/mode_desc_rectangle"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-	tools:ignore="HardcodedText"
-    style="@style/flyoutPanelLayout"
-    >
+    android:layout_height="wrap_content"
+    android:text="@string/mode_acro"/>
 
-	<!--  Description -->
-	<View
-		android:id="@+id/desc_rect"
-		android:layout_width="match_parent"
-		android:layout_height="96dp"
-		android:layout_alignParentTop="true"
-		android:background="@drawable/mode_desc_rectangle"/>
-
-	<TextView
-		android:id="@+id/ModeDetail"
-		style="@style/ModeDetailText"
-		android:layout_alignTop="@id/desc_rect"
-		android:layout_alignLeft="@id/desc_rect"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:text="@string/mode_acro" />
-
-	<!--  Controls -->
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-        android:padding="16dp"
-		android:layout_below="@id/desc_rect"
-		android:orientation="vertical" >
-
-	</LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/Android/res/layout/fragment_mode_althold.xml b/Android/res/layout/fragment_mode_althold.xml
index b95937d439..84c761ce61 100644
--- a/Android/res/layout/fragment_mode_althold.xml
+++ b/Android/res/layout/fragment_mode_althold.xml
@@ -1,67 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+
+<TextView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:custom="http://schemas.android.com/apk/res/org.droidplanner"
-    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/ModeDetail"
+    style="@style/ModeDetailText"
+    android:background="@drawable/mode_desc_rectangle"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-	tools:ignore="HardcodedText"
-    style="@style/flyoutPanelLayout"
-    >
-
-	<!--  Description -->
-	<View
-		android:id="@+id/desc_rect"
-		android:layout_width="match_parent"
-		android:layout_height="96dp"
-		android:layout_alignParentTop="true"
-		android:background="@drawable/mode_desc_rectangle"/>
-
-	<TextView
-		android:id="@+id/ModeDetail"
-		style="@style/ModeDetailText"
-		android:layout_alignTop="@id/desc_rect"
-		android:layout_alignLeft="@id/desc_rect"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:text="@string/mode_althold" />
-
-	<!--  Controls -->
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-        android:padding="16dp"
-		android:layout_below="@id/desc_rect"
-		android:orientation="vertical" >
-
-		<!--  Mission control -->
-		<TextView
-			android:id="@+id/DistanceLabel"
-			style="@style/modeLabel"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="Mission recording"
-        	android:visibility="gone"
-			/>
-		<Button
-			android:id="@+id/SaveWaypoint"
-			style="@style/modeControl"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:text="Save waypoint"
-	        android:background="@drawable/button_mode_options"
-        	android:visibility="gone"
-			/>
-		<Button
-			android:id="@+id/ClearMission"
-			style="@style/modeControl"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:text="Clear mission"
-	        android:background="@drawable/button_mode_options"
-        	android:visibility="gone"
-			/>
-
-	</LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
+    android:layout_height="wrap_content"
+    android:text="@string/mode_althold"/>
diff --git a/Android/res/layout/fragment_mode_disconnect.xml b/Android/res/layout/fragment_mode_disconnect.xml
index f1033a224a..6667a41195 100644
--- a/Android/res/layout/fragment_mode_disconnect.xml
+++ b/Android/res/layout/fragment_mode_disconnect.xml
@@ -1,37 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:custom="http://schemas.android.com/apk/res/org.droidplanner"
-    xmlns:tools="http://schemas.android.com/tools"
-    style="@style/flyoutPanelLayout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:ignore="HardcodedText" >
-
-    <!-- Description -->
-
-    <View
-        android:id="@+id/desc_rect"
-        android:layout_width="match_parent"
-        android:layout_height="84dp"
-        android:layout_alignParentTop="true"
-        android:background="@drawable/mode_desc_rectangle" />
-
-    <TextView
-        android:id="@+id/ModeDetail"
-        style="@style/ModeDetailText"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@id/desc_rect"
-        android:layout_alignTop="@id/desc_rect" />
 
-    <!-- Controls -->
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/desc_rect"
-        android:orientation="vertical"
-        android:padding="16dp" >
-    </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/ModeDetail"
+    style="@style/ModeDetailText"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/mode_desc_rectangle"/>
diff --git a/Android/res/layout/fragment_mode_drift.xml b/Android/res/layout/fragment_mode_drift.xml
index f109b6fe3a..a5796b1e52 100644
--- a/Android/res/layout/fragment_mode_drift.xml
+++ b/Android/res/layout/fragment_mode_drift.xml
@@ -1,39 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+
+<TextView
+    android:id="@+id/ModeDetail"
+    style="@style/ModeDetailText"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:custom="http://schemas.android.com/apk/res/org.droidplanner"
-    xmlns:tools="http://schemas.android.com/tools"
+    android:background="@drawable/mode_desc_rectangle"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-	tools:ignore="HardcodedText"
-    style="@style/flyoutPanelLayout"
-    >
-
-	<!--  Description -->
-	<View
-		android:id="@+id/desc_rect"
-		android:layout_width="match_parent"
-		android:layout_height="96dp"
-		android:layout_alignParentTop="true"
-		android:background="@drawable/mode_desc_rectangle"/>
-
-	<TextView
-		android:id="@+id/ModeDetail"
-		style="@style/ModeDetailText"
-		android:layout_alignTop="@id/desc_rect"
-		android:layout_alignLeft="@id/desc_rect"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:text="@string/mode_drift" />
-
-	<!--  Controls -->
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-        android:padding="16dp"
-		android:layout_below="@id/desc_rect"
-		android:orientation="vertical" >
-
-	</LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
+    android:layout_height="wrap_content"
+    android:text="@string/mode_drift"/>
diff --git a/Android/res/layout/fragment_mode_land.xml b/Android/res/layout/fragment_mode_land.xml
index bc7b4d6347..908ff2a34a 100644
--- a/Android/res/layout/fragment_mode_land.xml
+++ b/Android/res/layout/fragment_mode_land.xml
@@ -1,50 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+
+<TextView
+    android:id="@+id/ModeDetail"
+    style="@style/ModeDetailText"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:custom="http://schemas.android.com/apk/res/org.droidplanner"
-    xmlns:tools="http://schemas.android.com/tools"
+    android:background="@drawable/mode_desc_rectangle"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-	tools:ignore="HardcodedText"
-    style="@style/flyoutPanelLayout"
-    >
-
-	<!--  Description -->
-	<View
-		android:id="@+id/desc_rect"
-		android:layout_width="match_parent"
-		android:layout_height="96dp"
-		android:layout_alignParentTop="true"
-		android:background="@drawable/mode_desc_rectangle"/>
-
-	<TextView
-		android:id="@+id/ModeDetail"
-		style="@style/ModeDetailText"
-		android:layout_alignTop="@id/desc_rect"
-		android:layout_alignLeft="@id/desc_rect"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:text="@string/mode_land" />
-
-	<!--  Controls -->
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-        android:padding="16dp"
-		android:layout_below="@id/desc_rect"
-		android:orientation="vertical" >
-
-		<!--  Pause button -->
-		<Button
-			android:id="@+id/Pause_02"
-			style="@style/modeControl"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:visibility="gone"
-			android:text="@string/Pause"
-	        android:background="@drawable/button_mode_options"
-			/>
-
-	</LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
+    android:layout_height="wrap_content"
+    android:text="@string/mode_land"/>
diff --git a/Android/res/layout/fragment_mode_ofloiter.xml b/Android/res/layout/fragment_mode_ofloiter.xml
deleted file mode 100644
index 5d253fe351..0000000000
--- a/Android/res/layout/fragment_mode_ofloiter.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:custom="http://schemas.android.com/apk/res/org.droidplanner"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-	tools:ignore="HardcodedText"
-    style="@style/flyoutPanelLayout"
-    >
-
-	<!--  Description -->
-	<View
-		android:id="@+id/desc_rect"
-		android:layout_width="match_parent"
-		android:layout_height="96dp"
-		android:layout_alignParentTop="true"
-		android:background="@drawable/mode_desc_rectangle"/>
-
-	<TextView
-		android:id="@+id/ModeDetail"
-		style="@style/ModeDetailText"
-		android:layout_alignTop="@id/desc_rect"
-		android:layout_alignLeft="@id/desc_rect"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:text="@string/mode_ofloiter" />
-
-	<!--  Controls -->
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-        android:padding="16dp"
-		android:layout_below="@id/desc_rect"
-		android:orientation="vertical" >
-
-
-	</LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/Android/res/layout/fragment_mode_poshold.xml b/Android/res/layout/fragment_mode_poshold.xml
index 30bfc07851..1dad5f466b 100644
--- a/Android/res/layout/fragment_mode_poshold.xml
+++ b/Android/res/layout/fragment_mode_poshold.xml
@@ -1,28 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+
+<TextView
+    android:id="@+id/ModeDetail"
+    style="@style/ModeDetailText"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    android:background="@drawable/mode_desc_rectangle"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-	tools:ignore="HardcodedText"
-    style="@style/flyoutPanelLayout"
-    >
-
-	<!--  Description -->
-	<View
-		android:id="@+id/desc_rect"
-		android:layout_width="match_parent"
-		android:layout_height="84dp"
-		android:layout_alignParentTop="true"
-		android:background="@drawable/mode_desc_rectangle"/>
-
-	<TextView
-		android:id="@+id/ModeDetail"
-		style="@style/ModeDetailText"
-		android:layout_alignTop="@id/desc_rect"
-		android:layout_alignLeft="@id/desc_rect"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:text="@string/mode_poshold" />
-
-</RelativeLayout>
\ No newline at end of file
+    android:layout_height="wrap_content"
+    android:text="@string/mode_poshold"/>
diff --git a/Android/res/layout/fragment_mode_position.xml b/Android/res/layout/fragment_mode_position.xml
deleted file mode 100644
index 31c6d716a6..0000000000
--- a/Android/res/layout/fragment_mode_position.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:custom="http://schemas.android.com/apk/res/org.droidplanner"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-	tools:ignore="HardcodedText"
-    style="@style/flyoutPanelLayout"
-    >
-
-	<!--  Description -->
-	<View
-		android:id="@+id/desc_rect"
-		android:layout_width="match_parent"
-		android:layout_height="96dp"
-		android:layout_alignParentTop="true"
-		android:background="@drawable/mode_desc_rectangle"/>
-
-	<TextView
-		android:id="@+id/ModeDetail"
-		style="@style/ModeDetailText"
-		android:layout_alignTop="@id/desc_rect"
-		android:layout_alignLeft="@id/desc_rect"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:text="@string/mode_position" />
-
-	<!--  Controls -->
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-        android:padding="16dp"
-		android:layout_below="@id/desc_rect"
-		android:orientation="vertical" >
-
-
-	</LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/Android/res/layout/fragment_mode_sport.xml b/Android/res/layout/fragment_mode_sport.xml
index 9959939004..cf02630767 100644
--- a/Android/res/layout/fragment_mode_sport.xml
+++ b/Android/res/layout/fragment_mode_sport.xml
@@ -1,39 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+
+<TextView
+    android:id="@+id/ModeDetail"
+    style="@style/ModeDetailText"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:custom="http://schemas.android.com/apk/res/org.droidplanner"
-    xmlns:tools="http://schemas.android.com/tools"
+    android:background="@drawable/mode_desc_rectangle"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-	tools:ignore="HardcodedText"
-    style="@style/flyoutPanelLayout"
-    >
-
-	<!--  Description -->
-	<View
-		android:id="@+id/desc_rect"
-		android:layout_width="match_parent"
-		android:layout_height="96dp"
-		android:layout_alignParentTop="true"
-		android:background="@drawable/mode_desc_rectangle"/>
-
-	<TextView
-		android:id="@+id/ModeDetail"
-		style="@style/ModeDetailText"
-		android:layout_alignTop="@id/desc_rect"
-		android:layout_alignLeft="@id/desc_rect"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:text="@string/mode_sport" />
-
-	<!--  Controls -->
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-        android:padding="16dp"
-		android:layout_below="@id/desc_rect"
-		android:orientation="vertical" >
-
-	</LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
+    android:layout_height="wrap_content"
+    android:text="@string/mode_sport"/>
diff --git a/Android/src/org/droidplanner/android/fragments/mode/ModeAltholdFragment.java b/Android/src/org/droidplanner/android/fragments/mode/ModeAltholdFragment.java
index ca1b8bd6b0..58dec0efa2 100644
--- a/Android/src/org/droidplanner/android/fragments/mode/ModeAltholdFragment.java
+++ b/Android/src/org/droidplanner/android/fragments/mode/ModeAltholdFragment.java
@@ -12,8 +12,7 @@ public class ModeAltholdFragment extends Fragment {
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-		View view = inflater.inflate(R.layout.fragment_mode_althold, container, false);
-		return view;
+		return inflater.inflate(R.layout.fragment_mode_althold, container, false);
 	}
 
 }
diff --git a/Android/src/org/droidplanner/android/fragments/mode/ModeDisconnectedFragment.java b/Android/src/org/droidplanner/android/fragments/mode/ModeDisconnectedFragment.java
index 0353a0d6aa..5ad0ae9c66 100644
--- a/Android/src/org/droidplanner/android/fragments/mode/ModeDisconnectedFragment.java
+++ b/Android/src/org/droidplanner/android/fragments/mode/ModeDisconnectedFragment.java
@@ -12,7 +12,6 @@ public class ModeDisconnectedFragment extends Fragment {
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-		View view = inflater.inflate(R.layout.fragment_mode_disconnect, container, false);
-		return view;
+		return inflater.inflate(R.layout.fragment_mode_disconnect, container, false);
 	}
 }
diff --git a/Android/src/org/droidplanner/android/fragments/mode/ModeDriftFragment.java b/Android/src/org/droidplanner/android/fragments/mode/ModeDriftFragment.java
index f8e25a88a6..117e387300 100644
--- a/Android/src/org/droidplanner/android/fragments/mode/ModeDriftFragment.java
+++ b/Android/src/org/droidplanner/android/fragments/mode/ModeDriftFragment.java
@@ -12,7 +12,6 @@ public class ModeDriftFragment extends Fragment {
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-		View view = inflater.inflate(R.layout.fragment_mode_drift, container, false);
-		return view;
+		return inflater.inflate(R.layout.fragment_mode_drift, container, false);
 	}
 }
diff --git a/Android/src/org/droidplanner/android/fragments/mode/ModeLandFragment.java b/Android/src/org/droidplanner/android/fragments/mode/ModeLandFragment.java
index 349e36d4a6..aa487cf0bd 100644
--- a/Android/src/org/droidplanner/android/fragments/mode/ModeLandFragment.java
+++ b/Android/src/org/droidplanner/android/fragments/mode/ModeLandFragment.java
@@ -12,7 +12,6 @@ public class ModeLandFragment extends Fragment {
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-		View view = inflater.inflate(R.layout.fragment_mode_land, container, false);
-		return view;
+		return  inflater.inflate(R.layout.fragment_mode_land, container, false);
 	}
 }
diff --git a/Android/src/org/droidplanner/android/fragments/mode/ModeOFLoiterFragment.java b/Android/src/org/droidplanner/android/fragments/mode/ModeOFLoiterFragment.java
deleted file mode 100644
index 354296a232..0000000000
--- a/Android/src/org/droidplanner/android/fragments/mode/ModeOFLoiterFragment.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.droidplanner.android.fragments.mode;
-
-import org.droidplanner.R;
-
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-public class ModeOFLoiterFragment extends Fragment {
-
-	@Override
-	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-		View view = inflater.inflate(R.layout.fragment_mode_ofloiter, container, false);
-		return view;
-	}
-}
diff --git a/Android/src/org/droidplanner/android/fragments/mode/ModePosHoldFragment.java b/Android/src/org/droidplanner/android/fragments/mode/ModePosHoldFragment.java
index f08c6fc632..3869895771 100644
--- a/Android/src/org/droidplanner/android/fragments/mode/ModePosHoldFragment.java
+++ b/Android/src/org/droidplanner/android/fragments/mode/ModePosHoldFragment.java
@@ -12,7 +12,6 @@ public class ModePosHoldFragment extends Fragment {
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-		View view = inflater.inflate(R.layout.fragment_mode_poshold, container, false);
-		return view;
+		return inflater.inflate(R.layout.fragment_mode_poshold, container, false);
 	}
 }
diff --git a/Android/src/org/droidplanner/android/fragments/mode/ModePositionFragment.java b/Android/src/org/droidplanner/android/fragments/mode/ModePositionFragment.java
deleted file mode 100644
index 39ff45ab33..0000000000
--- a/Android/src/org/droidplanner/android/fragments/mode/ModePositionFragment.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.droidplanner.android.fragments.mode;
-
-import org.droidplanner.R;
-
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-public class ModePositionFragment extends Fragment {
-
-	@Override
-	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-		View view = inflater.inflate(R.layout.fragment_mode_position, container, false);
-		return view;
-	}
-}
diff --git a/Android/src/org/droidplanner/android/fragments/mode/ModeSportFragment.java b/Android/src/org/droidplanner/android/fragments/mode/ModeSportFragment.java
index 0ff1eeff04..6b6b9ab42d 100644
--- a/Android/src/org/droidplanner/android/fragments/mode/ModeSportFragment.java
+++ b/Android/src/org/droidplanner/android/fragments/mode/ModeSportFragment.java
@@ -12,7 +12,6 @@ public class ModeSportFragment extends Fragment {
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-		View view = inflater.inflate(R.layout.fragment_mode_sport, container, false);
-		return view;
+		return inflater.inflate(R.layout.fragment_mode_sport, container, false);
 	}
 }