Add optional NumPad

Shows a NumPad depending on preference:
   Never/Landscape/Always

7 files changed, 54 insertions, 4 deletions

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 3f3470d..caa597d 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -10,12 +10,16 @@
   <string name="pref_accents_e_all_installed">Akzente für alle installierten Sprachen anzeigen</string>
   <string name="pref_accents_e_selected">Akzente nur für die gewählte Sprache anzeigen</string>
   <string name="pref_accents_e_none">Akzente verbergen</string>
-  <string name="pref_autocapitalisation_title">Automatische Großschreibung</string>
-  <string name="pref_autocapitalisation_summary">Umschalttaste am Satzanfang aktivieren</string>
-  <string name="pref_extra_keys_title">Tasten hinzufügen</string>
+  <string name="pref_show_numpad_title">Ziffernblock anzeigen</string>
+  <string name="pref_show_numpad_never">Nie</string>
+  <string name="pref_show_numpad_landscape">Nur im Querformat</string>
+  <string name="pref_show_numpad_always">Immer</string>
   <string name="pref_programming_layout_title">Tastaturlayout zum Programmieren</string>
+  <string name="pref_extra_keys_title">Zusätzliche Zeichen zur Tastatur hinzufügen</string>
   <string name="pref_programming_layout_none">Keines</string>
   <string name="pref_category_typing">Tippen</string>
+  <string name="pref_autocapitalisation_title">Automatische Großschreibung</string>
+  <string name="pref_autocapitalisation_summary">Shift-Taste am Satzanfang aktivieren</string>
   <string name="pref_swipe_dist_title">Länge der Wischgeste</string>
   <string name="pref_swipe_dist_summary">Abstand der Zeichen in den Ecken der Tasten (%s)</string>
   <string name="pref_long_timeout_title">Zeitüberschreitung bei Tastenwiederholung</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 7d501e6..05c0d83 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -8,6 +8,10 @@
   <string name="pref_accents_e_all_installed">Afficher les accents pour les langues installées</string>
   <string name="pref_accents_e_selected">Afficher les accents pour la langue sélectionnée</string>
   <string name="pref_accents_e_none">Cacher les accents</string>
+  <string name="pref_show_numpad_title">Afficher le pavé numérique</string>
+  <string name="pref_show_numpad_never">Jamais</string>
+  <string name="pref_show_numpad_landscape">Seulement en mode paysage</string>
+  <string name="pref_show_numpad_always">Toujour</string>
   <string name="pref_autocapitalisation_title">Majuscule automatique</string>
   <string name="pref_autocapitalisation_summary">Active Shift au début des phrases</string>
   <string name="pref_category_typing">Saisie</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 74ad18f..7dc5a96 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -67,6 +67,16 @@
     <item>@string/pref_accents_e_selected</item>
     <item>@string/pref_accents_e_none</item>
   </string-array>
+  <string-array name="pref_show_numpad_values">
+    <item>never</item>
+    <item>landscape</item>
+    <item>always</item>
+  </string-array>
+  <string-array name="pref_show_numpad_entries">
+    <item>@string/pref_show_numpad_never</item>
+    <item>@string/pref_show_numpad_landscape</item>
+    <item>@string/pref_show_numpad_always</item>
+  </string-array>
   <string-array name="pref_accents_values">
     <item>1</item>
     <item>2</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 501aefc..9195670 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -10,6 +10,10 @@
   <string name="pref_accents_e_all_installed">Show accents for all installed languages</string>
   <string name="pref_accents_e_selected">Only show accents for the selected language</string>
   <string name="pref_accents_e_none">Hide accents</string>
+  <string name="pref_show_numpad_title">Show NumPad</string>
+  <string name="pref_show_numpad_never">Never</string>
+  <string name="pref_show_numpad_landscape">Only in landscape mode</string>
+  <string name="pref_show_numpad_always">Always</string>
   <string name="pref_autocapitalisation_title">Automatic capitalisation</string>
   <string name="pref_autocapitalisation_summary">Press Shift at the beginning of a sentence</string>
   <string name="pref_extra_keys_title">Add keys to the keyboard</string>
diff --git a/res/xml/numeric.xml b/res/xml/numeric.xml
index ba1081f..9e6bc69 100644
--- a/res/xml/numeric.xml
+++ b/res/xml/numeric.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard bottom_row="false" extra_keys="false">
+<keyboard bottom_row="false" extra_keys="false" num_pad="false">
   <row>
     <key width="0.75" key0="esc" key2="~" key4="!"/>
     <key width="0.75" key0="(" key2="[" key4="{"/>
diff --git a/res/xml/numpad.xml b/res/xml/numpad.xml
new file mode 100644
index 0000000..3ddb830
--- /dev/null
+++ b/res/xml/numpad.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<keyboard bottom_row="false">
+    <row>
+        <key key0="7"/>
+        <key key0="8"/>
+        <key key0="9"/>
+        <key key0="/"/>
+    </row>
+    <row>
+        <key key0="4"/>
+        <key key0="5"/>
+        <key key0="6"/>
+        <key key0="*"/>
+    </row>
+    <row>
+        <key key0="1"/>
+        <key key0="2"/>
+        <key key0="3"/>
+        <key key0="-"/>
+    </row>
+    <row height="0.95">
+        <key key0="0"/>
+        <key key0="."/>
+        <key key0="="/>
+        <key key0="+"/>
+    </row>
+</keyboard>
\ No newline at end of file
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index e91c460..93badef 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -3,6 +3,7 @@
   <PreferenceCategory android:title="@string/pref_category_layout">
     <ListPreference android:key="layout" android:title="@string/pref_layout_title" android:summary="%s" android:defaultValue="system" android:entries="@array/pref_layout_entries" android:entryValues="@array/pref_layout_values"/>
     <ListPreference android:key="accents" android:title="@string/pref_accents_title" android:summary="%s" android:defaultValue="1" android:entries="@array/pref_accents_entries" android:entryValues="@array/pref_accents_values"/>
+    <ListPreference android:key="show_numpad" android:title="@string/pref_show_numpad_title" android:summary="%s" android:defaultValue="1" android:entries="@array/pref_show_numpad_entries" android:entryValues="@array/pref_show_numpad_values"/>
     <ListPreference android:key="programming_layout" android:title="@string/pref_programming_layout_title" android:summary="%s" android:defaultValue="none" android:entries="@array/pref_programming_layout_entries" android:entryValues="@array/pref_programming_layout_values"/>
     <PreferenceScreen android:title="@string/pref_extra_keys_title">
       <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="0"/>