From 1cfecbdf48edb65cc0be8b017c8f389f91212a32 Mon Sep 17 00:00:00 2001
From: Jules Aguillon
Date: Sun, 19 Dec 2021 19:44:27 +0100
Subject: Auto-format Java and XML files

Use xmllint.
Re-indent Java files using spaces.
---
 res/layout/emoji_pane.xml  |  45 ++++-------------
 res/layout/keyboard.xml    |   5 +-
 res/values-land/dimens.xml |  14 +++---
 res/values/arrays.xml      |   2 -
 res/values/colors.xml      |  22 ++++-----
 res/values/dimens.xml      |  24 ++++-----
 res/values/strings.xml     |  52 +++++++++-----------
 res/values/styles.xml      |  34 ++++++-------
 res/xml/azerty.xml         |  82 +++++++++++++++----------------
 res/xml/method.xml         |  44 +++--------------
 res/xml/numeric.xml        |  50 +++++++++----------
 res/xml/qwerty.xml         |  82 +++++++++++++++----------------
 res/xml/settings.xml       | 120 ++++++++-------------------------------------
 13 files changed, 213 insertions(+), 363 deletions(-)

(limited to 'res')

diff --git a/res/layout/emoji_pane.xml b/res/layout/emoji_pane.xml
index 69cb507..2d249f3 100644
--- a/res/layout/emoji_pane.xml
+++ b/res/layout/emoji_pane.xml
@@ -1,38 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical"
-	android:hardwareAccelerated="false">
-	<juloo.keyboard2.EmojiGroupButtonsBar
-		android:orientation="horizontal"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content" />
-	<juloo.keyboard2.EmojiGridView
-		android:id="@+id/emoji_grid"
-		android:background="@color/bg"
-		android:layout_width="fill_parent"
-		android:layout_height="@dimen/emoji_grid_height"
-	/>
-	<LinearLayout
-		android:orientation="horizontal"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-	>
-		<juloo.keyboard2.EmojiKeyButton
-			style="@style/emojiKeyButton"
-			key="switch_back_emoji"
-		/>
-		<juloo.keyboard2.EmojiKeyButton
-			style="@style/emojiKeyButton"
-			android:layout_weight="4"
-			key="space"
-		/>
-		<juloo.keyboard2.EmojiKeyButton
-			style="@style/emojiKeyButton"
-			key="backspace"
-		/>
-		<juloo.keyboard2.EmojiKeyButton
-			style="@style/emojiKeyButton"
-			key="enter"
-		/>
-	</LinearLayout>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:hardwareAccelerated="false">
+  <juloo.keyboard2.EmojiGroupButtonsBar android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content"/>
+  <juloo.keyboard2.EmojiGridView android:id="@+id/emoji_grid" android:background="@color/bg" android:layout_width="fill_parent" android:layout_height="@dimen/emoji_grid_height"/>
+  <LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content">
+    <juloo.keyboard2.EmojiKeyButton style="@style/emojiKeyButton" key="switch_back_emoji"/>
+    <juloo.keyboard2.EmojiKeyButton style="@style/emojiKeyButton" android:layout_weight="4" key="space"/>
+    <juloo.keyboard2.EmojiKeyButton style="@style/emojiKeyButton" key="backspace"/>
+    <juloo.keyboard2.EmojiKeyButton style="@style/emojiKeyButton" key="enter"/>
+  </LinearLayout>
 </LinearLayout>
diff --git a/res/layout/keyboard.xml b/res/layout/keyboard.xml
index 98c390c..43b3e47 100644
--- a/res/layout/keyboard.xml
+++ b/res/layout/keyboard.xml
@@ -1,5 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<juloo.keyboard2.Keyboard2View xmlns:android="http://schemas.android.com/apk/res/android"
-	android:background="@color/bg"
-	android:hardwareAccelerated="false"
-/>
+<juloo.keyboard2.Keyboard2View xmlns:android="http://schemas.android.com/apk/res/android" android:background="@color/bg" android:hardwareAccelerated="false"/>
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index dcc4e54..9c908a4 100644
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<dimen name="horizontal_margin">12dp</dimen>
-	<dimen name="margin_bottom">3dp</dimen>
-	<dimen name="key_padding">3dp</dimen>
-	<dimen name="key_height">36dp</dimen>
-	<dimen name="label_text_size">18dp</dimen>
-	<dimen name="sublabel_text_size">11dp</dimen>
-	<dimen name="emoji_type_button_height">48dp</dimen>
+  <dimen name="horizontal_margin">12dp</dimen>
+  <dimen name="margin_bottom">3dp</dimen>
+  <dimen name="key_padding">3dp</dimen>
+  <dimen name="key_height">36dp</dimen>
+  <dimen name="label_text_size">18dp</dimen>
+  <dimen name="sublabel_text_size">11dp</dimen>
+  <dimen name="emoji_type_button_height">48dp</dimen>
 </resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 7e8a9bf..77be329 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -5,9 +5,7 @@
     <item>azerty</item>
     <item>qwerty</item>
   </string-array>
