43109対応。

ABVJE_Launcher_Android/AndroidManifest.xml

@@ -250,6 +250,7 @@
         </activity>
 
         <activity android:name="jp.agentec.abook.abv.ui.home.activity.ChatWebViewActivity" android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:taskAffinity=".ChatWebViewActivity"
             android:resizeableActivity="true"
             android:supportsPictureInPicture="true"/>
 

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

@@ -1659,6 +1659,11 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
         }
     }
 
+    public void startPIPmode() {
+        PictureInPictureParams.Builder mPipBuilder = new PictureInPictureParams.Builder();
+        enterPictureInPictureMode(mPipBuilder.build());
+    }
+
     public void exitAndDeleteMeetingRoom() {
         if (meetingManager.isConnected() && meetingManager.isOwner()) {
             try {

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ActivityHandlingHelper.java

@@ -174,11 +174,11 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
             @Override
             public void run() {
                 try {
-                    intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | intent.FLAG_ACTIVITY_NEW_TASK);
+                    intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | intent.FLAG_ACTIVITY_NEW_TASK);
                     if (page != null) {
                         intent.putExtra(ABVActivity.PAGE, page);
                     }
-                    startContentActivity(mContext, intent, null, Intent.FLAG_ACTIVITY_SINGLE_TOP | intent.FLAG_ACTIVITY_NEW_TASK, contentId);
+                    startContentActivity(mContext, intent, null, Intent.FLAG_ACTIVITY_CLEAR_TOP | intent.FLAG_ACTIVITY_NEW_TASK, contentId);
                 } catch (Exception e) {
                     Logger.e(TAG, "startContentActivity contentId=" + contentId, e);
                     showToast(mContext.getString(R.string.E113));
@@ -385,18 +385,10 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
 
             recordContentReadLog(context, contentId);
         }
-        //AbookCommの文書協業の場合(ChatWebviewがPIPモードの場合)既存Contextでなく以前のActivityから画面を遷移する。
+        //資料が変更されたらPIPモードに更新する。
         ChatWebViewActivity chatWebViewActivity = getActivity(ChatWebViewActivity.class);
-        if (chatWebViewActivity != null && chatWebViewActivity.isInPictureInPictureMode()) {
-            context = getCurrentActivity();
-            intent.removeFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | intent.FLAG_ACTIVITY_NEW_TASK);
-            intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
-            if (context instanceof ChatWebViewActivity) {
-                Stack<ABVAuthenticatedActivity> stack = getCurrentActivityStack();
-                if (stack.size() > 1){
-                    context = stack.get(stack.size()-2);
-                }
-            }
+        if (chatWebViewActivity != null && meetingManager.isSubscribed() && !chatWebViewActivity.isInPictureInPictureMode()) {
+            chatWebViewActivity.startPIPmode();
         }
 
         if (!StringUtil.equalsAny(