From a20432479d5b3d987ab067893278c53a6233888c Mon Sep 17 00:00:00 2001
From: Keisuke Kuroyanagi <ksk@google.com>
Date: Tue, 10 Jun 2014 19:59:19 +0900
Subject: Make dump dictionary settings easily extensible.

This adds "Dump contextual dictionary".

Bug: 14161647
Change-Id: I41a6d6e131d9d8c300ac0120d903d46d88bb3346
---
 java/res/values/strings.xml      | 10 ++--------
 java/res/xml/prefs_for_debug.xml | 16 ++++------------
 2 files changed, 6 insertions(+), 20 deletions(-)

(limited to 'java/res')

diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index 3f5980dfd..884911565 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -349,14 +349,8 @@ mobile devices. [CHAR LIMIT=25] -->
     <string name="read_external_dictionary_confirm_install_message">Really install this file for <xliff:g id="LANGUAGE_NAME" example="English">%s</xliff:g>?</string>
     <!-- Title for an error dialog that contains the details of the error in the body [CHAR LIMIT=80] -->
     <string name="error">There was an error</string>
-    <!-- Title of the settings for dumpping contacts dictionary file [CHAR LIMIT=35] -->
-    <string name="prefs_dump_contacts_dict">Dump contacts dictionary</string>
-    <!-- Title of the settings for dumpping personal dictionary file [CHAR LIMIT=35] -->
-    <string name="prefs_dump_user_dict">Dump personal dictionary</string>
-    <!-- Title of the settings for dumpping user history dictionary file [CHAR LIMIT=35] -->
-    <string name="prefs_dump_user_history_dict">Dump user history dictionary</string>
-    <!-- Title of the settings for dumpping personalization dictionary file [CHAR LIMIT=35] -->
-    <string name="prefs_dump_personalization_dict">Dump personalization dictionary</string>
+    <!-- Title of the settings group for dumpping dictionary files that have been created on the device [CHAR LIMIT=35] -->
+    <string name="prefs_dump_dynamic_dicts" translatable="false">Dump dictionary</string>
 
     <!-- Title of the button to revert to the default value of the device in the settings dialog [CHAR LIMIT=15] -->
     <string name="button_default">Default</string>
diff --git a/java/res/xml/prefs_for_debug.xml b/java/res/xml/prefs_for_debug.xml
index 1a7fe71fe..0bcc5cbe4 100644
--- a/java/res/xml/prefs_for_debug.xml
+++ b/java/res/xml/prefs_for_debug.xml
@@ -61,16 +61,8 @@
     <PreferenceScreen
         android:key="read_external_dictionary"
         android:title="@string/prefs_read_external_dictionary" />
-    <PreferenceScreen
-        android:key="dump_contacts_dict"
-        android:title="@string/prefs_dump_contacts_dict" />
-    <PreferenceScreen
-        android:key="dump_user_dict"
-        android:title="@string/prefs_dump_user_dict" />
-    <PreferenceScreen
-        android:key="dump_user_history_dict"
-        android:title="@string/prefs_dump_user_history_dict" />
-    <PreferenceScreen
-        android:key="dump_personalization_dict"
-        android:title="@string/prefs_dump_personalization_dict" />
+    <PreferenceCategory
+        android:key="pref_key_dump_dictionaries"
+        android:title="@string/prefs_dump_dynamic_dicts">
+    </PreferenceCategory>
 </PreferenceScreen>
-- 
cgit v1.2.3-83-g751a