-
   <string name="pref_accents_default">1</string>
-
   <string-array name="pref_accents_entries">
     <item>@string/pref_accents_e_all_installed</item>
     <item>@string/pref_accents_e_selected</item>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index b3b128a..63d981b 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<item name="bg" type="color">#1B1B1B</item>
-	<item name="key_bg" type="color">#303030</item>
-	<item name="key_down_bg" type="color">#1B1B1B</item>
-	<item name="key_label" type="color">#FFFFFF</item>
-	<item name="key_label_locked" type="color">#229933</item>
-	<item name="key_label_activated" type="color">#226b99</item>
-	<item name="key_sub_label" type="color">#A0A0A0</item>
-	<item name="emoji_button_bg" type="color">#202020</item>
-	<item name="emoji_color" type="color">#FFFFFF</item>
-	<item name="emoji_key_bg" type="color">@color/emoji_button_bg</item>
-	<item name="emoji_key_text" type="color">@color/key_label</item>
+  <item name="bg" type="color">#1B1B1B</item>
+  <item name="key_bg" type="color">#303030</item>
+  <item name="key_down_bg" type="color">#1B1B1B</item>
+  <item name="key_label" type="color">#FFFFFF</item>
+  <item name="key_label_locked" type="color">#229933</item>
+  <item name="key_label_activated" type="color">#226b99</item>
+  <item name="key_sub_label" type="color">#A0A0A0</item>
+  <item name="emoji_button_bg" type="color">#202020</item>
+  <item name="emoji_color" type="color">#FFFFFF</item>
+  <item name="emoji_key_bg" type="color">@color/emoji_button_bg</item>
+  <item name="emoji_key_text" type="color">@color/key_label</item>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 355c3a1..a8286cb 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<dimen name="horizontal_margin">3dp</dimen>
-	<dimen name="margin_top">3dp</dimen>
-	<dimen name="margin_bottom">7dp</dimen>
-	<dimen name="key_padding">2dp</dimen>
-	<dimen name="key_vertical_interval">2dp</dimen>
-	<dimen name="key_horizontal_interval">2dp</dimen>
-	<dimen name="key_height">51dp</dimen>
-	<dimen name="key_round">5dp</dimen>
-	<dimen name="label_text_size">18dp</dimen>
-	<dimen name="sublabel_text_size">12dp</dimen>
-	<dimen name="emoji_type_button_height">56dp</dimen>
-	<dimen name="emoji_grid_height">250dp</dimen>
+  <dimen name="horizontal_margin">3dp</dimen>
+  <dimen name="margin_top">3dp</dimen>
+  <dimen name="margin_bottom">7dp</dimen>
+  <dimen name="key_padding">2dp</dimen>
+  <dimen name="key_vertical_interval">2dp</dimen>
+  <dimen name="key_horizontal_interval">2dp</dimen>
+  <dimen name="key_height">51dp</dimen>
+  <dimen name="key_round">5dp</dimen>
+  <dimen name="label_text_size">18dp</dimen>
+  <dimen name="sublabel_text_size">12dp</dimen>
+  <dimen name="emoji_type_button_height">56dp</dimen>
+  <dimen name="emoji_grid_height">250dp</dimen>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 688667f..ce753cf 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-	<string name="app_name">Unexpected Keyboard</string>
-
-	<string name="settings_activity_label">Unexpected Keyboard Settings</string>
-
+  <string name="app_name">Unexpected Keyboard</string>
+  <string name="settings_activity_label">Unexpected Keyboard Settings</string>
   <string name="subtype_label">%s</string>
-
-	<string name="pref_category_layout">Layout</string>
+  <string name="pref_category_layout">Layout</string>
   <string name="pref_layout_title">Change keyboard layout</string>
   <string name="pref_layout_summary">%s</string>
   <string-array name="pref_layout_entries">
@@ -15,37 +11,33 @@
     <item>Azerty</item>
     <item>Qwerty</item>
   </string-array>
