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

Finish incoming call activity on action. Terminate call on back and home.

Browse source
This commit is contained in:
Guillaume Beraudo 2011-09-27 11:59:05 +02:00
parent 3ea4fdb5be
commit ebe078c70e
2 changed files with 41 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
res/layout/incoming.xml
View file

@ -28,15 +28,17 @@
</LinearLayout> </LinearLayout>
<org.linphone.ui.CallButton android:src="@drawable/startcall_green" android:layout_width="wrap_content" <org.linphone.ui.CallButton android:id="@+id/Answer"
android:layout_height="wrap_content" android:id="@+id/Answer" android:src="@drawable/startcall_green" android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="answer" android:text="answer"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_alignParentLeft="true" android:layout_marginBottom="40sp" android:layout_alignParentLeft="true" android:layout_marginBottom="40sp"
android:layout_alignParentBottom="true"/> android:layout_alignParentBottom="true"/>
<org.linphone.ui.HangCallButton android:src="@drawable/stopcall_red" android:layout_width="wrap_content" <org.linphone.ui.HangCallButton android:id="@+id/Decline"
android:layout_height="wrap_content" android:id="@+id/Decline" android:src="@drawable/stopcall_red" android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="decline" android:text="decline"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_alignParentRight="true" android:layout_alignBottom="@id/Answer"/> android:layout_alignParentRight="true" android:layout_alignBottom="@id/Answer"/>

38
src/org/linphone/IncomingCallActivity.java
View file

@ -18,9 +18,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
package org.linphone; package org.linphone;
import org.linphone.core.LinphoneAddress;
import org.linphone.core.LinphoneCall;
import org.linphone.core.LinphoneCore;
import org.linphone.ui.CallButton;
import org.linphone.ui.HangCallButton;
import android.app.Activity; import android.app.Activity;
import android.os.Bundle; import android.os.Bundle;
import android.view.KeyEvent;
import android.view.View;
import android.view.WindowManager; import android.view.WindowManager;
import android.view.View.OnClickListener;
import android.widget.TextView; import android.widget.TextView;
/** /**
@ -29,20 +38,28 @@ import android.widget.TextView;
* *
* @author Guillaume Beraudo * @author Guillaume Beraudo
*/ */
public class IncomingCallActivity extends Activity { public class IncomingCallActivity extends Activity implements OnClickListener {
private TextView mNameView; private TextView mNameView;
private TextView mNumberView; private TextView mNumberView;
private LinphoneCall mCall;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
LinphoneCore lc = LinphoneManager.getLc();
mCall = lc.getCurrentCall();
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.incoming); setContentView(R.layout.incoming);
mNameView = (TextView) findViewById(R.id.incoming_caller_name); mNameView = (TextView) findViewById(R.id.incoming_caller_name);
mNumberView = (TextView) findViewById(R.id.incoming_caller_number); mNumberView = (TextView) findViewById(R.id.incoming_caller_number);
HangCallButton hang = (HangCallButton) findViewById(R.id.Decline);
CallButton accept = (CallButton) findViewById(R.id.Answer);
hang.setExternalClickListener(this);
accept.setExternalClickListener(this);
// set this flag so this activity will stay in front of the keyguard // set this flag so this activity will stay in front of the keyguard
int flags = WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED; int flags = WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED;
@ -52,8 +69,23 @@ public class IncomingCallActivity extends Activity {
@Override @Override
protected void onResume() { protected void onResume() {
mNameView.setText(getIntent().getStringExtra("name")); LinphoneAddress address = mCall.getRemoteAddress();
mNumberView.setText(getIntent().getStringExtra("number")); String from = LinphoneManager.extractADisplayName(getResources(), address);
mNameView.setText(from);
mNumberView.setText(address.asStringUriOnly());
super.onResume(); super.onResume();
} }
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_BACK || keyCode == KeyEvent.KEYCODE_HOME) {
LinphoneManager.getLc().terminateCall(mCall);
}
return super.onKeyDown(keyCode, event);
}
@Override
public void onClick(View v) {
finish();
}
} }