Merge branch 'communication/develop_44078' into 'communication/develop'

#44078 文書協業接続時にホスト切り替え要求した場合、Android端末のみPIPモード時にその画面に要求ダイアログ表示し、全画面表示できない

See merge request !223

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

@@ -111,10 +111,8 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity implements
     private ChatData chatData;
     private ChatData chatData;
     private String selectedUserIdList;
     private String selectedUserIdList;
     private String mSkey;
     private String mSkey;
-    private boolean isPIP;
     private boolean startPIP = false; // PIPモードを開始していたらtrue;
     private boolean startPIP = false; // PIPモードを開始していたらtrue;
     private boolean needFinishOnStop = false;  // ×ボタンでPIP閉じた時用
     private boolean needFinishOnStop = false;  // ×ボタンでPIP閉じた時用
-    private boolean isStop;
     private boolean doneOnStopEvent = false;
     private boolean doneOnStopEvent = false;
     private String collaborationType = null;
     private String collaborationType = null;
     private String meetingId = null;
     private String meetingId = null;
@@ -819,13 +817,20 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity implements
      * PIPモードから元にもどる
      * PIPモードから元にもどる
      */
      */
     public void finishPIPMode() {
     public void finishPIPMode() {
-        if (!isPIP) {
-            return;
-        }
         if (startPIP) {
         if (startPIP) {
             Intent intent = new Intent();
             Intent intent = new Intent();
             intent.setClass(this, ChatWebViewActivity.class);
             intent.setClass(this, ChatWebViewActivity.class);
             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+            intent.putExtra(ABookCommConstants.KEY.SID, chatData.sid);
+            intent.putExtra(ABookCommConstants.KEY.ROOM_ID, chatData.roomId);
+            intent.putExtra(ABookCommConstants.KEY.ROOM_NAME, chatData.roomName);
+            intent.putExtra(ABookCommConstants.KEY.ROOM_TYPE, chatData.roomType);
+            intent.putExtra(ABookCommConstants.KEY.LOGIN_ID, chatData.loginId);
+            intent.putExtra(ABookCommConstants.KEY.SHOP_NAME, chatData.shopName);
+            intent.putExtra(ABookCommConstants.KEY.COLLABORATION_TYPE, chatData.getStrCollaborationType());
+            intent.putExtra(AppDefType.ChatPushMessageKey.baseActivityName, baseActivityName);
+
             getApplication().startActivity(intent);
             getApplication().startActivity(intent);
             collaborationType = Integer.toString(0);
             collaborationType = Integer.toString(0);
             startPIP = false;
             startPIP = false;
@@ -898,7 +903,6 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity implements
 
 
     @Override
     @Override
     public void onPictureInPictureModeChanged (boolean isInPictureInPictureMode, Configuration newConfig) {
     public void onPictureInPictureModeChanged (boolean isInPictureInPictureMode, Configuration newConfig) {
-        isPIP = isInPictureInPictureMode;
         if (isInPictureInPictureMode) {
         if (isInPictureInPictureMode) {
             // true になったら、PIPのインディケーターを消す
             // true になったら、PIPのインディケーターを消す
             mChatWebView.removePIPIndicator();
             mChatWebView.removePIPIndicator();