ライブビューとカメラを同時に撮影する設定のプロパティをひとつ追加。

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/preference/IPreferencePropertyAccessor.java b/app/src/main/java/net/osdn/gokigen/a01d/preference/IPreferencePropertyAccessor.java
index bcad36e..bbd74cb 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/preference/IPreferencePropertyAccessor.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/preference/IPreferencePropertyAccessor.java
@@ -32,6 +32,9 @@ public interface IPreferencePropertyAccessor
     String MAGNIFYING_LIVE_VIEW_SCALE = "magnifying_live_view_scale";
     String MAGNIFYING_LIVE_VIEW_SCALE_DEFAULT_VALUE = "1.0";
 
+    String CAPTURE_BOTH_CAMERA_AND_LIVE_VIEW = "capture_both_camera_and_live_view";
+
+
 /*****
     int CHOICE_SPLASH_SCREEN = 10;
 

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/preference/PreferenceFragment.java b/app/src/main/java/net/osdn/gokigen/a01d/preference/PreferenceFragment.java
index d20a989..14fcf2d 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/preference/PreferenceFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/preference/PreferenceFragment.java
@@ -104,6 +104,10 @@ public class PreferenceFragment extends PreferenceFragmentCompat implements Shar
         {
             editor.putBoolean(net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor.RAW, true);
         }
+        if (!items.containsKey(net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor.CAPTURE_BOTH_CAMERA_AND_LIVE_VIEW))
+        {
+            editor.putBoolean(net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor.CAPTURE_BOTH_CAMERA_AND_LIVE_VIEW, true);
+        }
         if (!items.containsKey(net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor.SOUND_VOLUME_LEVEL))
         {
             editor.putString(net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor.SOUND_VOLUME_LEVEL, net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor.SOUND_VOLUME_LEVEL_DEFAULT_VALUE);
@@ -323,6 +327,11 @@ public class PreferenceFragment extends PreferenceFragmentCompat implements Shar
                     Log.v(TAG, " " + key + " , " + value);
                     break;
 
+                case IPreferencePropertyAccessor.CAPTURE_BOTH_CAMERA_AND_LIVE_VIEW:
+                    value = preferences.getBoolean(key, true);
+                    Log.v(TAG, " " + key + " , " + value);
+                    break;
+
                 default:
                     String strValue = preferences.getString(key, "");
                     setListPreference(key, key, strValue);

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index a3a55ca..9c3a582 100644 (file)
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -19,6 +19,8 @@
     <string name="pref_camera_sound_volume">シャッター音</string>
     <string name="pref_take_raw">RAW撮影</string>
 
+    <string name="pref_capture_both_camera_and_live_view">ライブビュー画像も同時に撮影</string>
+
     <string name="pref_cat_application_control">アプリ制御</string>
     <string name="pref_exit_power_off">アプリ終了(とカメラOFF)</string>
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 50dd15a..091e278 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -19,6 +19,8 @@
     <string name="pref_camera_sound_volume">Shutter Sound</string>
     <string name="pref_take_raw">Take Raw</string>
 
+    <string name="pref_capture_both_camera_and_live_view">Capture both camera and Live View</string>
+
     <string name="pref_cat_application_control">App. Control</string>
     <string name="pref_exit_power_off">Exit Application(and Camera OFF)</string>
 

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 536bcbc..ee2eef6 100644 (file)
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -38,6 +38,10 @@
             android:key="raw"
             android:title="@string/pref_take_raw" />
 
+        <CheckBoxPreference
+            android:key="capture_both_camera_and_live_view"
+            android:title="@string/pref_capture_both_camera_and_live_view" />
+
     </PreferenceCategory>
 
     <PreferenceCategory