Merge branch 'features/1.3.200_42903' into 'features/1.3.200'

Bug #42903【android10不具合対応 Check】ボタンの表示等が変わってしまっている

See merge request !161

ABVJE_UI_Android/res/drawable/bg_edit_text_view.xml

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

ABVJE_UI_Android/res/layout/content_breadcrumb_layout.xml

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

ABVJE_UI_Android/res/layout/content_view_toolbar.xml

@@ -203,7 +203,7 @@
 
 
     <ToggleButton
     <ToggleButton
         android:id="@+id/tbtn_slide"
         android:id="@+id/tbtn_slide"
-        android:layout_width="wrap_content"
+        android:layout_width="60dp"
         android:layout_height="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
         android:layout_alignParentLeft="true"
         android:layout_below="@+id/RelativeLayout2"
         android:layout_below="@+id/RelativeLayout2"
@@ -215,7 +215,7 @@
 
 
     <ToggleButton
     <ToggleButton
         android:id="@+id/tbtn_marking"
         android:id="@+id/tbtn_marking"
-        android:layout_width="wrap_content"
+        android:layout_width="60dp"
         android:layout_height="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
         android:layout_alignParentLeft="true"
         android:layout_below="@+id/tbtn_slide"
         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_height="30dp"
                     android:layout_gravity="center"
                     android:layout_gravity="center"
                     android:background="@drawable/operation_radius_frame"
                     android:background="@drawable/operation_radius_frame"
-                    android:text="@string/save" />
+                    android:text="@string/save"
+                    android:textColor="@android:color/white"/>
 
 
                 <Button
                 <Button
                     android:id="@+id/pause_save"
                     android:id="@+id/pause_save"
@@ -179,7 +180,8 @@
                     android:layout_gravity="center"
                     android:layout_gravity="center"
                     android:background="@drawable/operation_radius_frame"
                     android:background="@drawable/operation_radius_frame"
                     android:text="@string/pause"
                     android:text="@string/pause"
-                    android:visibility="gone" />
+                    android:visibility="gone"
+                    android:textColor="@android:color/white"/>
 
 
                 <Button
                 <Button
                     android:id="@+id/restart_save"
                     android:id="@+id/restart_save"
@@ -188,7 +190,8 @@
                     android:layout_gravity="center"
                     android:layout_gravity="center"
                     android:background="@drawable/operation_radius_frame"
                     android:background="@drawable/operation_radius_frame"
                     android:text="@string/restart"
                     android:text="@string/restart"
-                    android:visibility="gone" />
+                    android:visibility="gone"
+                    android:textColor="@android:color/white"/>
 
 
                 <Button
                 <Button
                     android:id="@+id/open_content"
                     android:id="@+id/open_content"
@@ -197,7 +200,8 @@
                     android:layout_gravity="center"
                     android:layout_gravity="center"
                     android:background="@drawable/operation_radius_frame"
                     android:background="@drawable/operation_radius_frame"
                     android:text="@string/open"
                     android:text="@string/open"
-                    android:visibility="gone" />
+                    android:visibility="gone"
+                    android:textColor="@android:color/white"/>
 
 
                 <Button
                 <Button
                     android:id="@+id/delete_content"
                     android:id="@+id/delete_content"

ABVJE_UI_Android/res/layout/memo_popup.xml

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

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;
     private boolean isDestroy = false;
 
 
     public ABVBatchSyncView(Context context) {
     public ABVBatchSyncView(Context context) {
-        super(context);
+        super(context, R.style.MyDialogTheme);
         mOperationListActivity = (OperationListActivity)context;
         mOperationListActivity = (OperationListActivity)context;
         init();
         init();
         isDestroy = false;
         isDestroy = false;

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

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

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