X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout-land%2Ffragment_live_view.xml;h=ceabf2cc873c6c95b0909142c3b16d39401766d1;hb=4eb7a863ade3713d8dd6af0a263aab6bc162019b;hp=340134437883f13b5009f54f3e2eaab5a65d3af1;hpb=ecdd80e18bc77b83e4d1eb62942ac37c902f2001;p=gokigen%2FGr2Control.git

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 3401344..ceabf2c 100644
--- a/app/src/main/res/layout-land/fragment_live_view.xml
+++ b/app/src/main/res/layout-land/fragment_live_view.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:ignore="HardcodedText,ContentDescription" >
 
     <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
         android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -363,6 +360,229 @@
     </LinearLayout>
 
     <RelativeLayout
+        android:id="@+id/fuji_x_keyPanelLayout"
+        android:orientation="horizontal"
+        android:layout_width="100pt"
+        android:layout_height="120pt"
+        android:layout_alignLeft="@id/controlPanelLayout"
+        android:layout_alignStart="@id/controlPanelLayout"
+        android:layout_alignParentBottom="true"
+        android:visibility="gone"
+        android:background="@color/background_translucent_white" >
+
+        <ImageView
+            android:id="@+id/button_fuji_x_sv_minus"
+            android:layout_width="20pt"
+            android:layout_height="14pt"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:scaleType="fitCenter"
+            android:visibility="visible"
+            android:clickable="true"
+            android:focusable="true"
+            android:src="@drawable/ic_remove_circle_outline_black_24dp"
+            android:layout_marginTop="8pt"
+            android:layout_marginLeft="6pt"
+            android:layout_marginStart="6pt"
+            android:gravity="center" />
+
+        <TextView
+            android:id="@+id/label_fuji_x_sv_center"
+            android:layout_width="34pt"
+            android:layout_height="14pt"
+            android:layout_toEndOf="@id/button_fuji_x_sv_minus"
+            android:layout_toRightOf="@id/button_fuji_x_sv_minus"
+            android:layout_alignTop="@id/button_fuji_x_sv_minus"
+            android:scaleType="fitCenter"
+            android:visibility="visible"
+            android:clickable="true"
+            android:focusable="true"
+            android:text="@string/shutter_speed"
+            android:textColor="@color/colorBlack"
+            android:textStyle="bold"
+            android:textSize="8pt"
+            android:layout_marginLeft="2pt"
+            android:layout_marginStart="2pt"
+            android:gravity="center" />
+
+        <ImageView
+            android:id="@+id/button_fuji_x_sv_plus"
+            android:layout_width="20pt"
+            android:layout_height="14pt"
+            android:layout_alignTop="@id/button_fuji_x_sv_minus"
+            android:layout_toEndOf="@id/label_fuji_x_sv_center"
+            android:layout_toRightOf="@id/label_fuji_x_sv_center"
+            android:scaleType="fitCenter"
+            android:visibility="visible"
+            android:clickable="true"
+            android:focusable="true"
+            android:src="@drawable/ic_add_circle_outline_black_24dp"
+            android:layout_marginLeft="2pt"
+            android:layout_marginStart="2pt"
+            android:gravity="center" />
+
+        <ImageView
+            android:id="@+id/button_fuji_x_tv_minus"
+            android:layout_width="20pt"
+            android:layout_height="14pt"
+            android:layout_below="@id/button_fuji_x_sv_minus"
+            android:layout_alignLeft="@id/button_fuji_x_sv_minus"
+            android:layout_alignStart="@id/button_fuji_x_sv_minus"
+            android:scaleType="fitCenter"
+            android:visibility="visible"
+            android:clickable="true"
+            android:focusable="true"
+            android:src="@drawable/ic_remove_circle_outline_black_24dp"
+            android:layout_marginTop="6pt"
+            android:gravity="center" />
+
+        <TextView
+            android:id="@+id/label_fuji_x_tv_center"
+            android:layout_width="34pt"
+            android:layout_height="14pt"
+            android:layout_toEndOf="@id/button_fuji_x_tv_minus"
+            android:layout_toRightOf="@id/button_fuji_x_tv_minus"
+            android:layout_alignTop="@id/button_fuji_x_tv_minus"
+            android:scaleType="fitCenter"
+            android:visibility="visible"
+            android:clickable="true"
+            android:focusable="true"
+            android:text="@string/aperture"
+            android:textColor="@color/colorBlack"
+            android:textStyle="bold"
+            android:textSize="8pt"
+            android:layout_marginLeft="2pt"
+            android:layout_marginStart="2pt"
+            android:gravity="center" />
+
+        <ImageView
+            android:id="@+id/button_fuji_x_tv_plus"
+            android:layout_width="20pt"
+            android:layout_height="14pt"
+            android:layout_alignTop="@id/button_fuji_x_tv_minus"
+            android:layout_toEndOf="@id/label_fuji_x_tv_center"
+            android:layout_toRightOf="@id/label_fuji_x_tv_center"
+            android:scaleType="fitCenter"
+            android:visibility="visible"
+            android:clickable="true"
+            android:focusable="true"
+            android:src="@drawable/ic_add_circle_outline_black_24dp"
+            android:layout_marginLeft="2pt"
+            android:layout_marginStart="2pt"
+            android:gravity="center" />
+
+        <ImageView
+            android:id="@+id/button_fuji_x_xv_minus"
+            android:layout_width="20pt"
+            android:layout_height="14pt"
+            android:layout_below="@id/button_fuji_x_tv_minus"
+            android:layout_alignLeft="@id/button_fuji_x_tv_minus"
+            android:layout_alignStart="@id/button_fuji_x_tv_minus"
+            android:scaleType="fitCenter"
+            android:visibility="visible"
+            android:clickable="true"
+            android:focusable="true"
+            android:src="@drawable/ic_remove_circle_outline_black_24dp"
+            android:layout_marginTop="6pt"
+            android:gravity="center" />
+
+        <ImageView
+            android:id="@+id/label_fuji_x_xv_center"
+            android:layout_width="34pt"
+            android:layout_height="14pt"
+            android:layout_toEndOf="@id/button_fuji_x_xv_minus"
+            android:layout_toRightOf="@id/button_fuji_x_xv_minus"
+            android:layout_alignTop="@id/button_fuji_x_xv_minus"
+            android:scaleType="fitCenter"
+            android:visibility="visible"
+            android:clickable="true"
+            android:focusable="true"
+            android:src="@drawable/ic_exposure_black_24dp"
+            android:layout_marginLeft="2pt"
+            android:layout_marginStart="2pt"
+            android:gravity="center" />
+
+        <ImageView
+            android:id="@+id/button_fuji_x_xv_plus"
+            android:layout_width="20pt"
+            android:layout_height="14pt"
+            android:layout_alignTop="@id/button_fuji_x_xv_minus"
+            android:layout_toEndOf="@id/label_fuji_x_xv_center"
+            android:layout_toRightOf="@id/label_fuji_x_xv_center"
+            android:scaleType="fitCenter"
+            android:visibility="visible"
+            android:clickable="true"
+            android:focusable="true"
+            android:src="@drawable/ic_add_circle_outline_black_24dp"
+            android:layout_marginLeft="2pt"
+            android:layout_marginStart="2pt"
+            android:gravity="center" />
+
+        <ImageView
+            android:id="@+id/button_fuji_x_video_on_off"
+            android:layout_width="20pt"
+            android:layout_height="14pt"
+            android:layout_below="@id/button_fuji_x_xv_minus"
+            android:layout_alignLeft="@id/button_fuji_x_xv_minus"
+            android:layout_alignStart="@id/button_fuji_x_xv_minus"
+            android:scaleType="fitCenter"
+            android:visibility="visible"
+            android:clickable="true"
+            android:focusable="true"
+            android:src="@drawable/ic_videocam_black__24dp"
+            android:layout_marginTop="6pt"
+            android:gravity="center" />
+
+        <ImageView
+            android:id="@+id/button_fuji_x_flash"
+            android:layout_width="20pt"
+            android:layout_height="14pt"
+            android:layout_below="@id/button_fuji_x_video_on_off"
+            android:layout_alignLeft="@id/button_fuji_x_tv_minus"
+            android:layout_alignStart="@id/button_fuji_x_tv_minus"
+            android:scaleType="fitCenter"
+            android:visibility="visible"
+            android:clickable="true"
+            android:focusable="true"
+            android:src="@drawable/ic_flash_on_black_24dp"
+            android:layout_marginTop="6pt"
+            android:gravity="center" />
+
+        <ImageView
+            android:id="@+id/button_fuji_x_timer"
+            android:layout_width="34pt"
+            android:layout_height="14pt"
+            android:layout_below="@id/button_fuji_x_video_on_off"
+            android:layout_alignLeft="@id/label_fuji_x_xv_center"
+            android:layout_alignStart="@id/label_fuji_x_xv_center"
+            android:scaleType="fitCenter"
+            android:visibility="visible"
+            android:clickable="true"
+            android:focusable="true"
+            android:src="@drawable/ic_timer_black_24dp"
+            android:layout_marginTop="6pt"
+            android:gravity="center" />
+
+        <TextView
+            android:id="@+id/fuji_x_hideKeyPanelTextView"
+            android:layout_width="48dp"
+            android:layout_height="20dp"
+            android:gravity="center"
+            android:clickable="true"
+            android:focusable="true"
+            android:text="@string/hide_panel"
+            android:textColor="@color/background_dark"
+            android:textStyle="normal"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentBottom="true"
+            android:layout_marginBottom="4dp"
+            android:textSize="6pt" />
+
+    </RelativeLayout>
+
+    <RelativeLayout
         android:id="@+id/keyPanelLayout"
         android:orientation="horizontal"
         android:layout_width="125pt"