Commit 4d9704b1 by Lee Munkyeong

Merge branch 'features/1.4.100_develop_mk' into 'features/1.4.201'

Features/1.4.100 develop mk

See merge request !240
parents 6260c90e d35a8266
Subproject commit 97e1881f1dde0fe861359bfda4c5a0dc404f5c80
Subproject commit 2d46495648e5448102da39f0641590102570421a
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:drawable="@drawable/home_print_on"/>
android:drawable="@drawable/icon_pdf"/>
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:drawable="@drawable/home_print_white"/>
android:drawable="@drawable/icon_pdf"/>
</selector>
\ No newline at end of file
......@@ -10,7 +10,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/app_color"
android:minHeight="50dp" >
android:minHeight="50dp">
<ImageButton
android:id="@+id/closeBtn"
......@@ -117,7 +117,7 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="5dp" >
android:layout_marginRight="5dp">
<ImageButton
android:id="@+id/btn_reload"
......@@ -136,8 +136,6 @@
android:layout_weight="1"
android:background="@drawable/btn_operation_print_white"
android:contentDescription="@string/print"
android:scaleX="0.6"
android:scaleY="0.6"
android:visibility="gone" />
<ImageButton
......@@ -191,7 +189,8 @@
android:layout_height="wrap_content"
android:background="@drawable/ic_operation_task_list"
android:layout_marginRight="10dp"
android:visibility="gone" />
android:visibility="gone"
/>
</LinearLayout>
</RelativeLayout>
......
......@@ -914,8 +914,6 @@ public class OperationListActivity extends ABVUIActivity {
@Override
public String syncOperation(final long operationId, int reportType, boolean buttonEventFlag) {
final StringBuilder errorMsg = new StringBuilder();
Logger.i(TAG, "---sync start");
try {
//コンテンツダウンロード関連プログレスバー値設定
progressDialogHorizontal.setProgress(20);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment