From 046416389af577844665ddca30adad3798a74e29 Mon Sep 17 00:00:00 2001
From: Jules Aguillon
Date: Sun, 15 Jan 2023 19:37:03 +0100
Subject: Present the "keyboard height" option similarly to the margin options

---
 res/values-cs/strings.xml     | 1 -
 res/values-de/strings.xml     | 1 -
 res/values-es/strings.xml     | 1 -
 res/values-fr/strings.xml     | 1 -
 res/values-it/strings.xml     | 1 -
 res/values-ko/strings.xml     | 1 -
 res/values-lv/strings.xml     | 1 -
 res/values-pl/strings.xml     | 1 -
 res/values-pt/strings.xml     | 1 -
 res/values-ru/strings.xml     | 1 -
 res/values-tr/strings.xml     | 1 -
 res/values-zh-rCN/strings.xml | 1 -
 res/values/strings.xml        | 1 -
 res/xml/settings.xml          | 6 ++++--
 14 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 62d0e0a..4af7efb 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -43,7 +43,6 @@
   <string name="pref_category_style">Styl</string>
   <string name="pref_margin_bottom_title">Spodní odsazení</string>
   <string name="pref_keyboard_height_title">Výška klávesnice</string>
-  <string name="pref_keyboard_height_landscape_title">Výška klávesnice v režimu na šířku</string>
   <string name="pref_horizontal_margin_title">Boční odsazení</string>
   <string name="pref_character_size_title">Velikost znaků</string>
   <string name="pref_character_size_summary">Velikost znaků zobrazených na klávesnici (%.2fx)</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index ef9c6a9..c51e52f 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -43,7 +43,6 @@
   <string name="pref_category_style">Design</string>
   <string name="pref_margin_bottom_title">Unterer Abstand</string>
   <string name="pref_keyboard_height_title">Höhe der Tastatur</string>
-  <string name="pref_keyboard_height_landscape_title">Höhe der Tastatur im Querformat</string>
   <string name="pref_horizontal_margin_title">Horizontaler Abstand</string>
   <string name="pref_character_size_title">Größe der Beschriftung</string>
   <string name="pref_character_size_summary">Größe der Buchstaben auf den Tasten (%.2fx)</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 5fb0427..6d35522 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -43,7 +43,6 @@
   <string name="pref_category_style">Estilo</string>
   <string name="pref_margin_bottom_title">Margen del pie</string>
   <string name="pref_keyboard_height_title">Altura del teclado</string>
-  <!-- <string name="pref_keyboard_height_landscape_title">Keyboard height in landscape mode</string> -->
   <string name="pref_horizontal_margin_title">Margen horizontal</string>
   <string name="pref_character_size_title">Tamaño de etiqueta</string>
   <string name="pref_character_size_summary">Tamaño de caracteres mostrados en el teclado (%.2fx)</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 8248fbd..6f6e221 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -43,7 +43,6 @@
   <string name="pref_category_style">Style</string>
   <string name="pref_margin_bottom_title">Marge du bas</string>
   <string name="pref_keyboard_height_title">Hauteur du clavier</string>
-  <string name="pref_keyboard_height_landscape_title">Hauteur du clavier en mode paysage</string>
   <string name="pref_horizontal_margin_title">Marge des côtés</string>
   <string name="pref_character_size_title">Taille des symboles</string>
   <string name="pref_character_size_summary">Taille des caractères affichés sur les touches (%.2fx)</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 34fe69f..a0374ce 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -43,7 +43,6 @@
   <string name="pref_category_style">Stile</string>
   <string name="pref_margin_bottom_title">Margine inferiore</string>
   <string name="pref_keyboard_height_title">Altezza tastiera</string>
-  <string name="pref_keyboard_height_landscape_title">Altezza tastiera in modalità orizzontale</string>
   <string name="pref_horizontal_margin_title">Margine orizzontale</string>
   <string name="pref_character_size_title">Dimensione Caratteri</string>
   <string name="pref_character_size_summary">Dimensione dei caratteri mostrati sulla tastiera (%.2fx)</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 61df5e6..22184c2 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -43,7 +43,6 @@
   <string name="pref_category_style">스타일</string>
   <string name="pref_margin_bottom_title">아래 넓이</string>
   <string name="pref_keyboard_height_title">키보드 높이</string>
-  <!-- <string name="pref_keyboard_height_landscape_title">Keyboard height in landscape mode</string> -->
   <string name="pref_horizontal_margin_title">양 옆 넓이</string>
   <string name="pref_character_size_title">폰트 크기</string>
   <string name="pref_character_size_summary">키보드의 표시되는 폰트 크기 (%.2fx)</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 18f1293..1eaddf1 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -43,7 +43,6 @@
   <string name="pref_category_style">Izskata pielāgojumi</string>
   <string name="pref_margin_bottom_title">Apakšējā apmale</string>
   <string name="pref_keyboard_height_title">Tastatūras augstums</string>
-  <string name="pref_keyboard_height_landscape_title">Tastatūras augstums guleniski</string>
   <string name="pref_horizontal_margin_title">Līmeniskā apmale</string>
   <string name="pref_character_size_title">Iezīmes izmērs</string>
   <string name="pref_character_size_summary">Tastatūrā attēloto rakstzīmju izmērs (%.2fx)</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index d861391..f4482e6 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -43,7 +43,6 @@
   <string name="pref_category_style">Styl</string>
   <string name="pref_margin_bottom_title">Margines dolny</string>
   <string name="pref_keyboard_height_title">Wysokość klawiatury</string>
