Merged. Switched back to name "Preferences" instead of "Settings".

[Dictionary.git] / res / xml / preferences.xml

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index a57dece5b51e3cf1f2a9fbce891ea8921b969a6f..4b948a079f0f4618fc892d95b6a9ac4ca64b2dc0 100644 (file)
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -1,13 +1,12 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">\r
 \r
-    \r
-       <ListPreference \r
+  <ListPreference \r
     android:key="@string/defaultDicKey"\r
     android:title="@string/defaultDicTitle"\r
     android:summary="@string/defaultDicSummary"\r
     android:persistent="true"\r
   />\r
-    \r
+\r
   <EditTextPreference\r
     android:key="@string/quickdicDirectoryKey"\r
     android:title="@string/quickdicDirectoryTitle" \r
@@ -59,14 +58,6 @@
     android:persistent="true"\r
   />\r
 \r
-  <CheckBoxPreference \r
-    android:key="@string/showClearSearchTextButtonKey"\r
-    android:title="@string/showClearSearchTextButtonTitle"\r
-    android:summary="@string/showClearSearchTextButtonSummary"\r
-    android:defaultValue="true"\r
-    android:persistent="true"\r
-  />\r
-\r
   <CheckBoxPreference \r
     android:key="@string/showPrevNextButtonsKey"\r
     android:title="@string/showPrevNextButtonsTitle"\r