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

fix incoming call answer/decline

Browse source
This commit is contained in:
Margaux Clerc 2015-11-05 15:41:05 +01:00
parent 92c066d239
commit 455f7e87b6
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/org/linphone/CallIncomingActivity.java
View file

@ -48,7 +48,7 @@ public class CallIncomingActivity extends Activity implements LinphoneSliderTrig
private static CallIncomingActivity instance; private static CallIncomingActivity instance;
private TextView name, number; private TextView name, number;
private ImageView contactPicture, acceptArrow, accept, acceptCall, decline; private ImageView contactPicture, accept, decline;
private LinphoneCall mCall; private LinphoneCall mCall;
private LinphoneCoreListenerBase mListener; private LinphoneCoreListenerBase mListener;
private LinearLayout acceptUnlock; private LinearLayout acceptUnlock;
@ -88,12 +88,12 @@ public class CallIncomingActivity extends Activity implements LinphoneSliderTrig
isActive = pm.isScreenOn(); isActive = pm.isScreenOn();
} }
final int screenWidth = getResources().getDisplayMetrics().widthPixels;
acceptUnlock = (LinearLayout) findViewById(R.id.acceptUnlock); acceptUnlock = (LinearLayout) findViewById(R.id.acceptUnlock);
declineUnlock = (LinearLayout) findViewById(R.id.declineUnlock); declineUnlock = (LinearLayout) findViewById(R.id.declineUnlock);
//mIncomingCallWidget = (LinphoneSliders) findViewById(R.id.sliding_widget);
accept = (ImageView) findViewById(R.id.accept); accept = (ImageView) findViewById(R.id.accept);
acceptArrow = (ImageView) findViewById(R.id.acceptArrow);
decline = (ImageView) findViewById(R.id.decline); decline = (ImageView) findViewById(R.id.decline);
accept.setOnClickListener(new View.OnClickListener() { accept.setOnClickListener(new View.OnClickListener() {
@Override @Override
@ -120,9 +120,10 @@ public class CallIncomingActivity extends Activity implements LinphoneSliderTrig
break; break;
case MotionEvent.ACTION_MOVE: case MotionEvent.ACTION_MOVE:
curX = motionEvent.getX(); curX = motionEvent.getX();
view.scrollBy((int) (answerX - curX), view.getScrollY()); if((answerX - curX) >= 0)
view.scrollBy((int) (answerX - curX), view.getScrollY());
answerX = curX; answerX = curX;
if (curX < 50) { if (curX < screenWidth/4) {
answer(); answer();
return true; return true;
} }
@ -132,7 +133,6 @@ public class CallIncomingActivity extends Activity implements LinphoneSliderTrig
decline.setVisibility(View.VISIBLE); decline.setVisibility(View.VISIBLE);
acceptUnlock.setVisibility(View.GONE); acceptUnlock.setVisibility(View.GONE);
break; break;
} }
return true; return true;
} }
@ -153,8 +153,8 @@ public class CallIncomingActivity extends Activity implements LinphoneSliderTrig
view.scrollBy((int) (declineX - curX), view.getScrollY()); view.scrollBy((int) (declineX - curX), view.getScrollY());
declineX = curX; declineX = curX;
Log.w(curX); Log.w(curX);
if (curX > 800) { if (curX > (screenWidth/2)){
//decline(); decline();
return true; return true;
} }
break; break;
@ -268,6 +268,7 @@ public class CallIncomingActivity extends Activity implements LinphoneSliderTrig
private void decline() { private void decline() {
LinphoneManager.getLc().terminateCall(mCall); LinphoneManager.getLc().terminateCall(mCall);
finish();
} }
private void answer() { private void answer() {