-  <string name="pref_keyboard_height_landscape_title">Wysokość klawiatury w orientacji poziomej</string>
   <string name="pref_horizontal_margin_title">Margines poziomy</string>
   <string name="pref_character_size_title">Wielkość znaku</string>
   <string name="pref_character_size_summary">Wielkość znaków widocznych na klawiaturze (%.2fx)</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 382346a..a52ccc5 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -43,7 +43,6 @@
   <string name="pref_category_style">Estilo</string>
   <string name="pref_margin_bottom_title">Margem inferior</string>
   <string name="pref_keyboard_height_title">Altura do teclado</string>
-  <string name="pref_keyboard_height_landscape_title">Altura do teclado em modo paisagem</string>
   <string name="pref_horizontal_margin_title">Margem horizontal</string>
   <string name="pref_character_size_title">Tamanho dos indicadores</string>
   <string name="pref_character_size_summary">Tamanho dos caracteres visíveis no teclado (%.2fx)</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index d4346b4..a606d70 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -43,7 +43,6 @@
   <string name="pref_category_style">Стиль</string>
   <string name="pref_margin_bottom_title">Нижняя граница поля</string>
   <string name="pref_keyboard_height_title">Высота клавиатуры</string>
-  <string name="pref_keyboard_height_landscape_title">Высота клавиатуры в ландшафтном режиме</string>
   <string name="pref_horizontal_margin_title">Горизонтальное поле</string>
   <string name="pref_character_size_title">Размер символов</string>
   <string name="pref_character_size_summary">Размер символов, отображаемых на клавиатуре (%.2fx)</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index aa3798e..dc0a8d3 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -43,7 +43,6 @@
   <string name="pref_category_style">Stil</string>
   <string name="pref_margin_bottom_title">Alt boşluk</string>
   <string name="pref_keyboard_height_title">Klavye yüksekliği</string>
-  <!-- <string name="pref_keyboard_height_landscape_title">Keyboard height in landscape mode</string> -->
   <string name="pref_horizontal_margin_title">Yatay boşluk</string>
   <string name="pref_character_size_title">Etiket boyutu</string>
   <string name="pref_character_size_summary">Klavye üzerinde gösterilecek karakter boyutu (%.2fx)</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index e03ddfb..fa6c4a5 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -43,7 +43,6 @@
   <string name="pref_category_style">样式</string>
   <string name="pref_margin_bottom_title">键盘下边距</string>
   <string name="pref_keyboard_height_title">键盘高度</string>
-  <string name="pref_keyboard_height_landscape_title">键盘高度（横屏模式）</string>
   <string name="pref_horizontal_margin_title">键盘左右边距</string>
   <string name="pref_character_size_title">字符大小</string>
   <string name="pref_character_size_summary">按键上显示的字符的大小 (%.2fx)</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8f7168a..802ee14 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -43,7 +43,6 @@
   <string name="pref_category_style">Style</string>
   <string name="pref_margin_bottom_title">Margin bottom</string>
   <string name="pref_keyboard_height_title">Keyboard height</string>
-  <string name="pref_keyboard_height_landscape_title">Keyboard height in landscape mode</string>
   <string name="pref_horizontal_margin_title">Horizontal margin</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>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index b48ec84..dac5df2 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -61,8 +61,10 @@
       <juloo.common.IntSlideBarPreference android:key="margin_bottom_portrait" android:title="@string/pref_portrait" android:summary="%sdp" android:defaultValue="7" min="0" max="100"/>
       <juloo.common.IntSlideBarPreference android:key="margin_bottom_landscape" android:title="@string/pref_landscape" android:summary="%sdp" android:defaultValue="3" min="0" max="100"/>
     </PreferenceScreen>
-    <juloo.common.IntSlideBarPreference android:key="keyboard_height" android:title="@string/pref_keyboard_height_title" android:summary="%s%%" android:defaultValue="35" min="10" max="50"/>
-    <juloo.common.IntSlideBarPreference android:key="keyboard_height_landscape" android:title="@string/pref_keyboard_height_landscape_title" android:summary="%s%%" android:defaultValue="50" min="20" max="65"/>
+    <PreferenceScreen android:title="@string/pref_keyboard_height_title">
+      <juloo.common.IntSlideBarPreference android:key="keyboard_height" android:title="@string/pref_portrait" android:summary="%s%%" android:defaultValue="35" min="10" max="50"/>
+      <juloo.common.IntSlideBarPreference android:key="keyboard_height_landscape" android:title="@string/pref_landscape" android:summary="%s%%" android:defaultValue="50" min="20" max="65"/>
+    </PreferenceScreen>
     <PreferenceScreen android:title="@string/pref_horizontal_margin_title">
       <juloo.common.IntSlideBarPreference android:key="horizontal_margin_portrait" android:title="@string/pref_portrait" android:summary="%sdp" android:defaultValue="3" min="0" max="30"/>
       <juloo.common.IntSlideBarPreference android:key="horizontal_margin_landscape" android:title="@string/pref_landscape" android:summary="%sdp" android:defaultValue="28" min="0" max="200"/>
-- 
cgit v1.2.3