-
   <string name="pref_accents_title">Accents</string>
   <string name="pref_accents_summary">%s</string>
   <string name="pref_accents_e_all_installed">Show accents for all the installed languages</string>
   <string name="pref_accents_e_selected">Show accents for the selected language</string>
   <string name="pref_accents_e_all">Show every accents</string>
   <string name="pref_accents_e_none">Hide accents</string>
-
-	<string name="pref_category_typing">Typing</string>
-	<string name="pref_preci_title">Precision</string>
-	<string name="pref_preci_summary">Distance of corner values (%spx)</string>
-	<string name="pref_long_timeout_title">Long press timeout</string>
-	<string name="pref_long_timeout_summary">%sms</string>
-	<string name="pref_long_interval_title">Long press interval</string>
-	<string name="pref_long_interval_summary">%sms</string>
-
-	<string name="pref_category_vibrate">Vibration</string>
-	<string name="pref_vibrate_title">Vibration</string>
-	<string name="pref_vibrate_summary">Enable/Disable vibrations on key down</string>
-	<string name="pref_vibrate_duration_title">Duration</string>
-	<string name="pref_vibrate_duration_summary">%sms</string>
+  <string name="pref_category_typing">Typing</string>
+  <string name="pref_preci_title">Precision</string>
+  <string name="pref_preci_summary">Distance of corner values (%spx)</string>
+  <string name="pref_long_timeout_title">Long press timeout</string>
+  <string name="pref_long_timeout_summary">%sms</string>
+  <string name="pref_long_interval_title">Long press interval</string>
+  <string name="pref_long_interval_summary">%sms</string>
+  <string name="pref_category_vibrate">Vibration</string>
+  <string name="pref_vibrate_title">Vibration</string>
+  <string name="pref_vibrate_summary">Enable/Disable vibrations on key down</string>
+  <string name="pref_vibrate_duration_title">Duration</string>
+  <string name="pref_vibrate_duration_summary">%sms</string>
   <string name="pref_precise_repeat_title">Precise cursor movements</string>
   <string name="pref_precise_repeat_summary">Modulate the speed of movements by swiping more or less</string>
-
-	<string name="pref_category_style">Style</string>
-	<string name="pref_margin_bottom_title">Margin bottom</string>
-	<string name="pref_margin_bottom_summary">%sdp</string>
-	<string name="pref_key_height_title">Key height</string>
-	<string name="pref_key_height_summary">%sdp</string>
-	<string name="pref_horizontal_margin_title">Horizontal margin</string>
-	<string name="pref_horizontal_margin_summary">%sdp</string>
+  <string name="pref_category_style">Style</string>
+  <string name="pref_margin_bottom_title">Margin bottom</string>
+  <string name="pref_margin_bottom_summary">%sdp</string>
+  <string name="pref_key_height_title">Key height</string>
+  <string name="pref_key_height_summary">%sdp</string>
+  <string name="pref_horizontal_margin_title">Horizontal margin</string>
+  <string name="pref_horizontal_margin_summary">%sdp</string>
   <string name="pref_character_size_title">Label size</string>
   <string name="pref_character_size_summary">Size of characters displayed on the keyboard (%.2fx)</string>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 050b926..7dcbb33 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<style name="emojiTypeButton">
-		<item name="android:padding">1px</item>
-		<item name="android:gravity">center</item>
-		<item name="android:minHeight">@dimen/label_text_size</item>
-		<item name="android:background">@color/emoji_button_bg</item>
-		<item name="android:textColor">@color/emoji_key_text</item>
-		<item name="android:textSize">@dimen/label_text_size</item>
-	</style>
-	<style name="emojiKeyButton">
-		<item name="android:layout_width">0px</item>
-		<item name="android:layout_height">wrap_content</item>
-		<item name="android:layout_weight">1</item>
-		<item name="android:padding">0px</item>
-		<item name="android:background">@color/emoji_key_bg</item>
-		<item name="android:textColor">@color/emoji_key_text</item>
-		<item name="android:textSize">@dimen/label_text_size</item>
-	</style>
+  <style name="emojiTypeButton">
+    <item name="android:padding">1px</item>
+    <item name="android:gravity">center</item>
+    <item name="android:minHeight">@dimen/label_text_size</item>
+    <item name="android:background">@color/emoji_button_bg</item>
+    <item name="android:textColor">@color/emoji_key_text</item>
+    <item name="android:textSize">@dimen/label_text_size</item>
+  </style>
+  <style name="emojiKeyButton">
+    <item name="android:layout_width">0px</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_weight">1</item>
+    <item name="android:padding">0px</item>
+    <item name="android:background">@color/emoji_key_bg</item>
+    <item name="android:textColor">@color/emoji_key_text</item>
+    <item name="android:textSize">@dimen/label_text_size</item>
+  </style>
 </resources>
