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

Changed addCall button from videoActivity for tablets to back button

Browse source
This commit is contained in:
Sylvain Berfini 2012-05-25 12:06:32 +02:00
parent fea0c89222
commit 02037cac18
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
res/layout-xlarge/videocall.xml
View file

@ -94,9 +94,9 @@
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<ImageButton <ImageButton
android:id="@+id/addCall" android:id="@+id/back"
style="@style/incall_control" style="@style/incall_control"
android:background="@drawable/incall_add" /> android:background="@drawable/incall_back" />
<org.linphone.ui.ToggleImageButton <org.linphone.ui.ToggleImageButton
android:id="@+id/conf_simple_pause" android:id="@+id/conf_simple_pause"

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

@ -185,7 +185,7 @@ public class VideoCallActivity extends Activity implements
findViewById(R.id.toggleMuteMic).setOnClickListener(this); findViewById(R.id.toggleMuteMic).setOnClickListener(this);
findViewById(R.id.toggleSpeaker).setOnClickListener(this); findViewById(R.id.toggleSpeaker).setOnClickListener(this);
findViewById(R.id.incallNumpadShow).setOnClickListener(this); findViewById(R.id.incallNumpadShow).setOnClickListener(this);
findViewById(R.id.addCall).setOnClickListener(this); findViewById(R.id.back).setOnClickListener(this);
findViewById(R.id.incallHang).setOnClickListener(this); findViewById(R.id.incallHang).setOnClickListener(this);
findViewById(R.id.switch_camera).setOnClickListener(this); findViewById(R.id.switch_camera).setOnClickListener(this);
findViewById(R.id.conf_simple_pause).setOnClickListener(this); findViewById(R.id.conf_simple_pause).setOnClickListener(this);
@ -544,8 +544,9 @@ public class VideoCallActivity extends Activity implements
params.setVideoEnabled(false); params.setVideoEnabled(false);
LinphoneManager.getLc().updateCall(videoCall, params); LinphoneManager.getLc().updateCall(videoCall, params);
break; break;
case R.id.addCall: case R.id.back:
finish(); finish();
LinphoneActivity.instance().startIncallActivity();
break; break;
} }
} }