Refactor: Split out ListGroupPreference

Split out the implementation of a string-list preference from
CustomExtraKeysPreference.

Allows to share the implementation with future preferences.

5 files changed, 10 insertions, 5 deletions

diff --git a/res/layout/custom_extra_key_widget.xml b/res/layout/custom_extra_key_widget.xml
deleted file mode 100644
index 7961f3c..0000000
--- a/res/layout/custom_extra_key_widget.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="horizontal">
-  <Button android:id="@+id/btn_custom_extra_key_remove" android:layout_width="@dimen/pref_button_size" android:layout_height="@dimen/pref_button_size" android:layout_gravity="center" android:background="@android:drawable/ic_menu_close_clear_cancel"/>
-</LinearLayout>
diff --git a/res/layout/custom_extra_key_add.xml b/res/layout/pref_listgroup_add_btn.xml
index bb555b5..bb555b5 100644
--- a/res/layout/custom_extra_key_add.xml
+++ b/res/layout/pref_listgroup_add_btn.xml
diff --git a/res/layout/pref_listgroup_group.xml b/res/layout/pref_listgroup_group.xml
new file mode 100644
index 0000000..2b9db4b
--- /dev/null
+++ b/res/layout/pref_listgroup_group.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="center">
+</LinearLayout>
diff --git a/res/layout/pref_listgroup_item_widget.xml b/res/layout/pref_listgroup_item_widget.xml
new file mode 100644
index 0000000..48e504e
--- /dev/null
+++ b/res/layout/pref_listgroup_item_widget.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="horizontal">
+  <Button android:id="@+id/pref_listgroup_remove_btn" android:layout_width="@dimen/pref_button_size" android:layout_height="@dimen/pref_button_size" android:layout_gravity="center" android:background="@android:drawable/ic_menu_close_clear_cancel"/>
+</LinearLayout>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index d6bf7c3..e21e6a7 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -7,7 +7,9 @@
     <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.CustomExtraKeysPreference android:title="@string/pref_extra_keys_custom"/>
+      <PreferenceCategory android:title="@string/pref_extra_keys_custom">
+        <juloo.keyboard2.CustomExtraKeysPreference/>
+      </PreferenceCategory>
       <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"/>