diff --git a/res/xml/azerty.xml b/res/xml/azerty.xml
index f9ca3ea..ae079f0 100644
--- a/res/xml/azerty.xml
+++ b/res/xml/azerty.xml
@@ -1,44 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard>
-	<row>
-		<key key0="a" key1="esc" key2="1" key3="&amp;" />
-		<key key0="z" key2="2" key4="~" />
-		<key key0="e" key2="3" key3="&quot;" key4="\#" />
-		<key key0="r" key2="4" key3="'" />
-		<key key0="t" key2="5" key3="(" key4=")" />
-		<key key0="y" key2="6" key3="-" key4="|" />
-		<key key0="u" key2="7" key4="`" />
-		<key key0="i" key2="8" key3="_" key4="\\" />
-		<key key0="o" key2="9" />
-		<key key0="p" key2="0" key4="\@" />
-	</row>
-	<row>
-		<key key0="q" key1="tab" />
-		<key key0="s" key1="accent_ring" />
-		<key key0="d" key1="accent_grave" key3="accent_aigu" />
-    <key key0="f" key3="{" key4="}" />
-		<key key0="g" key3="[" key4="]" />
-		<key key0="h" key3="=" key4="+" />
-		<key key0="j" key1="accent_trema" key2="accent_circonflexe" key3="^" />
-		<key key0="k" key2="€" key3="$" key4="£" />
-		<key key0="l" key2="%" />
-		<key key0="m" key4="*" />
-	</row>
-	<row>
-		<key width="2.0" key0="shift" />
-		<key key0="w" key3="&lt;" key4="&gt;" />
-		<key key0="x" />
-		<key key0="c" key1="accent_cedille" key3="," key4="\?" />
-		<key key0="v" key3=";" key4="." />
-		<key key0="b" key3=":" key4="/" />
-		<key key0="n" key1="accent_tilde" key2="§" key4="!" />
-		<key width="2.0" key0="backspace" key2="delete" />
-	</row>
-	<row height="0.95">
-		<key width="1.8" key0="ctrl" key3="switch_numeric" />
-		<key width="1.2" key0="alt" key1="fn" key2="change_method" key3="switch_emoji" key4="config" />
-		<key width="4.0" key0="space" />
-		<key width="1.2" key1="up" key2="right" key3="left" key4="down" />
-		<key width="1.8" key0="enter" />
-	</row>
+  <row>
+    <key key0="a" key1="esc" key2="1" key3="&amp;"/>
+    <key key0="z" key2="2" key4="~"/>
+    <key key0="e" key2="3" key3="&quot;" key4="\#"/>
+    <key key0="r" key2="4" key3="'"/>
+    <key key0="t" key2="5" key3="(" key4=")"/>
+    <key key0="y" key2="6" key3="-" key4="|"/>
+    <key key0="u" key2="7" key4="`"/>
+    <key key0="i" key2="8" key3="_" key4="\\"/>
+    <key key0="o" key2="9"/>
+    <key key0="p" key2="0" key4="\@"/>
+  </row>
+  <row>
+    <key key0="q" key1="tab"/>
+    <key key0="s" key1="accent_ring"/>
+    <key key0="d" key1="accent_grave" key3="accent_aigu"/>
+    <key key0="f" key3="{" key4="}"/>
+    <key key0="g" key3="[" key4="]"/>
+    <key key0="h" key3="=" key4="+"/>
+    <key key0="j" key1="accent_trema" key2="accent_circonflexe" key3="^"/>
+    <key key0="k" key2="€" key3="$" key4="£"/>
+    <key key0="l" key2="%"/>
+    <key key0="m" key4="*"/>
+  </row>
+  <row>
+    <key width="2.0" key0="shift"/>
+    <key key0="w" key3="&lt;" key4="&gt;"/>
+    <key key0="x"/>
+    <key key0="c" key1="accent_cedille" key3="," key4="\?"/>
+    <key key0="v" key3=";" key4="."/>
+    <key key0="b" key3=":" key4="/"/>
+    <key key0="n" key1="accent_tilde" key2="§" key4="!"/>
+    <key width="2.0" key0="backspace" key2="delete"/>
+  </row>
+  <row height="0.95">
+    <key width="1.8" key0="ctrl" key3="switch_numeric"/>
+    <key width="1.2" key0="alt" key1="fn" key2="change_method" key3="switch_emoji" key4="config"/>
+    <key width="4.0" key0="space"/>
+    <key width="1.2" key1="up" key2="right" key3="left" key4="down"/>
+    <key width="1.8" key0="enter"/>
+  </row>
 </keyboard>
