Merge branch 'features/1.2.0_ogawa-y' into 'features/1.2.300'

Features/1.2.0 ogawa y

See merge request !70

ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/OperationListJSON.java

@@ -91,7 +91,7 @@ public class OperationListJSON extends AcmsCommonJSON {
                 dto.enableReportHistory = operationJson.getInt(EnableReportHistory);        // 報告履歴管理
                 dto.enableReportHistory = operationJson.getInt(EnableReportHistory);        // 報告履歴管理
                 dto.enableReportEdit = operationJson.has(EnableReportEdit) ? operationJson.getInt(EnableReportEdit) : 0;          // 作業編集区分
                 dto.enableReportEdit = operationJson.has(EnableReportEdit) ? operationJson.getInt(EnableReportEdit) : 0;          // 作業編集区分
                 dto.enableAddReport = operationJson.has(EnableAddReport) ? operationJson.getInt(EnableAddReport) : 0;          // 作業追加区分
                 dto.enableAddReport = operationJson.has(EnableAddReport) ? operationJson.getInt(EnableAddReport) : 0;          // 作業追加区分
-                dto.quickReport = operationJson.getInt(QuickReport);
+                dto.quickReport = operationJson.has(QuickReport) ? operationJson.getInt(QuickReport) : 0;
 
 
                 // 作業終了更新日
                 // 作業終了更新日
                 if (operationJson.has(OperationLastEditDate)) {
                 if (operationJson.has(OperationLastEditDate)) {

ABVJE_Res_Default_Android/res/drawable/btn_operation_print.xml

 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
     <item
     <item
-        android:state_enabled="false"
-        android:drawable="@drawable/home_print_off"/>
-    <item
         android:drawable="@drawable/home_print_on"/>
         android:drawable="@drawable/home_print_on"/>
 </selector>
 </selector>
\ No newline at end of file

ABVJE_Res_Default_Android/res/drawable/btn_operation_print_white.xml

 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
     <item
     <item
-        android:state_enabled="false"
-        android:drawable="@drawable/home_print_off"/>
-    <item
         android:drawable="@drawable/home_print_white"/>
         android:drawable="@drawable/home_print_white"/>
 </selector>
 </selector>
\ No newline at end of file

ABVJE_UI_Android/res/layout-large/ac_operation_list.xml

@@ -145,6 +145,8 @@
                     android:id="@+id/btn_operation_print"
                     android:id="@+id/btn_operation_print"
                     style="@style/ToolBarIcon"
                     style="@style/ToolBarIcon"
                     android:layout_centerVertical="true"
                     android:layout_centerVertical="true"
+                    android:scaleX="0.6"
+                    android:scaleY="0.6"
                     android:src="@drawable/btn_operation_print" />
                     android:src="@drawable/btn_operation_print" />
             </LinearLayout>
             </LinearLayout>
 
 

ABVJE_UI_Android/res/layout-large/ac_operation_related_content.xml

@@ -148,6 +148,8 @@
                     android:id="@+id/btn_operation_print"
                     android:id="@+id/btn_operation_print"
                     style="@style/ToolBarIcon"
                     style="@style/ToolBarIcon"
                     android:layout_centerVertical="true"
                     android:layout_centerVertical="true"
+                    android:scaleX="0.6"
+                    android:scaleY="0.6"
                     android:src="@drawable/btn_operation_print" />
                     android:src="@drawable/btn_operation_print" />
             </LinearLayout>
             </LinearLayout>
 
 

ABVJE_UI_Android/res/layout-normal/ac_operation_list.xml

@@ -146,6 +146,8 @@
                 android:id="@+id/btn_operation_print"
                 android:id="@+id/btn_operation_print"
                 style="@style/ToolBarIcon"
                 style="@style/ToolBarIcon"
                 android:layout_centerVertical="true"
                 android:layout_centerVertical="true"
+                android:scaleX="0.6"
+                android:scaleY="0.6"
                 android:src="@drawable/btn_operation_print" />
                 android:src="@drawable/btn_operation_print" />
         </LinearLayout>
         </LinearLayout>
 
 

ABVJE_UI_Android/res/layout-normal/ac_operation_related_content.xml

@@ -140,7 +140,9 @@
                 android:layout_width="wrap_content"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_centerVertical="true"
-                android:background="@drawable/btn_operation_print" />
+                android:background="@drawable/btn_operation_print"
+                android:scaleX="0.6"
+                android:scaleY="0.6" />
         </LinearLayout>
         </LinearLayout>
 
 
         <LinearLayout
         <LinearLayout

ABVJE_UI_Android/res/layout/ac_html_webview.xml

@@ -135,6 +135,8 @@
                 android:layout_weight="1"
                 android:layout_weight="1"
                 android:background="@drawable/btn_operation_print_white"
                 android:background="@drawable/btn_operation_print_white"
                 android:contentDescription="@string/print"
                 android:contentDescription="@string/print"
+                android:scaleX="0.7"
+                android:scaleY="0.7"
                 android:visibility="gone" />
                 android:visibility="gone" />
 
 
             <ImageButton
             <ImageButton