Merge commit '2efdefbd' into communication/develop

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

ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/OperationDao.java

@@ -124,7 +124,7 @@ public class OperationDao extends AbstractDao {
      * @return
      */
     public List<OperationDto> getAllOperation() {
-        return rawQueryGetDtoList("select tp.*, rpc.content_id from t_operation AS tp left outer join r_operation_content AS rpc on tp.operation_id = rpc.operation_id ORDER BY operation_id DESC", null, OperationDto.class);
+        return rawQueryGetDtoList("select tp.*, rpc.content_id from t_operation AS tp left outer join r_operation_content AS rpc on tp.operation_id = rpc.operation_id AND rpc.operation_content_flg = 1 ORDER BY operation_id DESC", null, OperationDto.class);
     }
 
     public List<OperationDto> getLatestOperations() {

ABVJE_Res_Default_Android/res/values-ko/strings.xml

@@ -237,7 +237,7 @@
     <string name="L120">서버와의 통신에 실패하였습니다.</string>
     <string name="L121">다시 시작할 수 없습니다.</string>
     <string name="L122">현재 이 기능은 Android 버전 앱에서 \n 대응하고 있지 않습니다.</string>
-    <string name="L123">표시가 제한된 컨테츠 입니다.\n로그인 패스워드를 입력해 주세요.</string>
+    <string name="L123">표시가 제한된 컨텐츠 입니다.\n로그인 패스워드를 입력해 주세요.</string>
     <string name="L124">시스템에러가 발생하였습니다.앱을 리로드합니다.</string>
 
     <string name="C_E_SYSTEM_0001">예기치 않은 오류가 발생하였습니다.</string>

ABVJE_UI_Android/res/drawable/bg_edit_text_view.xml

@@ -20,7 +20,7 @@
         <shape android:shape="rectangle">
             <solid android:color="@android:color/white" />
             <corners android:radius="1dp" />
-            <stroke android:width="1dp" android:color="@android:color/white" />
+            <stroke android:width="0.5dp" android:color="@android:color/black" />
             <padding
                 android:bottom="7dp"
                 android:left="7dp"

ABVJE_UI_Android/res/layout-normal/item_push_message_list.xml

@@ -11,9 +11,8 @@
         android:orientation="horizontal">
 
         <LinearLayout
-            android:layout_width="match_parent"
+            android:layout_width="250dp"
             android:layout_height="wrap_content"
-            android:layout_weight="10"
             android:orientation="vertical">
 
             <LinearLayout

ABVJE_UI_Android/res/layout-normal/push_message_list_dialog.xml

@@ -127,5 +127,7 @@
     <ListView
         android:id="@+id/lv_push_message"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:divider="@color/line"
+        android:dividerHeight="1px"/>
 </LinearLayout>
\ No newline at end of file

ABVJE_UI_Android/res/layout/content_breadcrumb_layout.xml

@@ -8,7 +8,7 @@
 
     <Button
         android:id="@+id/btn_show_list_view"
-        android:layout_width="wrap_content"
+        android:layout_width="60dp"
         android:layout_height="wrap_content"
         android:background="@drawable/btn_show_list" />
 

ABVJE_UI_Android/res/layout/content_view_toolbar.xml

@@ -203,7 +203,7 @@
 
     <ToggleButton
         android:id="@+id/tbtn_slide"
-        android:layout_width="wrap_content"
+        android:layout_width="60dp"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
         android:layout_below="@+id/RelativeLayout2"
@@ -215,7 +215,7 @@
 
     <ToggleButton
         android:id="@+id/tbtn_marking"
-        android:layout_width="wrap_content"
+        android:layout_width="60dp"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
         android:layout_below="@+id/tbtn_slide"

ABVJE_UI_Android/res/layout/item_related_content_panel_render.xml

@@ -170,7 +170,8 @@
                     android:layout_height="30dp"
                     android:layout_gravity="center"
                     android:background="@drawable/operation_radius_frame"
-                    android:text="@string/save" />
+                    android:text="@string/save"
+                    android:textColor="@android:color/white"/>
 
                 <Button
                     android:id="@+id/pause_save"
@@ -179,7 +180,8 @@
                     android:layout_gravity="center"
                     android:background="@drawable/operation_radius_frame"
                     android:text="@string/pause"
-                    android:visibility="gone" />
+                    android:visibility="gone"
+                    android:textColor="@android:color/white"/>
 
                 <Button
                     android:id="@+id/restart_save"
@@ -188,7 +190,8 @@
                     android:layout_gravity="center"
                     android:background="@drawable/operation_radius_frame"
                     android:text="@string/restart"
-                    android:visibility="gone" />
+                    android:visibility="gone"
+                    android:textColor="@android:color/white"/>
 
                 <Button
                     android:id="@+id/open_content"
@@ -197,7 +200,8 @@
                     android:layout_gravity="center"
                     android:background="@drawable/operation_radius_frame"
                     android:text="@string/open"
-                    android:visibility="gone" />
+                    android:visibility="gone"
+                    android:textColor="@android:color/white"/>
 
                 <Button
                     android:id="@+id/delete_content"

ABVJE_UI_Android/res/layout/memo_popup.xml

@@ -50,7 +50,7 @@
             android:text="@string/save"
             android:visibility="gone" />
 
-        <Button
+        <ImageButton
             android:id="@+id/memo_delete"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

ABVJE_UI_Android/res/layout/operation_select_dialog.xml

@@ -38,6 +38,8 @@
     <ListView
         android:id="@+id/lv_operation_select"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:divider="@color/line"
+        android:dividerHeight="1px"/>
 
 </LinearLayout>
\ No newline at end of file

ABVJE_UI_Android/res/layout/push_message_list_dialog.xml

@@ -126,5 +126,7 @@
     <ListView
         android:id="@+id/lv_push_message"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:divider="@color/line"
+        android:dividerHeight="1px"/>
 </LinearLayout>
\ No newline at end of file

ABVJE_UI_Android/res/layout/push_message_send_dialog.xml

@@ -234,7 +234,9 @@
         android:id="@+id/listView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:visibility="gone" />
+        android:visibility="gone"
+        android:divider="@color/line"
+        android:dividerHeight="1px"/>
 
 
 </LinearLayout>
\ No newline at end of file

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

@@ -1029,8 +1029,12 @@ public abstract class ABVAuthenticatedActivity extends ABVActivity implements Co
 		mPushMessageSendDialog.findViewById(R.id.back_btn).setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
-				showOperationSelectDialog();
-				mPushMessageSendDialog.dismiss();
+				if (mFixPushMessageListView.getVisibility() == View.VISIBLE) { //定型文表示状態
+					showSendPushMessgeView(true);
+				} else { //送信画面表示状態
+					showOperationSelectDialog();
+					mPushMessageSendDialog.dismiss();
+				}
 			}
 		});
 
