diff --git a/res/drawable/conf_details.png b/res/drawable/conf_details.png new file mode 100644 index 000000000..7168af580 Binary files /dev/null and b/res/drawable/conf_details.png differ diff --git a/res/layout/conf_callee.xml b/res/layout/conf_callee.xml index cf1210cfa..e46979919 100644 --- a/res/layout/conf_callee.xml +++ b/res/layout/conf_callee.xml @@ -27,6 +27,7 @@ + diff --git a/res/layout/conf_callee_older_devices.xml b/res/layout/conf_callee_older_devices.xml index 4b859a2e7..76b4b5494 100644 --- a/res/layout/conf_callee_older_devices.xml +++ b/res/layout/conf_callee_older_devices.xml @@ -1,11 +1,11 @@ - + android:paddingRight="5dp" android:paddingLeft="5dp" android:scaleType="centerInside"/> - - - + + android:src="@drawable/conf_status_paused" android:visibility="gone" /> @@ -39,4 +36,8 @@ android:src="@drawable/conf_maybe_secured" android:visibility="gone"/> - + + + + diff --git a/res/layout/incall_layout.xml b/res/layout/incall_layout.xml index ee186eaf8..bb96cc862 100644 --- a/res/layout/incall_layout.xml +++ b/res/layout/incall_layout.xml @@ -7,14 +7,17 @@ android:orientation="vertical"> + android:gravity="center" android:layout_gravity="center_vertical" /> + diff --git a/src/org/linphone/IncallActivity.java b/src/org/linphone/IncallActivity.java index 10db13675..24dddbfe8 100644 --- a/src/org/linphone/IncallActivity.java +++ b/src/org/linphone/IncallActivity.java @@ -109,6 +109,8 @@ public class IncallActivity extends AbstractCalleesActivity implements mConferenceVirtualCallee = findViewById(R.id.conf_header); mConferenceVirtualCallee.setOnClickListener(this); mConferenceVirtualCallee.setOnLongClickListener(this); + enableView(mConferenceVirtualCallee, R.id.conf_header_details, this, true); + boolean mMayDoVideo = Version.isVideoCapable() && LinphoneManager.getInstance().isVideoEnabled(); @@ -216,7 +218,12 @@ public class IncallActivity extends AbstractCalleesActivity implements @Override public boolean onLongClick(View v) { - if (v.getId() == R.id.conf_header) { + if (v.getId() == R.id.conf_header || v.getId() == R.id.conf_header_details) { + if (!lc().isInConference()) { + // make sure we are in the conference + // especially due to the difficulty to aim at the detail button. + lc().enterConference(); + } LinphoneActivity.instance().startConferenceDetailsActivity(); return true; } @@ -260,6 +267,9 @@ public class IncallActivity extends AbstractCalleesActivity implements boolean enterConf = !lc().isInConference(); enterConferenceAndVirtualConfView(enterConf); break; + case R.id.conf_header_details: + onLongClick(v); + break; case R.id.incallNumpadShow: showDialog(numpadDialogId); break; @@ -527,6 +537,8 @@ public class IncallActivity extends AbstractCalleesActivity implements registerCallDurationTimer(v, call); + enableView(v, R.id.callee_status_details, showCallActionsSimpleListener, true); + return v; } }