diff --git a/res/xml/method.xml b/res/xml/method.xml
index 0698beb..30097e2 100644
--- a/res/xml/method.xml
+++ b/res/xml/method.xml
@@ -1,40 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<input-method xmlns:android="http://schemas.android.com/apk/res/android"
-		android:settingsActivity="juloo.keyboard2.SettingsActivity"
-		android:supportsSwitchingToNextInputMethod="true">
-  <subtype android:label="@string/subtype_label"
-      android:languageTag="en"
-      android:imeSubtypeLocale="en_US"
-      android:imeSubtypeMode="keyboard"
-      android:isAsciiCapable="true"
-      android:imeSubtypeExtraValue="default_layout=qwerty"
-    />
-  <subtype android:label="@string/subtype_label"
-      android:languageTag="fr"
-      android:imeSubtypeLocale="fr_FR"
-      android:imeSubtypeMode="keyboard"
-      android:isAsciiCapable="true"
-      android:imeSubtypeExtraValue="default_layout=azerty,accents=grave|aigu|circonflexe|cedille|trema"
-    />
-  <subtype android:label="@string/subtype_label"
-      android:languageTag="es"
-      android:imeSubtypeLocale="es_ES"
-      android:imeSubtypeMode="keyboard"
-      android:isAsciiCapable="true"
-      android:imeSubtypeExtraValue="default_layout=qwerty,accents=aigu|tilde|trema"
-    />
-  <subtype android:label="@string/subtype_label"
-      android:languageTag="it"
-      android:imeSubtypeLocale="it_IT"
-      android:imeSubtypeMode="keyboard"
-      android:isAsciiCapable="true"
-      android:imeSubtypeExtraValue="default_layout=qwerty,accents=grave|aigu"
-    />
-  <subtype android:label="@string/subtype_label"
-      android:languageTag="sv"
-      android:imeSubtypeLocale="sv_SE"
-      android:imeSubtypeMode="keyboard"
-      android:isAsciiCapable="true"
-      android:imeSubtypeExtraValue="default_layout=qwerty,accents=aigu|trema|ring"
-    />
+<input-method xmlns:android="http://schemas.android.com/apk/res/android" android:settingsActivity="juloo.keyboard2.SettingsActivity" android:supportsSwitchingToNextInputMethod="true">
+  <subtype android:label="@string/subtype_label" android:languageTag="en" android:imeSubtypeLocale="en_US" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty"/>
+  <subtype android:label="@string/subtype_label" android:languageTag="fr" android:imeSubtypeLocale="fr_FR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=azerty,accents=grave|aigu|circonflexe|cedille|trema"/>
+  <subtype android:label="@string/subtype_label" android:languageTag="es" android:imeSubtypeLocale="es_ES" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty,accents=aigu|tilde|trema"/>
+  <subtype android:label="@string/subtype_label" android:languageTag="it" android:imeSubtypeLocale="it_IT" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty,accents=grave|aigu"/>
+  <subtype android:label="@string/subtype_label" android:languageTag="sv" android:imeSubtypeLocale="sv_SE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty,accents=aigu|trema|ring"/>
 </input-method>
diff --git a/res/xml/numeric.xml b/res/xml/numeric.xml
index 0d235bd..3e37501 100644
--- a/res/xml/numeric.xml
+++ b/res/xml/numeric.xml
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard>
   <row>
-    <key width="0.75" key0="esc" key2="~" key4="!" />
-    <key width="0.75" key0="(" key2="[" key4="{" />
-    <key key0="7" key3="&lt;" key4="&gt;" />
-    <key key0="8" key2="∞" />
-    <key key0="9" key2="π" />
-    <key width="0.75" key0="*" key1="√" key2="×" />
-    <key width="0.75" key0="/" key1="%" key3="÷" />
+    <key width="0.75" key0="esc" key2="~" key4="!"/>
+    <key width="0.75" key0="(" key2="[" key4="{"/>
+    <key key0="7" key3="&lt;" key4="&gt;"/>
+    <key key0="8" key2="∞"/>
+    <key key0="9" key2="π"/>
+    <key width="0.75" key0="*" key1="√" key2="×"/>
+    <key width="0.75" key0="/" key1="%" key3="÷"/>
   </row>
   <row>
