グリッド線を細くてしっかりとした白線にしてみた。

ボタン４、ボタン５の長押しでISO感度を変更できるようにした。

diff --git a/wear/src/main/java/jp/sfjp/gokigen/a01c/liveview/CameraLiveImageView.java b/wear/src/main/java/jp/sfjp/gokigen/a01c/liveview/CameraLiveImageView.java
index 75745c3..cbf6ecd 100644 (file)
--- a/wear/src/main/java/jp/sfjp/gokigen/a01c/liveview/CameraLiveImageView.java
+++ b/wear/src/main/java/jp/sfjp/gokigen/a01c/liveview/CameraLiveImageView.java
@@ -551,9 +551,10 @@ public class CameraLiveImageView extends View implements CameraLiveViewListenerI
         Paint framePaint = new Paint();
         framePaint.setStyle(Paint.Style.STROKE);
 
-        DisplayMetrics dm = getResources().getDisplayMetrics();
-        float strokeWidth = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 1.0f, dm);
-        framePaint.setStrokeWidth(strokeWidth);
+        //DisplayMetrics dm = getResources().getDisplayMetrics();
+        //float strokeWidth = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 1.0f, dm);
+        //framePaint.setStrokeWidth(strokeWidth);
+        framePaint.setStrokeWidth(0.0f);
         framePaint.setColor(gridFrameDrawer.getDrawColor());
         gridFrameDrawer.drawFramingGrid(canvas, gridRect, framePaint);
     }

diff --git a/wear/src/main/java/jp/sfjp/gokigen/a01c/liveview/button/PushedButton4.java b/wear/src/main/java/jp/sfjp/gokigen/a01c/liveview/button/PushedButton4.java
index b66ada7..878e18b 100644 (file)
--- a/wear/src/main/java/jp/sfjp/gokigen/a01c/liveview/button/PushedButton4.java
+++ b/wear/src/main/java/jp/sfjp/gokigen/a01c/liveview/button/PushedButton4.java
@@ -32,27 +32,27 @@ class PushedButton4 implements IPushedButton
         {
             case "P":
                 preference_action_id = preference_action_id + ICameraFeatureDispatcher.MODE_P;
-                defaultAction =  (isLongClick) ? ICameraFeatureDispatcher.FEATURE_EXPOSURE_BIAS_DOWN : ICameraFeatureDispatcher.FEATURE_EXPOSURE_BIAS_DOWN;
+                defaultAction =  (isLongClick) ? ICameraFeatureDispatcher.FEATURE_ISO_DOWN : ICameraFeatureDispatcher.FEATURE_EXPOSURE_BIAS_DOWN;
                 break;
 
             case "A":
                 preference_action_id = preference_action_id + ICameraFeatureDispatcher.MODE_A;
-                defaultAction =  (isLongClick) ? ICameraFeatureDispatcher.FEATURE_EXPOSURE_BIAS_DOWN : ICameraFeatureDispatcher.FEATURE_EXPOSURE_BIAS_DOWN;
+                defaultAction =  (isLongClick) ? ICameraFeatureDispatcher.FEATURE_ISO_DOWN : ICameraFeatureDispatcher.FEATURE_EXPOSURE_BIAS_DOWN;
                 break;
 
             case "S":
                 preference_action_id = preference_action_id + ICameraFeatureDispatcher.MODE_S;
-                defaultAction =  (isLongClick) ? ICameraFeatureDispatcher.FEATURE_EXPOSURE_BIAS_DOWN : ICameraFeatureDispatcher.FEATURE_EXPOSURE_BIAS_DOWN;
+                defaultAction =  (isLongClick) ? ICameraFeatureDispatcher.FEATURE_ISO_DOWN : ICameraFeatureDispatcher.FEATURE_EXPOSURE_BIAS_DOWN;
                 break;
 
             case "M":
                 preference_action_id = preference_action_id + ICameraFeatureDispatcher.MODE_M;
-                defaultAction =  (isLongClick) ? ICameraFeatureDispatcher.FEATURE_EXPOSURE_BIAS_DOWN : ICameraFeatureDispatcher.FEATURE_APERTURE_DOWN;
+                defaultAction =  (isLongClick) ? ICameraFeatureDispatcher.FEATURE_ISO_DOWN : ICameraFeatureDispatcher.FEATURE_APERTURE_DOWN;
                 break;
 
             case "ART":
                 preference_action_id = preference_action_id + ICameraFeatureDispatcher.MODE_ART;
-                defaultAction =  (isLongClick) ? ICameraFeatureDispatcher.FEATURE_EXPOSURE_BIAS_DOWN : ICameraFeatureDispatcher.FEATURE_EXPOSURE_BIAS_DOWN;
+                defaultAction =  (isLongClick) ? ICameraFeatureDispatcher.FEATURE_ISO_DOWN : ICameraFeatureDispatcher.FEATURE_EXPOSURE_BIAS_DOWN;
                 break;
 
             case "iAuto":

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 6a228f6..91c9b16 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
@@ -32,27 +32,27 @@ class PushedButton5 implements IPushedButton
         {
             case "P":
                 preference_action_id = preference_action_id + ICameraFeatureDispatcher.MODE_P;
-                defaultAction =  (isLongClick) ? ICameraFeatureDispatcher.FEATURE_EXPOSURE_BIAS_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_EXPOSURE_BIAS_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_EXPOSURE_BIAS_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_EXPOSURE_BIAS_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_EXPOSURE_BIAS_UP : ICameraFeatureDispatcher.FEATURE_EXPOSURE_BIAS_UP;
+                defaultAction =  (isLongClick) ? ICameraFeatureDispatcher.FEATURE_ISO_UP : ICameraFeatureDispatcher.FEATURE_EXPOSURE_BIAS_UP;
                 break;
 
             case "iAuto":

diff --git a/wear/src/main/java/jp/sfjp/gokigen/a01c/liveview/gridframe/GridFrameDrawer0.java b/wear/src/main/java/jp/sfjp/gokigen/a01c/liveview/gridframe/GridFrameDrawer0.java
index b4a6dde..bb3aec4 100644 (file)
--- a/wear/src/main/java/jp/sfjp/gokigen/a01c/liveview/gridframe/GridFrameDrawer0.java
+++ b/wear/src/main/java/jp/sfjp/gokigen/a01c/liveview/gridframe/GridFrameDrawer0.java
@@ -30,6 +30,6 @@ class GridFrameDrawer0 implements IGridFrameDrawer
     @Override
     public int getDrawColor()
     {
-        return (Color.argb(130,235,235,235));
+        return (Color.argb(210,245,245,245));
     }
 }