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

Rename audio/video fragment

Browse source
This commit is contained in:
Margaux Clerc 2015-10-15 18:02:28 +02:00
parent 24af401775
commit a68f8010a0
3 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,7 @@
package org.linphone; package org.linphone;
/* /*
InCallActivity.java CallActivity.java
Copyright (C) 2012 Belledonne Communications, Grenoble, France Copyright (C) 2015 Belledonne Communications, Grenoble, France
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License
@ -87,8 +87,8 @@ public class CallActivity extends Activity implements OnClickListener {
private LinearLayout routeLayout, mNoCurrentCall, callInfo; private LinearLayout routeLayout, mNoCurrentCall, callInfo;
private ProgressBar videoProgress; private ProgressBar videoProgress;
private StatusFragment status; private StatusFragment status;
private AudioCallFragment audioCallFragment; private CallAudioFragment audioCallFragment;
private VideoCallFragment videoCallFragment; private CallVideoFragment videoCallFragment;
private boolean isSpeakerEnabled = false, isMicMuted = false, isTransferAllowed, isAnimationDisabled; private boolean isSpeakerEnabled = false, isMicMuted = false, isTransferAllowed, isAnimationDisabled;
private LinearLayout mControlsLayout; private LinearLayout mControlsLayout;
private Numpad numpad; private Numpad numpad;
@ -245,16 +245,16 @@ public class CallActivity extends Activity implements OnClickListener {
Fragment callFragment; Fragment callFragment;
if (isVideoEnabled(LinphoneManager.getLc().getCurrentCall())) { if (isVideoEnabled(LinphoneManager.getLc().getCurrentCall())) {
callFragment = new VideoCallFragment(); callFragment = new CallVideoFragment();
videoCallFragment = (VideoCallFragment) callFragment; videoCallFragment = (CallVideoFragment) callFragment;
isSpeakerEnabled = true; isSpeakerEnabled = true;
if (cameraNumber > 1) { if (cameraNumber > 1) {
switchCamera.setVisibility(View.VISIBLE); switchCamera.setVisibility(View.VISIBLE);
} }
} else { } else {
callFragment = new AudioCallFragment(); callFragment = new CallAudioFragment();
audioCallFragment = (AudioCallFragment) callFragment; audioCallFragment = (CallAudioFragment) callFragment;
switchCamera.setVisibility(View.INVISIBLE); switchCamera.setVisibility(View.INVISIBLE);
} }
@ -729,7 +729,7 @@ public class CallActivity extends Activity implements OnClickListener {
} }
private void replaceFragmentVideoByAudio() { private void replaceFragmentVideoByAudio() {
audioCallFragment = new AudioCallFragment(); audioCallFragment = new CallAudioFragment();
FragmentTransaction transaction = getFragmentManager().beginTransaction(); FragmentTransaction transaction = getFragmentManager().beginTransaction();
transaction.replace(R.id.fragmentContainer, audioCallFragment); transaction.replace(R.id.fragmentContainer, audioCallFragment);
try { try {
@ -740,7 +740,7 @@ public class CallActivity extends Activity implements OnClickListener {
private void replaceFragmentAudioByVideo() { private void replaceFragmentAudioByVideo() {
// Hiding controls to let displayVideoCallControlsIfHidden add them plus the callback // Hiding controls to let displayVideoCallControlsIfHidden add them plus the callback
videoCallFragment = new VideoCallFragment(); videoCallFragment = new CallVideoFragment();
FragmentTransaction transaction = getFragmentManager().beginTransaction(); FragmentTransaction transaction = getFragmentManager().beginTransaction();
transaction.replace(R.id.fragmentContainer, videoCallFragment); transaction.replace(R.id.fragmentContainer, videoCallFragment);
@ -1364,11 +1364,11 @@ public class CallActivity extends Activity implements OnClickListener {
return super.onKeyDown(keyCode, event); return super.onKeyDown(keyCode, event);
} }
public void bindAudioFragment(AudioCallFragment fragment) { public void bindAudioFragment(CallAudioFragment fragment) {
audioCallFragment = fragment; audioCallFragment = fragment;
} }
public void bindVideoFragment(VideoCallFragment fragment) { public void bindVideoFragment(CallVideoFragment fragment) {
videoCallFragment = fragment; videoCallFragment = fragment;
} }

6
src/org/linphone/AudioCallFragment.java → src/org/linphone/CallAudioFragment.java
View file

@ -1,7 +1,7 @@
package org.linphone; package org.linphone;
/* /*
AudioCallFragment.java CallAudioFragment.java
Copyright (C) 2012 Belledonne Communications, Grenoble, France Copyright (C) 2015 Belledonne Communications, Grenoble, France
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License
@ -29,7 +29,7 @@ import android.view.ViewGroup;
/** /**
* @author Sylvain Berfini * @author Sylvain Berfini
*/ */
public class AudioCallFragment extends Fragment { public class CallAudioFragment extends Fragment {
private CallActivity incallActvityInstance; private CallActivity incallActvityInstance;
@Override @Override

6
src/org/linphone/VideoCallFragment.java → src/org/linphone/CallVideoFragment.java
View file

@ -1,7 +1,7 @@
package org.linphone; package org.linphone;
/* /*
VideoCallFragment.java CallVideoFragment.java
Copyright (C) 2012 Belledonne Communications, Grenoble, France Copyright (C) 2015 Belledonne Communications, Grenoble, France
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License
@ -44,7 +44,7 @@ import android.view.ViewGroup;
/** /**
* @author Sylvain Berfini * @author Sylvain Berfini
*/ */
public class VideoCallFragment extends Fragment implements OnGestureListener, OnDoubleTapListener, CompatibilityScaleGestureListener { public class CallVideoFragment extends Fragment implements OnGestureListener, OnDoubleTapListener, CompatibilityScaleGestureListener {
private SurfaceView mVideoView; private SurfaceView mVideoView;
private SurfaceView mCaptureView; private SurfaceView mCaptureView;
private AndroidVideoWindowImpl androidVideoWindowImpl; private AndroidVideoWindowImpl androidVideoWindowImpl;