@@ -1086,8 +1090,6 @@ public abstract class ABVAuthenticatedActivity extends ABVActivity implements Co
 	private void showSendPushMessgeView(boolean sendPushMessageViewFlg) {
 		if (sendPushMessageViewFlg) {
 			mFixPushMessageListView.setVisibility(View.GONE);
-			mPushMessageSendDialog.findViewById(R.id.back_btn).setVisibility(View.GONE);
-
 			mPushMessageSendDialog.findViewById(R.id.push_send_layout).setVisibility(View.VISIBLE);
 			mPushMessageSendDialog.findViewById(R.id.close_btn).setVisibility(View.VISIBLE);
 			EditText messageEditText = (EditText) mPushMessageSendDialog.findViewById(R.id.message);

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/view/ABVBatchSyncView.java

@@ -31,7 +31,7 @@ public class ABVBatchSyncView extends ProgressDialog {
     private boolean isDestroy = false;
 
     public ABVBatchSyncView(Context context) {
-        super(context);
+        super(context, R.style.MyDialogTheme);
         mOperationListActivity = (OperationListActivity)context;
         init();
         isDestroy = false;

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

@@ -398,9 +398,17 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
                 }
             }
         }
-        if (!StringUtil.equalsAny(contentType,
-                ContentJSON.KEY_HTML_TYPE, ContentJSON.KEY_LINK_TYPE, ContentJSON.KEY_ENQUETE_TYPE, ContentJSON.KEY_EXAM_TYPE,
-                ContentJSON.KEY_PANO_MOVIE_TYPE, ContentJSON.KEY_PANO_IMAGE_TYPE, ContentJSON.KEY_OBJECTVR_TYPE)) {
+
+        if (!StringUtil.equalsAny(
+                contentType,
+                ContentJSON.KEY_HTML_TYPE, 
+                ContentJSON.KEY_LINK_TYPE,
+                ContentJSON.KEY_ENQUETE_TYPE, 
+                ContentJSON.KEY_EXAM_TYPE,
+                ContentJSON.KEY_PANO_MOVIE_TYPE,
+                ContentJSON.KEY_PANO_IMAGE_TYPE,
+                ContentJSON.KEY_OBJECTVR_TYPE)
+        ) {
             context.startActivity(intent);
         }
     }

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/view/BreadCrumbButton.java

@@ -3,7 +3,11 @@ package jp.agentec.abook.abv.ui.home.view;
 import jp.agentec.abook.abv.launcher.android.R;
 import android.content.Context;
 import android.graphics.Color;
+import android.view.Gravity;
 import android.widget.Button;
+import android.widget.TextView;
+
+
 
 /**
  * パンくず履歴用のボタン
@@ -16,10 +20,12 @@ public class BreadCrumbButton extends Button {
 		super(context);
 	}
 	public BreadCrumbButton(Context context, String name) {
-		super(context);
+		super(context, null, R.style.ButtonABookDark);
 		this.name = name;
-		setText(name);
+		//画面表示調整のため、最後に空白を追加する。
+		setText(name + "   ");
 		setTextColor(Color.BLACK);
+		setGravity(Gravity.CENTER_VERTICAL);
 		setBackgroundResource(R.drawable.btn_breadcrumbs);
 		setPadding(10, 0, 40, 0);
 	}

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

@@ -5386,7 +5386,7 @@ public class ContentViewActivity extends ABVContentViewActivity {
                     zoomRelativeLayout.removeView(view);
                 }
             }
-            List<OperationTaskDto> tasks = mTaskHotspotJSON.getPageTasks(i);
+            List<OperationTaskDto> tasks = mTaskHotspotJSON.getPageTasks(key);
 			operationTaskLayout.addAllOperationTaskIcon(zoomRelativeLayout, tasks);
 		}
 	}

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

@@ -18,6 +18,7 @@ import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -61,7 +62,7 @@ public class MemoManager {
 		memoDialog.setContentView(contentView);
 		
 		final EditText memoText = (EditText) contentView.findViewById(R.id.memoText);
-		final Button btnDelete = (Button) contentView.findViewById(R.id.memo_delete);
+		final ImageButton btnDelete = (ImageButton) contentView.findViewById(R.id.memo_delete);
 		final Button btnSave = (Button) contentView.findViewById(R.id.memo_save);
 		final Button btnCancel = (Button) contentView.findViewById(R.id.memo_cancel);
 		final ImageView abookmark = (ImageView) contentView.findViewById(R.id.abookmark);