簡易帳票関連の修正依頼対応（アイコンは未差し替え）

ABVJE_Res_Default_Android/res/drawable/btn_history_back_for_webview.xml

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

ABVJE_Res_Default_Android/res/values-ja/strings.xml

@@ -534,7 +534,7 @@
     <string name="title_all_operation">全作業</string>
     <string name="title_all_operation">全作業</string>
 
 
     <!-- ABookCheck 1.2.3 -->
     <!-- ABookCheck 1.2.3 -->
-    <string name="title_quick_report_output">簡易帳票出力</string>
+    <string name="title_quick_report_output">帳票確認</string>
 
 
     <!-- 1.0.1 Resource Pattern 1 -->
     <!-- 1.0.1 Resource Pattern 1 -->
     <!-- 1.9.0.0-->
     <!-- 1.9.0.0-->

ABVJE_Res_Default_Android/res/values-ko/strings.xml

@@ -536,7 +536,7 @@
     <string name="title_all_operation">전체 작업</string>
     <string name="title_all_operation">전체 작업</string>
 
 
     <!-- ABookCheck 1.2.3 -->
     <!-- ABookCheck 1.2.3 -->
-    <string name="title_quick_report_output">간이 장표 출력</string>
+    <string name="title_quick_report_output">장표 확인</string>
 
 
     <!-- 1.0.1 Resource Pattern 1 -->
     <!-- 1.0.1 Resource Pattern 1 -->
     <!-- 1.9.0.0-->
     <!-- 1.9.0.0-->

ABVJE_Res_Default_Android/res/values/strings.xml

@@ -540,7 +540,7 @@
     <string name="title_all_operation">All</string>
     <string name="title_all_operation">All</string>
 
 
     <!-- ABookCheck 1.2.3 -->
     <!-- ABookCheck 1.2.3 -->
-    <string name="title_quick_report_output">Simple form output</string>
+    <string name="title_quick_report_output">Report confirmation</string>
 
 
     <!-- 1.0.1 Resource Pattern 1 -->
     <!-- 1.0.1 Resource Pattern 1 -->
     <!-- 1.9.0.0-->
     <!-- 1.9.0.0-->

ABVJE_UI_Android/res/layout/ac_online_html_webview.xml

 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/LinearLayout1"
     android:id="@+id/LinearLayout1"
     android:layout_width="match_parent"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_height="match_parent"
@@ -12,22 +13,38 @@
         android:background="@color/app_color"
         android:background="@color/app_color"
         android:minHeight="50dp" >
         android:minHeight="50dp" >
 
 
-        <Button
-            android:id="@+id/closeBtn"
+        <ImageButton
+            android:id="@+id/backBtn"
             android:layout_width="wrap_content"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentLeft="false"
+            android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
             android:layout_alignParentStart="true"
+            android:layout_alignTop="@+id/linearLayout"
             android:layout_centerVertical="true"
             android:layout_centerVertical="true"
             android:layout_marginLeft="5dp"
             android:layout_marginLeft="5dp"
             android:layout_marginStart="5dp"
             android:layout_marginStart="5dp"
+            android:background="@null"
+            android:src="@drawable/btn_history_back_for_webview" />
+
+        <Button
+            android:id="@+id/closeBtn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentLeft="false"
+            android:layout_alignParentStart="false"
+            android:layout_centerVertical="true"
+            android:layout_marginEnd="5dp"
+            android:layout_marginRight="5dp"
             android:background="@drawable/btn_close"
             android:background="@drawable/btn_close"
-            android:contentDescription="@string/cont_desc" />
+            android:contentDescription="@string/cont_desc"
+            android:layout_alignParentRight="true" />
 
 
         <LinearLayout
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_centerInParent="true">
+            android:layout_centerInParent="true"
+            android:id="@+id/linearLayout">
 
 
             <TextView
             <TextView
                 android:id="@+id/title"
                 android:id="@+id/title"

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/OnlineHTMLWebViewActivity.java

@@ -14,6 +14,7 @@ import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.webkit.WebViewClient;
 import android.widget.Button;
 import android.widget.Button;
+import android.widget.ImageButton;
 import android.widget.TextView;
 import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.Toast;
 
 
@@ -34,6 +35,7 @@ public class OnlineHTMLWebViewActivity extends ABVContentViewActivity {
     private WebView webView;
     private WebView webView;
 
 
     private Button closeButton;
     private Button closeButton;
+    private ImageButton backButton;
 
 
     @Override
     @Override
     protected void onCreate(Bundle savedInstanceState) {
     protected void onCreate(Bundle savedInstanceState) {
@@ -59,7 +61,7 @@ public class OnlineHTMLWebViewActivity extends ABVContentViewActivity {
         OnlineHTMLWebViewLogic logic = AbstractLogic.getLogic(OnlineHTMLWebViewLogic.class);
         OnlineHTMLWebViewLogic logic = AbstractLogic.getLogic(OnlineHTMLWebViewLogic.class);
         webView.postUrl(url, logic.getPostData(param));
         webView.postUrl(url, logic.getPostData(param));
 
 
-        // ***** 戻るボタン
+        // ***** 閉じるボタン
         closeButton = findViewById(R.id.closeBtn);
         closeButton = findViewById(R.id.closeBtn);
         closeButton.setOnClickListener(new View.OnClickListener() {
         closeButton.setOnClickListener(new View.OnClickListener() {
             @Override
             @Override
@@ -67,6 +69,15 @@ public class OnlineHTMLWebViewActivity extends ABVContentViewActivity {
                 finishActivity();
                 finishActivity();
             }
             }
         });
         });
+
+        // ***** 戻るボタン
+        backButton = findViewById(R.id.backBtn);
+        backButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                webView.goBack();
+            }
+        });
     }
     }
 
 
     private void setWebView() {
     private void setWebView() {
@@ -98,6 +109,12 @@ public class OnlineHTMLWebViewActivity extends ABVContentViewActivity {
                 Logger.v(TAG, "shouldOverrideUrlLoading: %s", url);
                 Logger.v(TAG, "shouldOverrideUrlLoading: %s", url);
                 return false;
                 return false;
             }
             }
+            @Override
+            public void onPageFinished(WebView view, String url) {
+                // ***** 戻るボタンの活性制御
+                backButton.setEnabled(webView.canGoBack());
+                super.onPageFinished(view, url);
+            }
         });
         });
 
 
         webView.setDownloadListener(new DownloadListener() {
         webView.setDownloadListener(new DownloadListener() {