WPZ2接続時に機能がないボタンを非表示にした。

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/liveview/LiveViewFragment.java b/app/src/main/java/net/osdn/gokigen/a01d/liveview/LiveViewFragment.java
index 9f0290d..5c0776b 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/liveview/LiveViewFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/liveview/LiveViewFragment.java
@@ -345,7 +345,7 @@ public class LiveViewFragment extends Fragment implements IStatusViewDrawer, IFo
                     }
                 } else if (connectionMethod == ICameraConnection.CameraConnectionMethod.KODAK) {
                     if (favoriteButton != null) {
-                        favoriteButton.setVisibility(View.VISIBLE);
+                        favoriteButton.setVisibility(View.INVISIBLE);
                         favoriteButton.setOnClickListener(onClickTouchListener);
                     }
                     if (manualFocus != null) {
@@ -358,6 +358,7 @@ public class LiveViewFragment extends Fragment implements IStatusViewDrawer, IFo
                         focusIndicator.setVisibility(View.VISIBLE);
                     }
                     if (propertyButton != null) {
+                        propertyButton.setVisibility(View.INVISIBLE);
                         propertyButton.setOnClickListener(onClickTouchListener);
                     }
                 }

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 01bc9fa..145e0f7 100644 (file)
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -302,8 +302,8 @@
     <string name="pref_panasonic_settings">Panasonic</string>
     <string name="pref_summary_panasonic_settings"> </string>
 
-    <string name="pref_kodak_settings">PIXPRO WPZ2</string>
-    <string name="pref_summary_kodak_settings">WPZ2用設定</string>
+    <string name="pref_kodak_settings">KODAK PIXPRO WPZ2</string>
+    <string name="pref_summary_kodak_settings"> </string>
 
     <string name="pref_canon_settings">Canon</string>
     <string name="pref_summary_canon_settings"> </string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f73d0ac..1cafe1c 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -313,7 +313,7 @@
     <string name="pref_nikon_settings">Nikon</string>
     <string name="pref_summary_nikon_settings">Special Settings for Nikon</string>
 
-    <string name="pref_kodak_settings">PIXPRO WPZ2</string>
+    <string name="pref_kodak_settings">KODAK PIXPRO WPZ2</string>
     <string name="pref_summary_kodak_settings">Special Settings for PIXPRO WPZ2</string>
 
     <string name="pref_exit_power_off_summary">Exit Application</string>