-    <key width="0.75" key0="tab" key1=";" key2="|" key4="\\" />
-    <key width="0.75" key0=")" key2="]" key4="}" />
-    <key key0="4" />
-    <key key0="5" key1="up" key2="right" key3="left" key4="down" />
-    <key key0="6" />
-    <key width="0.75" key0="+" key1="Σ" key2="$" />
-    <key width="0.75" key0="-" key2="^" />
+    <key width="0.75" key0="tab" key1=";" key2="|" key4="\\"/>
+    <key width="0.75" key0=")" key2="]" key4="}"/>
+    <key key0="4"/>
+    <key key0="5" key1="up" key2="right" key3="left" key4="down"/>
+    <key key0="6"/>
+    <key width="0.75" key0="+" key1="Σ" key2="$"/>
+    <key width="0.75" key0="-" key2="^"/>
   </row>
   <row>
-    <key shift="0.35" width="1.15" key0="shift" key2="fn" key4="alt" />
-    <key key0="1" key1="superscript" key3="subscript" />
-    <key key0="2" />
-    <key key0="3" />
-    <key width="1.15" key0="backspace" key2="delete" />
+    <key shift="0.35" width="1.15" key0="shift" key2="fn" key4="alt"/>
+    <key key0="1" key1="superscript" key3="subscript"/>
+    <key key0="2"/>
+    <key key0="3"/>
+    <key width="1.15" key0="backspace" key2="delete"/>
   </row>
-	<row height="0.95">
-    <key width="1.5" key0="ctrl" key3="switch_text" />
-    <key width="1.5" key0="0" />
-    <key width="0.75" key0="." key2="," />
-    <key width="0.75" key0="space" key1="&quot;" key2="'" key4="_" />
-    <key width="1.5" key0="enter" key2="±" key3="=" />
+  <row height="0.95">
+    <key width="1.5" key0="ctrl" key3="switch_text"/>
+    <key width="1.5" key0="0"/>
+    <key width="0.75" key0="." key2=","/>
+    <key width="0.75" key0="space" key1="&quot;" key2="'" key4="_"/>
+    <key width="1.5" key0="enter" key2="±" key3="="/>
   </row>
 </keyboard>
