Add a spinner for CPUs, plus some clean up.

author: David Walter Seikel 2014-09-22 13:29:34 +1000
committer: David Walter Seikel 2014-09-22 13:29:34 +1000
commit: 3ae8982fa1a851918fe5d902b42905ce0ceda87c (patch)
tree: f29b0b81eb94baecee90662540016912695f97d7 /res
parent: Update README. (diff)
download: toyboxInstaller-3ae8982fa1a851918fe5d902b42905ce0ceda87c.zip
toyboxInstaller-3ae8982fa1a851918fe5d902b42905ce0ceda87c.tar.gz
toyboxInstaller-3ae8982fa1a851918fe5d902b42905ce0ceda87c.tar.bz2
toyboxInstaller-3ae8982fa1a851918fe5d902b42905ce0ceda87c.tar.xz
2 files changed, 29 insertions, 3 deletions
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>
author	David Walter Seikel	2014-09-22 13:29:34 +1000
committer	David Walter Seikel	2014-09-22 13:29:34 +1000
commit	3ae8982fa1a851918fe5d902b42905ce0ceda87c (patch)
tree	f29b0b81eb94baecee90662540016912695f97d7 /res
parent	Update README. (diff)
download	toyboxInstaller-3ae8982fa1a851918fe5d902b42905ce0ceda87c.zip toyboxInstaller-3ae8982fa1a851918fe5d902b42905ce0ceda87c.tar.gz toyboxInstaller-3ae8982fa1a851918fe5d902b42905ce0ceda87c.tar.bz2 toyboxInstaller-3ae8982fa1a851918fe5d902b42905ce0ceda87c.tar.xz

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 @@
25	android:layout_height="wrap_content"	25	android:layout_height="wrap_content"
26	android:prompt="@+id/versionsPrompt" />	26	android:prompt="@+id/versionsPrompt" />
27		27
28	<TextView android:id="@+id/cpu"	28	<TextView android:id="@+id/cpusPrompt"
29	android:layout_width="wrap_content"	29	android:layout_width="wrap_content"
30	android:layout_height="wrap_content"	30	android:layout_height="wrap_content"
31	android:text="@string/cpu" />	31	android:text="@string/cpusPrompt" />
		32
		33	<Spinner android:id="@+id/cpus"
		34	android:layout_width="wrap_content"
		35	android:layout_height="wrap_content"
		36	android:prompt="@+id/cpusPrompt" />
32		37
33	<TextView android:id="@+id/path"	38	<TextView android:id="@+id/path"
34	android:layout_width="wrap_content"	39	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
20	<item>0.4.8</item>	20	<item>0.4.8</item>
21	<item>0.4.9</item>	21	<item>0.4.9</item>
22	</string-array>	22	</string-array>
23	<string name="cpu">The CPU type here is</string>	23	<string name="cpusPrompt">The CPU type here is</string>
		24	<string name="cpusPrompt2">, but you may need to select a close match :-</string>
		25	<string-array name="cpus">
		26	<item>armv4eb</item>
		27	<item>armv4l</item>
		28	<item>armv4tl</item>
		29	<item>armv5l</item>
		30	<item>armv6l</item>
		31	<item>armv7l</item>
		32	<item>i486</item>
		33	<item>i586</item>
		34	<item>i686</item>
		35	<item>m68k</item>
		36	<item>mips</item>
		37	<item>mips64</item>
		38	<item>mipsel</item>
		39	<item>powerpc</item>
		40	<item>powerpc-440fp</item>
		41	<item>sh4</item>
		42	<item>sparc</item>
		43	<item>x86_64</item>
		44	</string-array>
24	<string name="path">Select where you want to install toybox ...\n</string>	45	<string name="path">Select where you want to install toybox ...\n</string>
25	<string name="pathsPrompt">... into the $PATH :-\n</string>	46	<string name="pathsPrompt">... into the $PATH :-\n</string>
26	<string name="folder">... or into a folder :-\n</string>	47	<string name="folder">... or into a folder :-\n</string>