Merge branch 'feature/1.0.1_kimjs' into feature/1.0.1

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

@@ -1780,7 +1780,7 @@ public class ContentViewActivity extends ABVContentViewActivity {
         if (isVisable) {
         if (isVisable) {
             operationHomeButton.setVisibility(View.INVISIBLE);
             operationHomeButton.setVisibility(View.INVISIBLE);
             taskListButton.setVisibility(View.INVISIBLE);
             taskListButton.setVisibility(View.INVISIBLE);
-
+			helpButton.setVisibility(View.INVISIBLE);
             if (exitMeetingBtn != null && exitMeetingBtn.getVisibility() == View.VISIBLE) {
             if (exitMeetingBtn != null && exitMeetingBtn.getVisibility() == View.VISIBLE) {
                 RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(WC, WC);
                 RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(WC, WC);
                 params.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
                 params.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
@@ -1797,7 +1797,7 @@ public class ContentViewActivity extends ABVContentViewActivity {
         } else {
         } else {
             operationHomeButton.setVisibility(View.VISIBLE);
             operationHomeButton.setVisibility(View.VISIBLE);
             taskListButton.setVisibility(View.VISIBLE);
             taskListButton.setVisibility(View.VISIBLE);
-
+			helpButton.setVisibility(View.VISIBLE);
             if (exitMeetingBtn != null && meetingManager.isSendable()) {
             if (exitMeetingBtn != null && meetingManager.isSendable()) {
                 RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(WC, WC);
                 RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(WC, WC);
                 params.addRule(RelativeLayout.LEFT_OF, R.id.btn_exitMeeting);
                 params.addRule(RelativeLayout.LEFT_OF, R.id.btn_exitMeeting);

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

@@ -153,6 +153,12 @@ public class ParentWebViewActivity extends ABVContentViewActivity {
 
 
     @Override
     @Override
     protected  void commonConfigureHeader() {
     protected  void commonConfigureHeader() {
+        if (mStatusCode == Constant.XWalkWebViewDisplayStatus.InitView) { //フォームが非表示時のみヘルプボタン表示
+            helpButton.setVisibility(View.VISIBLE);
+        } else {
+            helpButton.setVisibility(View.INVISIBLE);
+        }
+
         if (Constant.XWalkWebViewDisplayStatus.TaskView == mStatusCode) {
         if (Constant.XWalkWebViewDisplayStatus.TaskView == mStatusCode) {
             operationHomeButton.setVisibility(View.GONE);
             operationHomeButton.setVisibility(View.GONE);
             taskListButton.setVisibility(View.GONE);
             taskListButton.setVisibility(View.GONE);