diff --git a/res/xml/qwerty.xml b/res/xml/qwerty.xml
index bde9f02..297e0e7 100644
--- a/res/xml/qwerty.xml
+++ b/res/xml/qwerty.xml
@@ -1,44 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard>
-	<row>
-		<key key0="q" key1="esc" key2="1" key3="~" key4="!" />
-		<key key0="w" key2="2" key3="\@" />
-		<key key0="e" key2="3" key3="\#" />
-		<key key0="r" key2="4" key3="$" />
-		<key key0="t" key2="5" key3="%" />
-		<key key0="y" key2="6" key3="^" />
-		<key key0="u" key2="7" key3="&amp;" />
-		<key key0="i" key2="8" key3="*" />
-		<key key0="o" key2="9" key3="(" key4=")" />
-		<key key0="p" key2="0" />
-	</row>
-	<row>
-		<key shift="0.5" key0="a" key1="tab" key2="`" />
-		<key key0="s" key1="accent_ring" />
-		<key key0="d" key1="accent_grave" key3="accent_aigu" />
-		<key key0="f" />
-		<key key0="g" key2="-" key3="_" />
-		<key key0="h" key2="=" key3="+" />
-		<key key0="j" key1="accent_trema" key2="accent_circonflexe" key4="}" key3="{" />
-		<key key0="k" key4="]" key3="[" />
-		<key key0="l" key2="|" key3="\\" />
-	</row>
-	<row>
-		<key width="1.5" key0="shift" />
-		<key key0="z" />
-		<key key0="x" />
-		<key key0="c" key1="accent_cedille" key2="&lt;" key3="." />
-		<key key0="v" key2="&gt;" key3="," />
-		<key key0="b" key2="\?" key3="/" />
-		<key key0="n" key1="accent_tilde" key2=":" key3=";" />
-		<key key0="m" key2="&quot;" key3="'" />
-		<key width="1.5" key0="backspace" key2="delete" />
-	</row>
-	<row height="0.95">
-		<key width="1.8" key0="ctrl" key3="switch_numeric" />
-		<key width="1.2" key0="alt" key1="fn" key2="change_method" key3="switch_emoji" key4="config" />
-		<key width="4.0" key0="space" />
-		<key width="1.2" key1="up" key2="right" key3="left" key4="down" />
-		<key width="1.8" key0="enter" />
-	</row>
+  <row>
+    <key key0="q" key1="esc" key2="1" key3="~" key4="!"/>
+    <key key0="w" key2="2" key3="\@"/>
+    <key key0="e" key2="3" key3="\#"/>
+    <key key0="r" key2="4" key3="$"/>
+    <key key0="t" key2="5" key3="%"/>
+    <key key0="y" key2="6" key3="^"/>
+    <key key0="u" key2="7" key3="&amp;"/>
+    <key key0="i" key2="8" key3="*"/>
+    <key key0="o" key2="9" key3="(" key4=")"/>
+    <key key0="p" key2="0"/>
+  </row>
+  <row>
+    <key shift="0.5" key0="a" key1="tab" key2="`"/>
+    <key key0="s" key1="accent_ring"/>
+    <key key0="d" key1="accent_grave" key3="accent_aigu"/>
+    <key key0="f"/>
+    <key key0="g" key2="-" key3="_"/>
+    <key key0="h" key2="=" key3="+"/>
+    <key key0="j" key1="accent_trema" key2="accent_circonflexe" key4="}" key3="{"/>
+    <key key0="k" key4="]" key3="["/>
+    <key key0="l" key2="|" key3="\\"/>
+  </row>
+  <row>
+    <key width="1.5" key0="shift"/>
+    <key key0="z"/>
+    <key key0="x"/>
+    <key key0="c" key1="accent_cedille" key2="&lt;" key3="."/>
+    <key key0="v" key2="&gt;" key3=","/>
+    <key key0="b" key2="\?" key3="/"/>
+    <key key0="n" key1="accent_tilde" key2=":" key3=";"/>
+    <key key0="m" key2="&quot;" key3="'"/>
+    <key width="1.5" key0="backspace" key2="delete"/>
+  </row>
+  <row height="0.95">
+    <key width="1.8" key0="ctrl" key3="switch_numeric"/>
+    <key width="1.2" key0="alt" key1="fn" key2="change_method" key3="switch_emoji" key4="config"/>
+    <key width="4.0" key0="space"/>
+    <key width="1.2" key1="up" key2="right" key3="left" key4="down"/>
+    <key width="1.8" key0="enter"/>
+  </row>
 </keyboard>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index a581896..568b6c1 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -1,102 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-	<PreferenceCategory android:title="@string/pref_category_layout">
