From 3ae8982fa1a851918fe5d902b42905ce0ceda87c Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Mon, 22 Sep 2014 13:29:34 +1000
Subject: Add a spinner for CPUs, plus some clean up.

---
 res/layout/main.xml    |  9 +++++++--
 res/values/strings.xml | 23 ++++++++++++++++++++++-
 2 files changed, 29 insertions(+), 3 deletions(-)

(limited to 'res')

diff --git a/res/layout/main.xml b/res/layout/main.xml
index 18c9ec9..eec86f2 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -25,10 +25,15 @@
 				android:layout_height="wrap_content"
 				android:prompt="@+id/versionsPrompt" />
 
-    <TextView android:id="@+id/cpu"
+    <TextView android:id="@+id/cpusPrompt"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/cpu" />
+        android:text="@string/cpusPrompt" />
+
+    <Spinner android:id="@+id/cpus"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+				android:prompt="@+id/cpusPrompt" />
 
     <TextView android:id="@+id/path"
         android:layout_width="wrap_content"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 517af71..6502964 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -20,7 +20,28 @@ This app is used for installing Rob Landley\'s toybox.\n\n\"Toybox combines comm
 				<item>0.4.8</item>
 				<item>0.4.9</item>
 		</string-array>
-		<string name="cpu">The CPU type here is</string>
+		<string name="cpusPrompt">The CPU type here is</string>
+    <string name="cpusPrompt2">, but you may need to select a close match :-</string>
+    <string-array name="cpus">
+        <item>armv4eb</item>
+        <item>armv4l</item>
+        <item>armv4tl</item>
+        <item>armv5l</item>
+        <item>armv6l</item>
+        <item>armv7l</item>
+        <item>i486</item>
+        <item>i586</item>
+        <item>i686</item>
+        <item>m68k</item>
+        <item>mips</item>
+        <item>mips64</item>
+        <item>mipsel</item>
+        <item>powerpc</item>
+        <item>powerpc-440fp</item>
+        <item>sh4</item>
+        <item>sparc</item>
+        <item>x86_64</item>
+    </string-array>
     <string name="path">Select where you want to install toybox ...\n</string>
 		<string name="pathsPrompt">... into the $PATH :-\n</string>
     <string name="folder">... or into a folder :-\n</string>
-- 
cgit v1.1