From: MRSa <mrsa@myad.jp>
Date: Thu, 12 Oct 2017 15:46:38 +0000 (+0900)
Subject: ランドスケープ時に横幅を大きく。
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2856f1f8e6f666986dc842a02aa80dff1076bb2f;p=gokigen%2FA01d.git

ランドスケープ時に横幅を大きく。
---

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/A01dMain.java b/app/src/main/java/net/osdn/gokigen/a01d/A01dMain.java
index ea92e1a..a27096c 100644
--- a/app/src/main/java/net/osdn/gokigen/a01d/A01dMain.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/A01dMain.java
@@ -3,6 +3,7 @@ package net.osdn.gokigen.a01d;
 import android.Manifest;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
+import android.os.Build;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.content.ContextCompat;
@@ -11,6 +12,7 @@ import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.support.v7.preference.PreferenceManager;
 import android.util.Log;
+import android.view.View;
 import android.view.WindowManager;
 
 import net.osdn.gokigen.a01d.camera.olympus.IOlympusDisplayInjector;
@@ -42,10 +44,27 @@ public class A01dMain extends AppCompatActivity implements ICameraStatusReceiver
     private OlyCameraPropertyListFragment propertyListFragment = null;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState)
+    {
         final int REQUEST_NEED_PERMISSIONS = 1010;
 
         super.onCreate(savedInstanceState);
+/*
+        try {
+            // 全画面表示...
+            if (Build.VERSION.SDK_INT >= 19)
+            {
+                View decor = this.getWindow().getDecorView();
+                decor.setSystemUiVisibility(View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);
+            } else {
+                getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+            }
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+*/
         setContentView(R.layout.activity_a01d_main);
 
         ActionBar bar = getSupportActionBar();
diff --git a/app/src/main/res/drawable/ic_power_settings_new_black_24dp.xml b/app/src/main/res/drawable/ic_power_settings_new_black_24dp.xml
new file mode 100644
index 0000000..26272ab
--- /dev/null
+++ b/app/src/main/res/drawable/ic_power_settings_new_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M13,3h-2v10h2L13,3zM17.83,5.17l-1.42,1.42C17.99,7.86 19,9.81 19,12c0,3.87 -3.13,7 -7,7s-7,-3.13 -7,-7c0,-2.19 1.01,-4.14 2.58,-5.42L6.17,5.17C4.23,6.82 3,9.26 3,12c0,4.97 4.03,9 9,9s9,-4.03 9,-9c0,-2.74 -1.23,-5.18 -3.17,-6.83z"/>
+</vector>
diff --git a/app/src/main/res/layout-land/fragment_live_view.xml b/app/src/main/res/layout-land/fragment_live_view.xml
index bac505f..428d062 100644
--- a/app/src/main/res/layout-land/fragment_live_view.xml
+++ b/app/src/main/res/layout-land/fragment_live_view.xml
@@ -34,7 +34,7 @@
             class="net.osdn.gokigen.a01d.liveview.CameraLiveImageView"
             android:layout_width="0dip"
             android:layout_height="fill_parent"
-            android:layout_weight="5"
+            android:layout_weight="7"
             android:gravity="center"
             android:scaleType="fitCenter"
             android:visibility="visible" />
@@ -105,7 +105,6 @@
                 android:visibility="visible"
                 />
 
-
         </RelativeLayout>
 
     </LinearLayout>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index e83660d..31108c8 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -5,6 +5,7 @@
 
         <PreferenceScreen
             android:key="exit_application"
+            android:icon="@drawable/ic_power_settings_new_black_24dp"
             android:title="@string/pref_exit_power_off" />
 
     </PreferenceCategory>