-    <ListPreference
-      android:key="layout"
-      android:title="@string/pref_layout_title"
-      android:summary="@string/pref_layout_summary"
-      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="@string/pref_accents_summary"
-      android:defaultValue="@string/pref_accents_default"
-      android:entries="@array/pref_accents_entries"
-      android:entryValues="@array/pref_accents_values" />
-	</PreferenceCategory>
-	<PreferenceCategory android:title="@string/pref_category_typing">
-		<juloo.common.SlideBarPreference
-			android:key="sub_value_dist"
-			android:title="@string/pref_preci_title"
-			android:summary="@string/pref_preci_summary"
-			android:defaultValue="10.0"
-			min="5.0"
-			max="25.0"
-		/>
-		<juloo.common.IntSlideBarPreference
-			android:key="longpress_timeout"
-			android:title="@string/pref_long_timeout_title"
-			android:summary="@string/pref_long_timeout_summary"
-			android:defaultValue="600"
-			min="50"
-			max="2000"
-		/>
-		<juloo.common.IntSlideBarPreference
-			android:key="longpress_interval"
-			android:title="@string/pref_long_interval_title"
-			android:summary="@string/pref_long_interval_summary"
-			android:defaultValue="25"
-			min="5"
-			max="100"
-		/>
-    <CheckBoxPreference
-      android:key="precise_repeat"
-      android:title="@string/pref_precise_repeat_title"
-      android:summary="@string/pref_precise_repeat_summary"
-      android:defaultValue="true"
-    />
-	</PreferenceCategory>
-	<PreferenceCategory android:title="@string/pref_category_vibrate">
-		<CheckBoxPreference
-			android:key="vibrate_enabled"
-			android:title="@string/pref_vibrate_title"
-			android:summary="@string/pref_vibrate_summary"
-			android:defaultValue="true"
-		/>
-		<juloo.common.IntSlideBarPreference
-			android:key="vibrate_duration"
-			android:title="@string/pref_vibrate_duration_title"
-			android:summary="@string/pref_vibrate_duration_summary"
-			android:defaultValue="20"
-			min="5"
-			max="50"
-		/>
-	</PreferenceCategory>
-	<PreferenceCategory android:title="@string/pref_category_style">
-		<juloo.common.IntSlideBarPreference
-			android:key="margin_bottom"
-			android:title="@string/pref_margin_bottom_title"
-			android:summary="@string/pref_margin_bottom_summary"
-			android:defaultValue="5"
-			min="0"
-			max="100"
-		/>
-		<juloo.common.IntSlideBarPreference
-			android:key="key_height"
-			android:title="@string/pref_key_height_title"
-			android:summary="@string/pref_key_height_summary"
-			android:defaultValue="50"
-			min="30"
-			max="90"
-		/>
-		<juloo.common.IntSlideBarPreference
-			android:key="horizontal_margin"
-			android:title="@string/pref_horizontal_margin_title"
-			android:summary="@string/pref_horizontal_margin_summary"
-			android:defaultValue="3"
-			min="0"
-			max="20"
-		/>
-		<juloo.common.SlideBarPreference
-			android:key="character_size"
-			android:title="@string/pref_character_size_title"
-			android:summary="@string/pref_character_size_summary"
-			android:defaultValue="1.0"
-			min="0.8"
-			max="1.2"
-    />
-	</PreferenceCategory>
+  <PreferenceCategory android:title="@string/pref_category_layout">
+    <ListPreference android:key="layout" android:title="@string/pref_layout_title" android:summary="@string/pref_layout_summary" android:defaultValue="system" android:entries="@array/pref_layout_entries" android:entryValues="@array/pref_layout_values"/>
+    /&gt;
+    <ListPreference android:key="accents" android:title="@string/pref_accents_title" android:summary="@string/pref_accents_summary" android:defaultValue="@string/pref_accents_default" android:entries="@array/pref_accents_entries" android:entryValues="@array/pref_accents_values"/>
+  </PreferenceCategory>
+  <PreferenceCategory android:title="@string/pref_category_typing">
+    <juloo.common.SlideBarPreference android:key="sub_value_dist" android:title="@string/pref_preci_title" android:summary="@string/pref_preci_summary" android:defaultValue="10.0" min="5.0" max="25.0"/>
+    <juloo.common.IntSlideBarPreference android:key="longpress_timeout" android:title="@string/pref_long_timeout_title" android:summary="@string/pref_long_timeout_summary" android:defaultValue="600" min="50" max="2000"/>
+    <juloo.common.IntSlideBarPreference android:key="longpress_interval" android:title="@string/pref_long_interval_title" android:summary="@string/pref_long_interval_summary" android:defaultValue="25" min="5" max="100"/>
+    <CheckBoxPreference android:key="precise_repeat" android:title="@string/pref_precise_repeat_title" android:summary="@string/pref_precise_repeat_summary" android:defaultValue="true"/>
+  </PreferenceCategory>
+  <PreferenceCategory android:title="@string/pref_category_vibrate">
+    <CheckBoxPreference android:key="vibrate_enabled" android:title="@string/pref_vibrate_title" android:summary="@string/pref_vibrate_summary" android:defaultValue="true"/>
+    <juloo.common.IntSlideBarPreference android:key="vibrate_duration" android:title="@string/pref_vibrate_duration_title" android:summary="@string/pref_vibrate_duration_summary" android:defaultValue="20" min="5" max="50"/>
+  </PreferenceCategory>
+  <PreferenceCategory android:title="@string/pref_category_style">
+    <juloo.common.IntSlideBarPreference android:key="margin_bottom" android:title="@string/pref_margin_bottom_title" android:summary="@string/pref_margin_bottom_summary" android:defaultValue="5" min="0" max="100"/>
+    <juloo.common.IntSlideBarPreference android:key="key_height" android:title="@string/pref_key_height_title" android:summary="@string/pref_key_height_summary" android:defaultValue="50" min="30" max="90"/>
+    <juloo.common.IntSlideBarPreference android:key="horizontal_margin" android:title="@string/pref_horizontal_margin_title" android:summary="@string/pref_horizontal_margin_summary" android:defaultValue="3" min="0" max="20"/>
+    <juloo.common.SlideBarPreference android:key="character_size" android:title="@string/pref_character_size_title" android:summary="@string/pref_character_size_summary" android:defaultValue="1.0" min="0.8" max="1.2"/>
+  </PreferenceCategory>
 </PreferenceScreen>
-- 
cgit v1.2.3