iAutoモード時に、デジタルズームを実装。

[gokigen/A01c.git] / wear / src / main / java / jp / sfjp / gokigen / a01c / liveview / button / PushedButton5.java

diff --git a/wear/src/main/java/jp/sfjp/gokigen/a01c/liveview/button/PushedButton5.java b/wear/src/main/java/jp/sfjp/gokigen/a01c/liveview/button/PushedButton5.java
index 63f0332..4a83aaa 100644 (file)
--- a/wear/src/main/java/jp/sfjp/gokigen/a01c/liveview/button/PushedButton5.java
+++ b/wear/src/main/java/jp/sfjp/gokigen/a01c/liveview/button/PushedButton5.java
@@ -5,7 +5,7 @@ import android.content.SharedPreferences;
 import android.support.v7.preference.PreferenceManager;
 
 import jp.sfjp.gokigen.a01c.IShowInformation;
-import jp.sfjp.gokigen.a01c.liveview.ICameraFeatureDispatcher;
+import jp.sfjp.gokigen.a01c.olycamerawrapper.dispatcher.ICameraFeatureDispatcher;
 
 class PushedButton5 implements IPushedButton
 {
@@ -32,32 +32,32 @@ class PushedButton5 implements IPushedButton
         {
             case "P":
                 preference_action_id = preference_action_id + ICameraFeatureDispatcher.MODE_P;
-                defaultAction =  (isLongClick) ? ICameraFeatureDispatcher.FEATURE_AE_UP : ICameraFeatureDispatcher.FEATURE_EXPOSURE_BIAS_UP;
+                defaultAction =  (isLongClick) ? ICameraFeatureDispatcher.FEATURE_ISO_UP : ICameraFeatureDispatcher.FEATURE_EXPOSURE_BIAS_UP;
                 break;
 
             case "A":
                 preference_action_id = preference_action_id + ICameraFeatureDispatcher.MODE_A;
-                defaultAction =  (isLongClick) ? ICameraFeatureDispatcher.FEATURE_AE_UP : ICameraFeatureDispatcher.FEATURE_EXPOSURE_BIAS_UP;
+                defaultAction =  (isLongClick) ? ICameraFeatureDispatcher.FEATURE_ISO_UP : ICameraFeatureDispatcher.FEATURE_EXPOSURE_BIAS_UP;
                 break;
 
             case "S":
                 preference_action_id = preference_action_id + ICameraFeatureDispatcher.MODE_S;
-                defaultAction =  (isLongClick) ? ICameraFeatureDispatcher.FEATURE_AE_UP : ICameraFeatureDispatcher.FEATURE_EXPOSURE_BIAS_UP;
+                defaultAction =  (isLongClick) ? ICameraFeatureDispatcher.FEATURE_ISO_UP : ICameraFeatureDispatcher.FEATURE_EXPOSURE_BIAS_UP;
                 break;
 
             case "M":
                 preference_action_id = preference_action_id + ICameraFeatureDispatcher.MODE_M;
-                defaultAction = (isLongClick) ? ICameraFeatureDispatcher.FEATURE_AE_UP : ICameraFeatureDispatcher.FEATURE_APERTURE_UP;
+                defaultAction = (isLongClick) ? ICameraFeatureDispatcher.FEATURE_ISO_UP : ICameraFeatureDispatcher.FEATURE_APERTURE_UP;
                 break;
 
             case "ART":
                 preference_action_id = preference_action_id + ICameraFeatureDispatcher.MODE_ART;
-                defaultAction =  (isLongClick) ? ICameraFeatureDispatcher.FEATURE_AE_UP : ICameraFeatureDispatcher.FEATURE_EXPOSURE_BIAS_UP;
+                defaultAction =  (isLongClick) ? ICameraFeatureDispatcher.FEATURE_ISO_UP : ICameraFeatureDispatcher.FEATURE_EXPOSURE_BIAS_UP;
                 break;
 
             case "iAuto":
                 preference_action_id = preference_action_id + ICameraFeatureDispatcher.MODE_IAUTO;
-                defaultAction = ICameraFeatureDispatcher.FEATURE_ACTION_NONE;
+                defaultAction =  (isLongClick) ? ICameraFeatureDispatcher.FEATURE_DIGITAL_ZOOM_CHANGE : ICameraFeatureDispatcher.FEATURE_DIGITAL_ZOOMIN;
                 break;
 
             case "Movie":