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

Hide video call button when video mode disabled.

Browse source
This commit is contained in:
Guillaume Beraudo 2010-12-02 15:58:04 +01:00
parent 445b918b12
commit 726422566e
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -242,10 +242,7 @@ public class DialerActivity extends Activity implements LinphoneCoreListener {
} else { } else {
mCall.setEnabled(false); mCall.setEnabled(false);
mHangup.setEnabled(!mCall.isEnabled()); mHangup.setEnabled(!mCall.isEnabled());
boolean prefVideoEnabled = mPref.getBoolean(getString(R.string.pref_video_enable_key), false); updateIncallVideoCallButton();
if (!prefVideoEnabled && !mCall.isEnabled()) {
mAddVideo.setEnabled(true);
}
mCallControlRow.setVisibility(View.GONE); mCallControlRow.setVisibility(View.GONE);
mInCallControlRow.setVisibility(View.VISIBLE); mInCallControlRow.setVisibility(View.VISIBLE);
mAddressLayout.setVisibility(View.GONE); mAddressLayout.setVisibility(View.GONE);
@ -338,6 +335,15 @@ public class DialerActivity extends Activity implements LinphoneCoreListener {
} }
} }
private void updateIncallVideoCallButton() {
boolean prefVideoEnabled = mPref.getBoolean(getString(R.string.pref_video_enable_key), false);
if (prefVideoEnabled && !mCall.isEnabled()) {
mAddVideo.setVisibility(View.VISIBLE);
mAddVideo.setEnabled(true);
} else {
mAddVideo.setVisibility(View.GONE);
}
}
@Override @Override
public void onSaveInstanceState(Bundle savedInstanceState) { public void onSaveInstanceState(Bundle savedInstanceState) {
super.onSaveInstanceState(savedInstanceState); super.onSaveInstanceState(savedInstanceState);
@ -389,6 +395,7 @@ public class DialerActivity extends Activity implements LinphoneCoreListener {
if (state == LinphoneCore.GlobalState.GlobalOn) { if (state == LinphoneCore.GlobalState.GlobalOn) {
mCall.setEnabled(!lc.isIncall()); mCall.setEnabled(!lc.isIncall());
mHangup.setEnabled(!mCall.isEnabled()); mHangup.setEnabled(!mCall.isEnabled());
updateIncallVideoCallButton();
try{ try{
LinphoneService.instance().initFromConf(); LinphoneService.instance().initFromConf();
} catch (LinphoneConfigException ec) { } catch (LinphoneConfigException ec) {
@ -484,6 +491,7 @@ public class DialerActivity extends Activity implements LinphoneCoreListener {
mAddressLayout.setVisibility(View.GONE); mAddressLayout.setVisibility(View.GONE);
mInCallAddressLayout.setVisibility(View.VISIBLE); mInCallAddressLayout.setVisibility(View.VISIBLE);
mCall.setEnabled(false); mCall.setEnabled(false);
updateIncallVideoCallButton();
mHangup.setEnabled(true); mHangup.setEnabled(true);
LinphoneAddress remote=lc.getRemoteAddress(); LinphoneAddress remote=lc.getRemoteAddress();
if (remote!=null){ if (remote!=null){
@ -520,6 +528,7 @@ public class DialerActivity extends Activity implements LinphoneCoreListener {
mAddressLayout.setVisibility(View.VISIBLE); mAddressLayout.setVisibility(View.VISIBLE);
mInCallAddressLayout.setVisibility(View.GONE); mInCallAddressLayout.setVisibility(View.GONE);
mCall.setEnabled(true); mCall.setEnabled(true);
updateIncallVideoCallButton();
mHangup.setEnabled(false); mHangup.setEnabled(false);
setVolumeControlStream(AudioManager.USE_DEFAULT_STREAM_TYPE); setVolumeControlStream(AudioManager.USE_DEFAULT_STREAM_TYPE);
mDecline.setEnabled(false); mDecline.setEnabled(false);