Commit 9fab7701 by Kim Jinsung

Merge branch 'features/1.3.200_43014' into 'features/1.3.200'

Bug #43014【android10不具合対応 Check】ビューア画面上部のアイコンが引き延ばされている

See merge request !171
parents 6d976ba7 2e872a0d
......@@ -12,7 +12,7 @@
android:background="@color/app_color"
android:minHeight="50dp" >
<Button
<ImageButton
android:id="@+id/closeBtn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -22,7 +22,7 @@
android:background="@drawable/btn_close"
android:contentDescription="@string/cont_desc" />
<Button
<ImageButton
android:id="@+id/btn_link_original_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -79,7 +79,7 @@
android:background="@drawable/btn_remote_start"
android:visibility="gone" />
<Button
<ImageButton
android:id="@+id/btn_history_list"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -95,7 +95,7 @@
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/menuLayout"
android:layout_marginRight="10dp" >
<Button
<ImageButton
android:id="@+id/btnWebBack"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -103,7 +103,7 @@
android:background="@drawable/btn_history_back"
android:contentDescription="@string/cont_desc" />
<Button
<ImageButton
android:id="@+id/btnWebForward"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
......@@ -60,12 +60,12 @@ public class ParentWebViewActivity extends ABVContentViewActivity {
protected ImageButton promoteBtn;
protected ImageButton pauseBtn;
protected ImageButton mBtnRemoteStart;
protected Button historyListBtn;
protected ImageButton historyListBtn;
protected ImageButton btnWebClose;
protected Button closeButton;
protected Button btnLinkOriginalBack;
protected Button btnWebBack;
protected Button btnWebForward;
protected ImageButton closeButton;
protected ImageButton btnLinkOriginalBack;
protected ImageButton btnWebBack;
protected ImageButton btnWebForward;
private ProgressBar m_progress;
protected ContentDto mContentDto;
......@@ -77,18 +77,18 @@ public class ParentWebViewActivity extends ABVContentViewActivity {
taskListButton = (ImageButton) findViewById(R.id.btn_show_task_list);
// helpButton = (ImageButton) findViewById(R.id.btn_help);
btnWebClose = (ImageButton) findViewById(R.id.btnWebClose);
closeButton = (Button) findViewById(R.id.closeBtn);
historyListBtn = (Button) findViewById(R.id.btn_history_list);
closeButton = (ImageButton) findViewById(R.id.closeBtn);
historyListBtn = (ImageButton) findViewById(R.id.btn_history_list);
subMenuBtn = (ImageButton) findViewById(R.id.btn_sub_menu);
exitMeetingBtn = (ImageButton) findViewById(R.id.btn_exitMeeting);
mBtnRemoteStart = (ImageButton) findViewById(R.id.btn_remote_start);
pauseBtn = (ImageButton) findViewById(R.id.btn_remote_pause);
promoteBtn = (ImageButton) findViewById(R.id.btn_promote);
btnWebBack = (Button) findViewById(R.id.btnWebBack);
btnWebForward = (Button) findViewById(R.id.btnWebForward);
btnWebBack = (ImageButton) findViewById(R.id.btnWebBack);
btnWebForward = (ImageButton) findViewById(R.id.btnWebForward);
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) {
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