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

Fix animation in call and conference pause

Browse source
This commit is contained in:
Margaux Clerc 2016-03-03 14:59:46 +01:00
parent d9fe5be063
commit a15f81217e
2 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
res/raw/linphonerc_factory
View file

@ -5,9 +5,6 @@
[net]
mtu=1300
[app]
animations=0
[sip]
guess_hostname=1
inc_timeout=15
@ -33,7 +30,6 @@ dtmf_player_amp=0.1
#remove this property for any application that is not Linphone public version itself
ec_calibrator_cool_tones=1
[misc]
max_calls=10
log_collection_upload_server_url=https://www.linphone.org:444/lft.php

37
src/org/linphone/CallActivity.java
View file

@ -892,6 +892,7 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve
if (cameraNumber > 1) {
switchCamera.startAnimation(slideInTopToBottom);
}
pause.startAnimation(slideInTopToBottom);
}
}
resetControlsHidingCallBack();
@ -945,6 +946,7 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve
if (cameraNumber > 1) {
switchCamera.startAnimation(slideOutBottomToTop);
}
pause.startAnimation(slideOutBottomToTop);
}
}
}, SECONDS_BEFORE_HIDING_CONTROLS);
@ -1041,6 +1043,7 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve
transfer.setVisibility(View.INVISIBLE);
}
addCall.setVisibility(View.INVISIBLE);
conference.setVisibility(View.INVISIBLE);
animation.setAnimationListener(null);
}
});
@ -1048,6 +1051,7 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve
transfer.startAnimation(animation);
}
addCall.startAnimation(animation);
conference.startAnimation(animation);
}
private void hideAnimatedLandscapeCallOptions() {
@ -1066,6 +1070,7 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve
public void onAnimationEnd(Animation animation) {
transfer.setAnimation(null);
transfer.setVisibility(View.INVISIBLE);
animation = AnimationUtils.loadAnimation(CallActivity.this, R.anim.slide_out_top_to_bottom); // Reload animation to prevent transfer button to blink
animation.setAnimationListener(new AnimationListener() {
@Override
@ -1085,6 +1090,7 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve
}
});
transfer.startAnimation(animation);
conference.startAnimation(animation);
} else {
animation.setAnimationListener(new AnimationListener() {
@Override
@ -1098,9 +1104,11 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve
@Override
public void onAnimationEnd(Animation animation) {
addCall.setVisibility(View.INVISIBLE);
conference.setVisibility(View.INVISIBLE);
}
});
addCall.startAnimation(animation);
conference.startAnimation(animation);
}
}
@ -1117,17 +1125,19 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve
@Override
public void onAnimationEnd(Animation animation) {
options.setBackgroundResource(R.drawable.options_default);
options.setImageResource(R.drawable.options_default);
if (isTransferAllowed) {
transfer.setVisibility(View.VISIBLE);
}
addCall.setVisibility(View.VISIBLE);
conference.setVisibility(View.VISIBLE);
animation.setAnimationListener(null);
}
});
if (isTransferAllowed) {
transfer.startAnimation(animation);
}
conference.startAnimation(animation);
addCall.startAnimation(animation);
}
@ -1145,8 +1155,9 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve
@Override
public void onAnimationEnd(Animation animation) {
addCall.setAnimation(null);
options.setBackgroundResource(R.drawable.options_default);
options.setImageResource(R.drawable.options_default);
addCall.setVisibility(View.VISIBLE);
conference.setVisibility(View.VISIBLE);
if (isTransferAllowed) {
animation.setAnimationListener(new AnimationListener() {
@Override
@ -1164,6 +1175,7 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve
});
transfer.startAnimation(animation);
}
conference.startAnimation(animation);
}
});
addCall.startAnimation(animation);
@ -1543,6 +1555,7 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve
public void refreshCallList(Resources resources) {
isConferenceRunning = LinphoneManager.getLc().isInConference();
List<LinphoneCall> pausedCalls = LinphoneUtils.getCallsInState(LinphoneManager.getLc(), Arrays.asList(State.PausedByRemote));
//MultiCalls
if(LinphoneManager.getLc().getCallsNb() > 1){
@ -1552,7 +1565,7 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve
//Active call
if(LinphoneManager.getLc().getCurrentCall() != null) {
displayNoCurrentCall(false);
if(isVideoEnabled(LinphoneManager.getLc().getCurrentCall()) && !isConferenceRunning) {
if(isVideoEnabled(LinphoneManager.getLc().getCurrentCall()) && !isConferenceRunning && pausedCalls.size() == 0) {
displayVideoCall(false);
} else {
displayAudioCall();
@ -1607,14 +1620,11 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve
}
//Paused by remote
List<LinphoneCall> pausedCalls = LinphoneUtils.getCallsInState(LinphoneManager.getLc(), Arrays.asList(State.PausedByRemote));
if (pausedCalls.size() == 1) {
displayCallPaused(true);
} else {
displayCallPaused(false);
}
}
//Conference
@ -1636,12 +1646,15 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve
public void pauseOrResumeConference() {
LinphoneCore lc = LinphoneManager.getLc();
if (lc.isInConference()) {
conferenceStatus.setImageResource(R.drawable.pause_big_over_selected);
lc.leaveConference();
} else {
conferenceStatus.setImageResource(R.drawable.pause_big_default);
lc.enterConference();
conferenceStatus = (ImageView) findViewById(R.id.conference_pause);
if(conferenceStatus != null) {
if (lc.isInConference()) {
conferenceStatus.setImageResource(R.drawable.pause_big_over_selected);
lc.leaveConference();
} else {
conferenceStatus.setImageResource(R.drawable.pause_big_default);
lc.enterConference();
}
}
refreshCallList(getResources());
}