Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix add call issue, numpad issue and videoCall FC

Browse source
This commit is contained in:
Sylvain Berfini 2012-05-11 10:33:34 +02:00
parent b13bf1d05b
commit 5565ce11d0
4 changed files with 62 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
res/layout/dialer.xml
View file

@ -47,6 +47,32 @@
android:src="@drawable/startcall_green" android:src="@drawable/startcall_green"
android:background="@drawable/clavier_bg" /> android:background="@drawable/clavier_bg" />
<LinearLayout
android:id="@+id/InCallControls"
android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:orientation="horizontal"
android:visibility="gone"
android:layout_weight="3" >
<Button
android:id="@+id/AddCall"
style="@style/DialerDigit"
android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:layout_weight="1"
android:text="@string/AddCallButtonText" />
<Button
android:id="@+id/Back"
style="@style/DialerDigit"
android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:layout_weight="1"
android:text="@string/CancelButtonText" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

64
src/org/linphone/DialerActivity.java
View file

@ -222,6 +222,38 @@ public class DialerActivity extends Activity implements LinphoneGuiListener {
mInCallControls = (LinearLayout) findViewById(R.id.InCallControls); mInCallControls = (LinearLayout) findViewById(R.id.InCallControls);
mStatus = (TextView) findViewById(R.id.status_label); mStatus = (TextView) findViewById(R.id.status_label);
if (mBack != null) {
mBack.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
LinphoneCall call = LinphoneManager.getLc().getCurrentCall();
if (call.getCurrentParamsCopy().getVideoEnabled())
LinphoneActivity.instance().startVideoActivity(call, 0);
else
LinphoneActivity.instance().startIncallActivity();
}
});
}
if (mAddCall != null) {
mAddCall.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
LinphoneCall call = LinphoneManager.getLc().getCurrentCall();
if (call != null && !call.isInConference()) {
LinphoneManager.getLc().pauseCall(call);
} else {
LinphoneManager.getLc().leaveConference();
}
try {
LinphoneManager.getLc().invite(mAddress.getText().toString());
} catch (LinphoneCoreException e) {
Log.e(e);
Toast.makeText(DialerActivity.this, R.string.error_adding_new_call, Toast.LENGTH_LONG).show();
}
}
});
}
if (Version.isXLargeScreen(this)) { if (Version.isXLargeScreen(this)) {
tryToInitTabletUI(); tryToInitTabletUI();
} }
@ -304,38 +336,6 @@ public class DialerActivity extends Activity implements LinphoneGuiListener {
} }
}); });
} }
if (mBack != null) {
mBack.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
LinphoneCall call = LinphoneManager.getLc().getCurrentCall();
if (call.getCurrentParamsCopy().getVideoEnabled())
LinphoneActivity.instance().startVideoActivity(call, 0);
else
LinphoneActivity.instance().startIncallActivity();
}
});
}
if (mAddCall != null) {
mAddCall.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
LinphoneCall call = LinphoneManager.getLc().getCurrentCall();
if (call != null && !call.isInConference()) {
LinphoneManager.getLc().pauseCall(call);
} else {
LinphoneManager.getLc().leaveConference();
}
try {
LinphoneManager.getLc().invite(mAddress.getText().toString());
} catch (LinphoneCoreException e) {
Log.e(e);
Toast.makeText(DialerActivity.this, R.string.error_adding_new_call, Toast.LENGTH_LONG).show();
}
}
});
}
} }
private void checkIfOutgoingCallIntentReceived() { private void checkIfOutgoingCallIntentReceived() {

4
src/org/linphone/VideoCallActivity.java
View file

@ -201,7 +201,9 @@ public class VideoCallActivity extends Activity implements
// Hack to force the redraw of the preview // Hack to force the redraw of the preview
// Camera will be re-enabled in onResume just after anyway // Camera will be re-enabled in onResume just after anyway
shouldRestartVideoOnResume = true; shouldRestartVideoOnResume = true;
LinphoneManager.getLc().getCurrentCall().enableCamera(false); LinphoneCall currentCall = LinphoneManager.getLc().getCurrentCall();
if (currentCall != null)
currentCall.enableCamera(false);
} }
void updateQualityOfSignalIcon(float quality) { void updateQualityOfSignalIcon(float quality) {

2
src/org/linphone/ui/Digit.java
View file

@ -105,7 +105,7 @@ public class Digit extends Button implements AddressAware {
mIsDtmfStarted =false; mIsDtmfStarted =false;
if (lc.isIncall()) { if (lc.isIncall()) {
lc.sendDtmf(mKeyCode.charAt(0)); lc.sendDtmf(mKeyCode.charAt(0));
return; // return;
} }
} }