#67472 画面の上と下にあるボタンが、端末のボタンに覆われ操作できない（Android15対応）

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVContentViewActivity.java

@@ -94,6 +94,10 @@ import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.ReportS
 import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.TaskKey;
 import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.TaskKey;
 import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.TaskReportId;
 import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.TaskReportId;
 
 
+import androidx.core.view.OnApplyWindowInsetsListener;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
+
 
 
 public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
 public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
 	private static final String TAG ="ABVContentViewActivity";
 	private static final String TAG ="ABVContentViewActivity";
@@ -1385,4 +1389,23 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
 			return null;
 			return null;
 		}
 		}
 	}
 	}
+
+	/**
+	 * Android15以上バージョンOSでPDFのサムネイルが覆われ操作できないこと対応
+	 *
+	 * @param view
+	 */
+	protected void setLayoutInsets(View view) {
+
+		ViewCompat.setOnApplyWindowInsetsListener(view, new OnApplyWindowInsetsListener() {
+			@Override
+			public WindowInsetsCompat onApplyWindowInsets(View v, WindowInsetsCompat insets) {
+				int navBarHeight = insets.getSystemWindowInsetBottom();
+				RelativeLayout.LayoutParams lp = (RelativeLayout.LayoutParams) v.getLayoutParams();
+				lp.bottomMargin = navBarHeight;
+				v.setLayoutParams(lp);
+				return insets;
+			}
+		});
+	}
 }
 }

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

@@ -22,6 +22,7 @@ import android.graphics.Path;
 import android.graphics.RectF;
 import android.graphics.RectF;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.preference.PreferenceManager;
@@ -475,7 +476,9 @@ public class GuideViewActivity extends ABVContentViewActivity {
 			RelativeLayout.LayoutParams param2 = createParam(ViewGroup.LayoutParams.MATCH_PARENT, height);
 			RelativeLayout.LayoutParams param2 = createParam(ViewGroup.LayoutParams.MATCH_PARENT, height);
 			param2.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
 			param2.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
 			mMainLayout.addView(mSeekBarLayout, param2);
 			mMainLayout.addView(mSeekBarLayout, param2);
-
+			if (Build.VERSION.SDK_INT > Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+				setLayoutInsets(mSeekBarLayout);
+			}
 			mPageNumberLayout.setVisibility(View.INVISIBLE);
 			mPageNumberLayout.setVisibility(View.INVISIBLE);
 			RelativeLayout.LayoutParams param = createParam(ViewGroup.LayoutParams.MATCH_PARENT, (int)(convertDensitySize(50) + 0.5f));
 			RelativeLayout.LayoutParams param = createParam(ViewGroup.LayoutParams.MATCH_PARENT, (int)(convertDensitySize(50) + 0.5f));
 			param.setMargins(0, 0, 0, 10);
 			param.setMargins(0, 0, 0, 10);

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

@@ -23,6 +23,7 @@ import android.graphics.RectF;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.preference.PreferenceManager;
@@ -65,10 +66,6 @@ import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.Toast;
 import android.widget.ToggleButton;
 import android.widget.ToggleButton;
 
 
-import androidx.core.view.OnApplyWindowInsetsListener;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.WindowInsetsCompat;
-
 import com.foxit.sdk.PDFException;
 import com.foxit.sdk.PDFException;
 
 
 import org.json.adf.JSONArray;
 import org.json.adf.JSONArray;
@@ -639,18 +636,10 @@ public class ContentViewActivity extends ABVContentViewActivity {
             mSeekBarLayout.setVisibility(View.INVISIBLE);
             mSeekBarLayout.setVisibility(View.INVISIBLE);
         	RelativeLayout.LayoutParams param2 = createParam(ViewGroup.LayoutParams.MATCH_PARENT, height);
         	RelativeLayout.LayoutParams param2 = createParam(ViewGroup.LayoutParams.MATCH_PARENT, height);
         	param2.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
         	param2.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
-			ViewCompat.setOnApplyWindowInsetsListener(mSeekBarLayout, new OnApplyWindowInsetsListener() {
-				@Override
-				public WindowInsetsCompat onApplyWindowInsets(View v, WindowInsetsCompat insets) {
-					int navBarHeight = insets.getSystemWindowInsetBottom();
-					RelativeLayout.LayoutParams lp = (RelativeLayout.LayoutParams) v.getLayoutParams();
-					lp.bottomMargin = navBarHeight;
-					v.setLayoutParams(lp);
-					return insets;
-				}
-			});
         	mMainLayout.addView(mSeekBarLayout, param2);
         	mMainLayout.addView(mSeekBarLayout, param2);
-
+			if (Build.VERSION.SDK_INT > Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+				setLayoutInsets(mSeekBarLayout);
+			}
     		mPageNumberLayout.setVisibility(View.INVISIBLE);
     		mPageNumberLayout.setVisibility(View.INVISIBLE);
         	RelativeLayout.LayoutParams param = createParam(ViewGroup.LayoutParams.MATCH_PARENT, (int)(convertDensitySize(50) + 0.5f));
         	RelativeLayout.LayoutParams param = createParam(ViewGroup.LayoutParams.MATCH_PARENT, (int)(convertDensitySize(50) + 0.5f));
         	param.setMargins(0, 0, 0, 10);
         	param.setMargins(0, 0, 0, 10);