Choose layout wizard step

android-app/src/main/res/layout/cpp_wizard_step_choose_layout.xml

@@ -23,53 +23,29 @@
   -->
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:layout_width="match_parent"
-			  a:layout_height="match_parent"
-			  a:orientation="vertical">
+	a:layout_width="match_parent"
+	a:layout_height="match_parent"
+	a:orientation="vertical"
+	a:gravity="center">
 
-	<RadioGroup
-			a:orientation="horizontal"
-			a:layout_width="match_parent"
-			a:layout_height="wrap_content"
-			a:gravity="center_vertical|top">
+	<TextView
+		a:layout_width="wrap_content"
+		a:layout_height="wrap_content"
+		a:textAppearance="@android:style/TextAppearance.Large"
+		style="@style/WizardLabel"
+		a:text="Choose layout" />
 
-		<RadioButton
-				a:layout_width="0dp"
-				a:id="@+id/wizard_optimized_radiobutton"
-				a:layout_weight="1"
-				a:text="@string/cpp_wizard_layout_optimized"
-				a:layout_height="wrap_content"/>
+	<Spinner
+		a:id="@+id/wizard_layout_spinner"
+		a:layout_width="wrap_content"
+		a:layout_height="wrap_content"
+		style="@style/WizardLabel" />
 
-		<RadioButton
-				a:layout_width="0dp"
-				a:id="@+id/wizard_big_buttons_radiobutton"
-				a:layout_weight="1"
-				a:text="@string/cpp_wizard_layout_big_buttons"
-				a:layout_height="wrap_content"/>
-
-	</RadioGroup>
-
-	<LinearLayout
-			a:layout_width="match_parent"
-			a:layout_height="wrap_content"
-			a:orientation="horizontal">
-
-		<ImageView
-				a:layout_width="0dp"
-				a:layout_weight="1"
-				a:scaleType="centerInside"
-				a:layout_height="match_parent"
-				a:padding="10dp"
-				a:src="@drawable/tablet_optimized"/>
-
-		<ImageView
-				a:layout_width="0dp"
-				a:layout_weight="1"
-				a:scaleType="centerInside"
-				a:layout_height="match_parent"
-				a:padding="10dp"
-				a:src="@drawable/tablet_big_buttons"/>
-
-	</LinearLayout>
+	<ImageView
+		a:id="@+id/wizard_layout_image"
+		a:layout_width="wrap_content"
+		a:layout_height="wrap_content"
+		style="@style/WizardLabel.Last"
+		/>
 
 </LinearLayout>

android-app/src/main/res/values/arrays.xml

@@ -138,4 +138,9 @@
 		<item>@string/cpp_wizard_mode_simple</item>
 		<item>@string/cpp_wizard_mode_engineer</item>
 	</string-array>
+
+	<string-array name="cpp_layouts">
+		<item>@string/cpp_wizard_layout_big_buttons</item>
+		<item>@string/cpp_wizard_layout_optimized</item>
+	</string-array>
 </resources>

android-app/src/main/res/values/colors.xml

@@ -33,7 +33,7 @@
 	<color name="cpp_wizard_button_normal">#424242</color>
 	<color name="cpp_wizard_button_disabled">#616161</color>
 	<color name="cpp_wizard_button_pressed">#757575</color>
-	<color name="cpp_pane_background">#ff1f1f1f</color>
+	<color name="cpp_pane_background">#212121</color>
 	<color name="cpp_metro_button_dark">#ff000000</color>
 	<color name="cpp_metro_button">#212121</color>
 	<color name="cpp_metro_button_light">#393939</color>