Merge branch 'develop' into features/1.4.0

ABVJE_UI_Android/res/layout/ac_html_xwalk.xml

@@ -13,7 +13,7 @@
         android:background="@color/app_color"
         android:background="@color/app_color"
         android:minHeight="50dp" >
         android:minHeight="50dp" >
 
 
-        <Button
+        <ImageButton
             android:id="@+id/closeBtn"
             android:id="@+id/closeBtn"
             android:layout_width="wrap_content"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_height="wrap_content"
@@ -24,7 +24,7 @@
             android:visibility="visible"
             android:visibility="visible"
             android:contentDescription="@string/cont_desc" />
             android:contentDescription="@string/cont_desc" />
 
 
-        <Button
+        <ImageButton
             android:id="@+id/btn_link_original_back"
             android:id="@+id/btn_link_original_back"
             android:layout_width="wrap_content"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_height="wrap_content"
@@ -52,7 +52,7 @@
                 android:gravity="center"
                 android:gravity="center"
                 android:textStyle="bold" />
                 android:textStyle="bold" />
         </LinearLayout>
         </LinearLayout>
-        <Button
+        <ImageButton
             android:id="@+id/btn_operation_home"
             android:id="@+id/btn_operation_home"
             android:layout_width="wrap_content"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_height="wrap_content"
@@ -82,7 +82,7 @@
             android:background="@drawable/btn_remote_start"
             android:background="@drawable/btn_remote_start"
             android:visibility="gone" />
             android:visibility="gone" />
 
 
-        <Button
+        <ImageButton
             android:id="@+id/btn_history_list"
             android:id="@+id/btn_history_list"
             android:layout_width="wrap_content"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_height="wrap_content"
@@ -98,7 +98,7 @@
             android:layout_centerVertical="true"
             android:layout_centerVertical="true"
             android:layout_toLeftOf="@+id/menuLayout"
             android:layout_toLeftOf="@+id/menuLayout"
             android:layout_marginRight="10dp" >
             android:layout_marginRight="10dp" >
-            <Button
+            <ImageButton
                 android:id="@+id/btnWebBack"
                 android:id="@+id/btnWebBack"
                 android:layout_width="wrap_content"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_height="wrap_content"
@@ -106,7 +106,7 @@
                 android:background="@drawable/btn_history_back"
                 android:background="@drawable/btn_history_back"
                 android:contentDescription="@string/cont_desc" />
                 android:contentDescription="@string/cont_desc" />
 
 
-            <Button
+            <ImageButton
                 android:id="@+id/btnWebForward"
                 android:id="@+id/btnWebForward"
                 android:layout_width="wrap_content"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_height="wrap_content"

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebViewActivity.java

@@ -669,11 +669,6 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
                 }
                 }
                 return false;
                 return false;
             }
             }
-
-            @Override
-            public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
-                handler.proceed();
-            }
         });
         });
     }
     }
 
 

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

@@ -198,8 +198,6 @@ public class HTMLXWalkWebViewActivity extends ParentWebViewActivity {
 
 
         subMenuBtn.setVisibility(View.GONE);
         subMenuBtn.setVisibility(View.GONE);
 
 
-        final Button btnWebBack = (Button) findViewById(R.id.btnWebBack);
-        final Button btnWebForward = (Button) findViewById(R.id.btnWebForward);
         btnWebClose.setOnClickListener(new View.OnClickListener() {
         btnWebClose.setOnClickListener(new View.OnClickListener() {
             @Override
             @Override
             public void onClick(View v) {
             public void onClick(View v) {

gradle.properties

@@ -86,8 +86,8 @@ is_check_invalid_passward_limit=true
 repeat_default=true
 repeat_default=true
 
 
 #Setting Info(設定画面のABookについての設定情報)
 #Setting Info(設定画面のABookについての設定情報)
-version_name=1.3.200
-release_date=2021/06/22
+version_name=1.3.201
+release_date=2021/07/06
 copy_right=2016 AGENTEC Co.,Ltd. All rights reserved.
 copy_right=2016 AGENTEC Co.,Ltd. All rights reserved.
 hope_page=http://www.agentec.jp
 hope_page=http://www.agentec.jp
 contact_email=abook-appsupport@agentec.jp
 contact_email=abook-appsupport@agentec.jp