Merge commit 'cff9db2a' into communication/develop

ABVJE_Launcher_Android/build.gradle

@@ -17,12 +17,12 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 30
+    buildToolsVersion '30.0.2'
 
     defaultConfig {
         minSdkVersion 23
-        targetSdkVersion 29
+        targetSdkVersion 30
         multiDexEnabled true
 
         // from gradle.properties

ABVJE_Res_Default_Android/build.gradle

@@ -6,12 +6,12 @@ buildscript {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 30
+    buildToolsVersion '30.0.2'
 
     defaultConfig {
         minSdkVersion 23
-        targetSdkVersion 29
+        targetSdkVersion 30
         //abvEnvironments
         resValue("string", "acms_address", "${acms_address}")
         resValue("string", "download_server_address", "${download_server_address}")

ABVJE_UI_Android/build.gradle

@@ -26,12 +26,12 @@ dependencies {
 }
 
 android {
-  compileSdkVersion 29
-  buildToolsVersion '28.0.3'
+  compileSdkVersion 30
+  buildToolsVersion '30.0.2'
 
   defaultConfig {
     minSdkVersion 23
-    targetSdkVersion 29
+    targetSdkVersion 30
     multiDexEnabled true
   }
   sourceSets {

ABVJE_UI_Android/res/layout/content_view_toolbar.xml

@@ -197,6 +197,7 @@
         android:background="@drawable/frame"
         android:padding="8dp"
         android:text=""
+        android:textColor="@android:color/white"
         android:textSize="15sp"
         android:visibility="gone"
         android:maxLines="1" />

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/util/ABVToastUtil.java

 package jp.agentec.abook.abv.ui.common.util;
 
 import android.content.Context;
+import android.os.Build;
 import android.os.Handler;
 import android.view.Gravity;
 import android.widget.Toast;
@@ -43,7 +44,9 @@ public class ABVToastUtil {
                 } else {
                     sToast = Toast.makeText(context.getApplicationContext(), text, duration);
                 }
-                sToast.setGravity(gravity, 0, 0);
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
+                    sToast.setGravity(gravity, 0, 0);
+                }
                 sToast.show();
             }
         });

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

 package jp.agentec.abook.abv.ui.home.activity;
 
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences.Editor;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.Gravity;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.View.OnKeyListener;
+import android.view.animation.AlphaAnimation;
+import android.view.animation.Animation;
+import android.view.animation.Animation.AnimationListener;
+import android.view.animation.TranslateAnimation;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.EditText;
+import android.widget.ImageButton;
+import android.widget.TextView;
+import android.widget.Toast;
+
 import jp.agentec.abook.abv.bl.acms.client.json.CmsUrlJSON;
 import jp.agentec.abook.abv.bl.acms.type.DeleteDataType;
 import jp.agentec.abook.abv.bl.acms.type.LoginMode;
@@ -41,24 +60,6 @@ import jp.agentec.abook.abv.ui.common.dialog.ABookAlertDialog;
 import jp.agentec.abook.abv.ui.common.helper.ABVViewUnbindHelper;
 import jp.agentec.abook.abv.ui.common.util.AlertDialogUtil;
 import jp.agentec.adf.util.StringUtil;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
-import android.os.Bundle;
-import android.view.Gravity;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.View.OnKeyListener;
-import android.view.animation.AlphaAnimation;
-import android.view.animation.Animation;
-import android.view.animation.Animation.AnimationListener;
-import android.view.animation.TranslateAnimation;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.EditText;
-import android.widget.ImageButton;
-import android.widget.TextView;
-import android.widget.Toast;
 
 /**
  * @author Minhyuk Seok
@@ -701,7 +702,9 @@ public class LoginActivity extends ABVLoginActivity {
 		clickCount++;
 		if (clickCount >= 10) {
 			Toast t = Toast.makeText(getApplicationContext(), getResources().getString(R.string.acms_address), Toast.LENGTH_LONG);
-			t.setGravity(Gravity.TOP, 0, 0);
+			if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
+				t.setGravity(Gravity.TOP, 0, 0);
+			}
 			t.show();
 			clickCount = 0;
 		}

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

@@ -138,6 +138,8 @@ public class EnqueteWebViewActivity extends ABVContentViewActivity {
 		settings.setAppCacheEnabled(false);
 		settings.setCacheMode(WebSettings.LOAD_NO_CACHE);
 		// webView.loadDataWithBaseURL("", url2, "text/html", "UTF-8", "");
+		//ターゲットバージョン30以上からデフォルトがfalseに設定されている問題対応
+		settings.setAllowFileAccess(true);
 
 		final RelativeLayout fl = (RelativeLayout) findViewById(R.id.frameTopbar);
 

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

@@ -117,7 +117,8 @@ public class HTMLWebViewActivity extends ParentWebViewActivity {
         settings.setCacheMode(WebSettings.LOAD_NO_CACHE);
         // webView.loadDataWithBaseURL("", url2, "text/html", "UTF-8", "");
         settings.setAllowFileAccessFromFileURLs(true);  //Android7利用で警告ダイヤログ表示問題対応
-
+        //ターゲットバージョン30以上からデフォルトがfalseに設定されている問題対応
+        settings.setAllowFileAccess(true);
 
         final RelativeLayout fl = (RelativeLayout) findViewById(R.id.frameTopbar);
 

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

@@ -114,6 +114,8 @@ public class OnlineHTMLWebViewActivity extends ABVContentViewActivity {
         settings.setAppCacheEnabled(false);
         settings.setCacheMode(WebSettings.LOAD_NO_CACHE);
         settings.setAllowFileAccessFromFileURLs(true);  //Android7利用で警告ダイヤログ表示問題対応
+        //ターゲットバージョン30以上からデフォルトがfalseに設定されている問題対応
+        settings.setAllowFileAccess(true);
 
         webView.setWebViewClient(new WebViewClient() {
             @Override

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

@@ -122,6 +122,9 @@ public class PhotoEditActivity extends Dialog {
 
         editPageWebView.setVisibility(View.GONE);
 
+        //ターゲットバージョン30以上からデフォルトがfalseに設定されている問題対応
+        editPageWebView.getSettings().setAllowFileAccess(true);
+
         //ページをロード
         editPageWebView.loadUrl(editToolPath);
 

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/view/EnqueteLayout.java

@@ -127,7 +127,8 @@ public class EnqueteLayout extends RelativeLayout {
 				settings.setAppCacheEnabled(false);
 				settings.setCacheMode(WebSettings.LOAD_NO_CACHE);
 			}
-
+			//ターゲットバージョン30以上からデフォルトがfalseに設定されている問題対応
+			mWebView.getSettings().setAllowFileAccess(true);
 			if (Logger.isDebugEnabled()) {
 				mWebView.setWebContentsDebuggingEnabled(true); //デバッグモード（chromeからinspect可)
 			}

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/view/OperationTaskLayout.java

@@ -100,7 +100,8 @@ public class OperationTaskLayout extends RelativeLayout {
         settings.setCacheMode(WebSettings.LOAD_NO_CACHE);
         // mWebView.loadDataWithBaseURL("", url2, "text/html", "UTF-8", "");
         settings.setAllowFileAccessFromFileURLs(true);  //Android7利用で警告ダイヤログ表示問題対応
-
+        //ターゲットバージョン30以上からデフォルトがfalseに設定されている問題対応
+        settings.setAllowFileAccess(true);
         mWebView.setAlpha((int) (255 * 1.0f));
         if (Build.VERSION.SDK_INT >= 29) {
             mWebView.setLayerType(View.LAYER_TYPE_SOFTWARE, null);

xwalk_core_library/build.gradle

 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 30
+    buildToolsVersion '30.0.2'
 
     defaultConfig {
         minSdkVersion 23
-        targetSdkVersion 29
+        targetSdkVersion 30
     }
 
     buildTypes {