Preferenceを階層化して整理。

[gokigen/Gr2Control.git] / app / src / main / res / xml / preferences_ricoh_gr2.xml

diff --git a/app/src/main/res/xml/preferences_ricoh_gr2.xml b/app/src/main/res/xml/preferences_ricoh_gr2.xml
index 5ed4cbe..1330325 100644 (file)
--- a/app/src/main/res/xml/preferences_ricoh_gr2.xml
+++ b/app/src/main/res/xml/preferences_ricoh_gr2.xml
@@ -6,8 +6,8 @@
         <PreferenceScreen
             android:key="exit_application"
             android:icon="@drawable/ic_power_settings_new_black_24dp"
-            android:title="@string/pref_exit_power_off" />
-
+            android:title="@string/pref_ricoh_exit_power_off" />
+<!--
         <ListPreference
             android:title="@string/pref_connection_method"
             android:entryValues="@array/connection_method_value"
@@ -15,47 +15,86 @@
             android:key="connection_method"
             android:defaultValue="RICOH_GR2"/>
 
+        <PreferenceScreen
+            android:key="wifi_settings"
+            android:title="@string/pref_wifi_settings"
+            android:summary="@string/pref_summary_wifi_settings" />
+-->
     </PreferenceCategory>
 
+<!--
     <PreferenceCategory
         android:title="@string/pref_cat_camera">
 
         <CheckBoxPreference
             android:key="capture_both_camera_and_live_view"
             android:title="@string/pref_capture_both_camera_and_live_view" />
-
     </PreferenceCategory>
+-->
 
     <PreferenceCategory
         android:title="@string/pref_cat_initialize">
 
         <CheckBoxPreference
+            android:key="gr2_display_camera_view"
+            android:title="@string/pref_gr2_display_camera_view"
+            android:summary="@string/pref_gr2_display_camera_view_summary"/>
+
+        <CheckBoxPreference
             android:key="gr2_lcd_sleep"
             android:title="@string/pref_gr2_lcd_sleep" />
 
-        <ListPreference
-            android:title="@string/pref_gr2_display_mode"
-            android:entryValues="@array/gr2_display_mode_value"
-            android:entries="@array/gr2_display_mode"
-            android:key="gr2_display_mode"
-            android:defaultValue="0"/>
-
+<!--
         <CheckBoxPreference
             android:key="auto_connect_to_camera"
             android:title="@string/pref_auto_connect_camera"
             android:summary="@string/pref_summary_auto_connect_camera" />
+-->
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="@string/pref_cat_others">
+<!--
+        <CheckBoxPreference
+            android:key="share_after_save"
+            android:title="@string/pref_call_share_after_save" />
+
+        <CheckBoxPreference
+            android:key="use_playback_menu"
+            android:title="@string/pref_use_playback_menu"
+            android:summary="@string/summary_use_playback_menu" />
+-->
+        <CheckBoxPreference
+            android:key="use_gr2_special_command"
+            android:title="@string/pref_use_gr2_special_command"
+            android:summary="@string/summary_use_gr2_special_command"
+            />
+
+        <CheckBoxPreference
+            android:key="pentax_capture_after_auto_focus"
+            android:title="@string/pref_pentax_capture_after_auto_focus"
+            android:summary="@string/summary_pentax_capture_after_auto_focus"
+            />
+
+        <EditTextPreference
+            android:key="ricoh_get_pics_list_timeout"
+            android:title="@string/pref_ricoh_get_pics_list_timeout"
+            android:defaultValue="5"
+            android:inputType="number"
+            android:summary="@string/pref_summary_ricoh_get_pics_list_timeout" />
     </PreferenceCategory>
 
+    <!--
     <PreferenceCategory
         android:title="@string/pref_cat_gokigen">
 
         <Preference
             android:key="instruction_link"
             android:title="@string/pref_instruction_manual"
-            android:summary="https://osdn.net/projects/gokigen/wiki/A01d"
+            android:summary="https://osdn.net/projects/gokigen/wiki/GR2Control"
             android:selectable="true">
             <intent android:action="android.intent.action.VIEW"
-                android:data="https://osdn.net/projects/gokigen/wiki/A01d" />
+                android:data="https://osdn.net/projects/gokigen/wiki/GR2Control" />
         </Preference>
 
         <Preference
@@ -71,6 +110,6 @@
             android:key="debug_info"
             android:title="@string/pref_degug_info"
             android:summary="@string/pref_summary_debug_info" />
-
     </PreferenceCategory>
+-->
 </PreferenceScreen>