Skip to content

A
abook_check
Commit d72dc680 by Kim Peace
Options

Merge commit '9fab7701' into communication/develop

parents 402c7523 9fab7701
Showing with 17 additions and 16 deletions
ABVJE_UI_Android/res/layout/ac_html_webview.xml
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
android:background="@color/app_color" android:background="@color/app_color"
android:minHeight="50dp" > android:minHeight="50dp" >
<Button <ImageButton
android:id="@+id/closeBtn" android:id="@+id/closeBtn"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
android:background="@drawable/btn_close" android:background="@drawable/btn_close"
android:contentDescription="@string/cont_desc" /> android:contentDescription="@string/cont_desc" />
<Button <ImageButton
android:id="@+id/btn_link_original_back" android:id="@+id/btn_link_original_back"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
android:background="@drawable/btn_remote_start" android:background="@drawable/btn_remote_start"
android:visibility="gone" /> android:visibility="gone" />
<Button <ImageButton
android:id="@+id/btn_history_list" android:id="@+id/btn_history_list"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/menuLayout" android:layout_toLeftOf="@+id/menuLayout"
android:layout_marginRight="10dp" > android:layout_marginRight="10dp" >
<Button <ImageButton
android:id="@+id/btnWebBack" android:id="@+id/btnWebBack"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
android:background="@drawable/btn_history_back" android:background="@drawable/btn_history_back"
android:contentDescription="@string/cont_desc" /> android:contentDescription="@string/cont_desc" />
<Button <ImageButton
android:id="@+id/btnWebForward" android:id="@+id/btnWebForward"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
......
ABVJE_UI_Android/res/layout/item_related_content_panel_render.xml
...@@ -233,7 +233,8 @@ ...@@ -233,7 +233,8 @@
android:layout_marginTop="18dp" android:layout_marginTop="18dp"
android:background="@drawable/operation_radius_frame" android:background="@drawable/operation_radius_frame"
android:text="@string/content_update" android:text="@string/content_update"
android:visibility="gone" /> android:visibility="gone"
android:textColor="@android:color/white" />
</LinearLayout> </LinearLayout>
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/ParentWebViewActivity.java
...@@ -60,12 +60,12 @@ public class ParentWebViewActivity extends ABVContentViewActivity { ...@@ -60,12 +60,12 @@ public class ParentWebViewActivity extends ABVContentViewActivity {
protected ImageButton promoteBtn; protected ImageButton promoteBtn;
protected ImageButton pauseBtn; protected ImageButton pauseBtn;
protected ImageButton mBtnRemoteStart; protected ImageButton mBtnRemoteStart;
protected Button historyListBtn; protected ImageButton historyListBtn;
protected ImageButton btnWebClose; protected ImageButton btnWebClose;
protected Button closeButton; protected ImageButton closeButton;
protected Button btnLinkOriginalBack; protected ImageButton btnLinkOriginalBack;
protected Button btnWebBack; protected ImageButton btnWebBack;
protected Button btnWebForward; protected ImageButton btnWebForward;
private ProgressBar m_progress; private ProgressBar m_progress;
protected ContentDto mContentDto; protected ContentDto mContentDto;
...@@ -77,18 +77,18 @@ public class ParentWebViewActivity extends ABVContentViewActivity { ...@@ -77,18 +77,18 @@ public class ParentWebViewActivity extends ABVContentViewActivity {
taskListButton = (ImageButton) findViewById(R.id.btn_show_task_list); taskListButton = (ImageButton) findViewById(R.id.btn_show_task_list);
// helpButton = (ImageButton) findViewById(R.id.btn_help); // helpButton = (ImageButton) findViewById(R.id.btn_help);
btnWebClose = (ImageButton) findViewById(R.id.btnWebClose); btnWebClose = (ImageButton) findViewById(R.id.btnWebClose);
closeButton = (Button) findViewById(R.id.closeBtn); closeButton = (ImageButton) findViewById(R.id.closeBtn);
historyListBtn = (Button) findViewById(R.id.btn_history_list); historyListBtn = (ImageButton) findViewById(R.id.btn_history_list);
subMenuBtn = (ImageButton) findViewById(R.id.btn_sub_menu); subMenuBtn = (ImageButton) findViewById(R.id.btn_sub_menu);
exitMeetingBtn = (ImageButton) findViewById(R.id.btn_exitMeeting); exitMeetingBtn = (ImageButton) findViewById(R.id.btn_exitMeeting);
mBtnRemoteStart = (ImageButton) findViewById(R.id.btn_remote_start); mBtnRemoteStart = (ImageButton) findViewById(R.id.btn_remote_start);
pauseBtn = (ImageButton) findViewById(R.id.btn_remote_pause); pauseBtn = (ImageButton) findViewById(R.id.btn_remote_pause);
promoteBtn = (ImageButton) findViewById(R.id.btn_promote); promoteBtn = (ImageButton) findViewById(R.id.btn_promote);
btnWebBack = (Button) findViewById(R.id.btnWebBack); btnWebBack = (ImageButton) findViewById(R.id.btnWebBack);
btnWebForward = (Button) findViewById(R.id.btnWebForward); btnWebForward = (ImageButton) findViewById(R.id.btnWebForward);
m_progress = (ProgressBar) findViewById(R.id.refresh_prog); m_progress = (ProgressBar) findViewById(R.id.refresh_prog);
btnLinkOriginalBack = (Button) findViewById(R.id.btn_link_original_back); btnLinkOriginalBack = (ImageButton) findViewById(R.id.btn_link_original_back);
if (!isLinkedContent) { if (!isLinkedContent) {
final Context context = this; final Context context = this;
......
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