Refactor: Use a PreferenceCategory for extra keys

This removes the need for a layout definition and adds a title before
the prefs.
It's a prerequise for the custom keys preference.

19 files changed, 19 insertions, 10 deletions

diff --git a/res/layout/extra_keys_preference.xml b/res/layout/extra_keys_preference.xml
deleted file mode 100644
index 40bbfbe..0000000
--- a/res/layout/extra_keys_preference.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingEnd="?android:attr/scrollbarSize" android:background="?android:attr/selectableItemBackground">
-  <!-- Preference layout that do not define the text view with id 'title'. -->
-  <LinearLayout android:id="@android:id/widget_frame" android:layout_width="wrap_content" android:layout_height="match_parent" android:gravity="center_vertical" android:orientation="vertical"/>
-</LinearLayout>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 0cb90d1..2dc26d4 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -27,6 +27,7 @@
   <string name="pref_numpad_layout_e_high_first">Vyšší číslice jako první</string>
   <string name="pref_numpad_layout_e_low_first">Nižší číslice jako první</string>
   <string name="pref_extra_keys_title">Přidat klávesy do klávesnice</string>
+  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <string name="pref_second_layout_title">Vedlejší rozvržení</string>
   <string name="pref_second_layout_none">Žádné</string>
   <string name="pref_category_typing">Psaní</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 4cccd3a..4b0375a 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -27,6 +27,7 @@
   <string name="pref_numpad_layout_e_high_first">Hohe Ziffern zuerst</string>
   <string name="pref_numpad_layout_e_low_first">Niedrige Ziffern zuerst</string>
   <string name="pref_extra_keys_title">Zusätzliche Zeichen zur Tastatur hinzufügen</string>
+  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <string name="pref_second_layout_title">Zweites Layout</string>
   <string name="pref_second_layout_none">Keines</string>
   <string name="pref_category_typing">Tippen</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index b1908fd..85d94a9 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -27,6 +27,7 @@
   <!-- <string name="pref_numpad_layout_e_high_first">High digits first</string> -->
   <!-- <string name="pref_numpad_layout_e_low_first">Low digits first</string> -->
   <!-- <string name="pref_extra_keys_title">Add keys to the keyboard</string> -->
+  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <!-- <string name="pref_second_layout_title">Secondary layout</string> -->
   <!-- <string name="pref_second_layout_none">None</string> -->
   <string name="pref_category_typing">Escribiendo</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 93d0310..c7e02d7 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -27,6 +27,7 @@
   <string name="pref_numpad_layout_e_high_first">ابتدا اعداد بزرگ</string>
   <string name="pref_numpad_layout_e_low_first">ابتدا اعداد کوچک</string>
   <string name="pref_extra_keys_title">افزودن کلیدها به صفحه کلید</string>
+  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <string name="pref_second_layout_title">طرح دوم</string>
   <string name="pref_second_layout_none">هیچ</string>
   <string name="pref_category_typing">درحال نوشتن</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 8985c19..ba46e24 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -27,6 +27,7 @@
   <string name="pref_numpad_layout_e_high_first">Du plus haut au plus bas</string>
   <string name="pref_numpad_layout_e_low_first">Du plus bas au plus haut</string>
   <string name="pref_extra_keys_title">Ajouter des touches au clavier</string>
+  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <string name="pref_second_layout_title">Disposition secondaire</string>
   <string name="pref_second_layout_none">Aucune</string>
   <string name="pref_category_typing">Saisie</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 893500c..8753f01 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -27,6 +27,7 @@
   <!-- <string name="pref_numpad_layout_e_high_first">High digits first</string> -->
   <!-- <string name="pref_numpad_layout_e_low_first">Low digits first</string> -->
   <!-- <string name="pref_extra_keys_title">Add keys to the keyboard</string> -->
+  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <!-- <string name="pref_second_layout_title">Secondary layout</string> -->
   <string name="pref_second_layout_none">Nessuno</string>
   <string name="pref_category_typing">Digitando</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 7a9d001..b43069d 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -27,6 +27,7 @@
   <!-- <string name="pref_numpad_layout_e_high_first">High digits first</string> -->
   <!-- <string name="pref_numpad_layout_e_low_first">Low digits first</string> -->
   <!-- <string name="pref_extra_keys_title">Add keys to the keyboard</string> -->
+  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <!-- <string name="pref_second_layout_title">Secondary layout</string> -->
   <!-- <string name="pref_second_layout_none">None</string> -->
   <string name="pref_category_typing">타자</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index aa89788..1fc0abd 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -27,6 +27,7 @@
   <string name="pref_numpad_layout_e_high_first">Vispirms lielākie cipari</string>
   <string name="pref_numpad_layout_e_low_first">Vispirms mazākie cipari</string>
   <string name="pref_extra_keys_title">Pievienot tastatūrai taustiņus</string>
+  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <string name="pref_second_layout_title">Otrējais izkārtojums</string>
   <string name="pref_second_layout_none">Neviens</string>
   <string name="pref_category_typing">Rakstīšana</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 3309a70..e0eebb3 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -27,6 +27,7 @@
   <string name="pref_numpad_layout_e_high_first">Od największej cyfry</string>
   <string name="pref_numpad_layout_e_low_first">Od najmniejszej cyfry</string>
   <string name="pref_extra_keys_title">Dodaj klawisze do klawiatury</string>
+  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <string name="pref_second_layout_title">Drugi układ</string>
   <string name="pref_second_layout_none">Żaden</string>
   <string name="pref_category_typing">Pisanie</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 8add41d..7db55fb 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -27,6 +27,7 @@
   <string name="pref_numpad_layout_e_high_first">Dígitos maiores primeiro</string>
   <string name="pref_numpad_layout_e_low_first">Dígitos menores primeiro</string>
   <string name="pref_extra_keys_title">Adicionar teclas ao teclado</string>
+  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <string name="pref_second_layout_title">Layout secundário</string>
   <string name="pref_second_layout_none">Nenhum</string>
   <string name="pref_category_typing">Digitação</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index be68573..22b429a 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -27,6 +27,7 @@
   <string name="pref_numpad_layout_e_high_first">Mai întâi cifrele mari</string>
   <string name="pref_numpad_layout_e_low_first">Mai întâi cifrele mici</string>
   <string name="pref_extra_keys_title">Adaugă taste pe tastatură</string>
+  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <string name="pref_second_layout_title">Aranjament secundar</string>
   <string name="pref_second_layout_none">Nimic</string>
   <string name="pref_category_typing">Tipărire</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 66e17d3..a3a9a5f 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -27,6 +27,7 @@
   <string name="pref_numpad_layout_e_high_first">Старшие цифры сверху</string>
   <string name="pref_numpad_layout_e_low_first">Младшие цифры сверху</string>
   <string name="pref_extra_keys_title">Добавить клавиши на клавиатуру</string>
+  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <string name="pref_second_layout_title">Дополнительная раскладка</string>
   <string name="pref_second_layout_none">Нет</string>
   <string name="pref_category_typing">Печать</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 236f368..d0677b1 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -27,6 +27,7 @@
   <!-- <string name="pref_numpad_layout_e_high_first">High digits first</string> -->
   <!-- <string name="pref_numpad_layout_e_low_first">Low digits first</string> -->
   <!-- <string name="pref_extra_keys_title">Add keys to the keyboard</string> -->
+  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <!-- <string name="pref_second_layout_title">Secondary layout</string> -->
   <string name="pref_second_layout_none">Hiçbiri</string>
   <string name="pref_category_typing">Yazma</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index be2d515..b96b76f 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -29,6 +29,7 @@
   <string name="pref_numpad_layout_e_high_first">Số lớn nhất trước</string>
   <string name="pref_numpad_layout_e_low_first">Số nhỏ nhất trước</string>
   <string name="pref_extra_keys_title">Thêm phím vào bàn phím</string>
+  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <string name="pref_second_layout_title">Bố cục phụ</string>
   <string name="pref_second_layout_none">Không</string>
   <string name="pref_category_typing">Gõ</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index c42a237..d25cc50 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -27,6 +27,7 @@
   <string name="pref_numpad_layout_e_high_first">大数字在上方</string>
   <string name="pref_numpad_layout_e_low_first">小数字在上方</string>
   <string name="pref_extra_keys_title">选择要显示的按键</string>
+  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <string name="pref_second_layout_title">第二键盘布局</string>
   <string name="pref_second_layout_none">无</string>
   <string name="pref_category_typing">输入</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 94eb47d..3c963f3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -27,6 +27,7 @@
   <string name="pref_numpad_layout_e_high_first">High digits first</string>
   <string name="pref_numpad_layout_e_low_first">Low digits first</string>
   <string name="pref_extra_keys_title">Add keys to the keyboard</string>
+  <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string>
   <string name="pref_second_layout_title">Secondary layout</string>
   <string name="pref_second_layout_none">None</string>
   <string name="pref_category_typing">Typing</string>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index f57d58a..0b85487 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -7,7 +7,7 @@
     <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"/>
     <CheckBoxPreference android:key="number_row" android:title="@string/pref_number_row_title" android:summary="@string/pref_number_row_summary" android:defaultValue="false"/>
     <PreferenceScreen android:title="@string/pref_extra_keys_title">
-      <juloo.keyboard2.ExtraKeysPreference/>
+      <juloo.keyboard2.ExtraKeysPreference android:title="@string/pref_extra_keys_internal"/>
     </PreferenceScreen>
     <ListPreference android:key="numpad_layout" android:title="@string/pref_numpad_layout" android:summary="%s" android:defaultValue="high_first" android:entries="@array/pref_numpad_layout_entries" android:entryValues="@array/pref_numpad_layout_values"/>
   </PreferenceCategory>
diff --git a/srcs/juloo.keyboard2/ExtraKeysPreference.java b/srcs/juloo.keyboard2/ExtraKeysPreference.java
index 698e344..340db1e 100644
--- a/srcs/juloo.keyboard2/ExtraKeysPreference.java
+++ b/srcs/juloo.keyboard2/ExtraKeysPreference.java
@@ -4,7 +4,7 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.preference.CheckBoxPreference;
-import android.preference.PreferenceGroup;
+import android.preference.PreferenceCategory;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.TextView;
@@ -13,7 +13,7 @@ import java.util.Set;
 
 /** This class implements the "extra keys" preference but also defines the
     possible extra keys. */
-public class ExtraKeysPreference extends PreferenceGroup
+public class ExtraKeysPreference extends PreferenceCategory
 {
   public static String[] extra_keys = new String[]
   {
@@ -86,9 +86,7 @@ public class ExtraKeysPreference extends PreferenceGroup
   public ExtraKeysPreference(Context context, AttributeSet attrs)
   {
     super(context, attrs);
-    Resources res = context.getResources();
     setOrderingAsAdded(true);
-    setLayoutResource(R.layout.extra_keys_preference);
   }
 
   protected void onAttachedToActivity()