From 26e8e0c80da95559778f98d2e6cb7fd2bf6ca476 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Fri, 22 Jun 2012 11:26:39 +0200 Subject: [PATCH] Better incall animation for switch camera button --- res/anim/slide_in_top_to_bottom.xml | 8 ++++++++ res/anim/slide_out_bottom_to_top.xml | 8 ++++++++ res/drawable/add_call_page_contact.png | Bin 6664 -> 0 bytes res/drawable/incall_contact_actif.png | Bin 6743 -> 0 bytes res/drawable/incall_contact_over.png | Bin 6784 -> 0 bytes res/drawable/incall_contacts.xml | 9 -------- res/drawable/switch_camera_default.png | Bin 6280 -> 2291 bytes res/drawable/switch_camera_over.png | Bin 6326 -> 2272 bytes res/layout/incall.xml | 12 +++++++++-- res/layout/video.xml | 9 -------- src/org/linphone/InCallActivity.java | 26 +++++++++++++++++++++--- src/org/linphone/VideoCallFragment.java | 13 +----------- 12 files changed, 50 insertions(+), 35 deletions(-) create mode 100644 res/anim/slide_in_top_to_bottom.xml create mode 100644 res/anim/slide_out_bottom_to_top.xml delete mode 100644 res/drawable/add_call_page_contact.png delete mode 100644 res/drawable/incall_contact_actif.png delete mode 100644 res/drawable/incall_contact_over.png delete mode 100644 res/drawable/incall_contacts.xml diff --git a/res/anim/slide_in_top_to_bottom.xml b/res/anim/slide_in_top_to_bottom.xml new file mode 100644 index 000000000..6bb7ac339 --- /dev/null +++ b/res/anim/slide_in_top_to_bottom.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/res/anim/slide_out_bottom_to_top.xml b/res/anim/slide_out_bottom_to_top.xml new file mode 100644 index 000000000..5db6fd044 --- /dev/null +++ b/res/anim/slide_out_bottom_to_top.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/res/drawable/add_call_page_contact.png b/res/drawable/add_call_page_contact.png deleted file mode 100644 index f91eeffb61bf2b746838cab05c59bd3af9328727..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6664 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

Yhhg$4Sis(sqh=}U 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 BgW>=H diff --git a/res/drawable/incall_contact_over.png b/res/drawable/incall_contact_over.png deleted file mode 100644 index 5a904ef36211b1bff04bf446d5209635ccd03304..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6784 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 diff --git a/res/drawable/incall_contacts.xml b/res/drawable/incall_contacts.xml deleted file mode 100644 index 72d41e948..000000000 --- a/res/drawable/incall_contacts.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/res/drawable/switch_camera_default.png b/res/drawable/switch_camera_default.png index e0e42c09f5b886d00a457c57c6eb968ddf8ed2ba..f67fe6312ad9f5c4b0ddb94c13c25c3d8cbfc020 100644 GIT binary patch literal 2291 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 z zHYF~_AUUbsn<{tozPVGM_>O4l;#(G1{i2*28;ekzeY(vUrdyRW_1Rk^vpH`)4f@4R zihZ9we4{3{=5@P0kAM8?;@zL770b&mLJb9weCQ8Im9^W${RMuOuFj|86{|uOGb0OF z#So1G+tFSgD^Hi!)%#VWJS-uWxm>{Z(vb9G->Uwq%{_mduyxRKo9rk)k*oe*L6GLq z4U5_jFQ3$Ra#V#}9eoKjIgXfoXf{B8ggpE_5P#_&Ab2e663Um+QD13f|CV5C$S$MU3j{gcHgHLiF==>>|p%T4|B%3 zfH<9uYspun@|a_(LN%!eOTK0){x=2##Lkt_oUy3k>>J6_*vje)z$+OM@a~HMi&#

RNa zedwgGSn7c-z&EC7TAEQh<7g(SuE)C(5fL_GWM!A$<^A8k73(9%PdOVM;o1ITc;1V5 zxJeft0pxVN&VLI@pt$VN5Em2qQ!4Kk%C)V1oip(g(8S)pI724@SvN7|voWQZlF+Uh z4bot5LMADtkA8nlpKoD6c2=N^)!vidc>WCzP~sC7&9$gENONOt9nVft%~+Ua8D z>{kYga6vL(zQg%=LsipmlTFlO=zMoXWa17-}K1)l$f z(7vQiWSY`Ol(&mNa3G03EO+M7=-M(%NzSx0B9&Q?3_FkXJr2>Ag>Ve4xCX-K-^M}U zIxjO3BT67%<%*o)g(rIUZ{N$6?q+CKCJZY1~=0{o6hAblq^NN|)#YrCrI zJZXO%5TCFEh(*6P;d_y$8@dr+qLO#*b{VyZqOe-}L;aQ4#h*XD;Cx?N5&{9h3=eXQ zu@1($R`-&U&Qo}?&L?ZJ7jxKEGj#<~IpA%C6z-t}2k$Gf&elC_mzR@yBzgC`4sk}r z)v)Wa>5lV5)K1aCJNa^Pt<^dCL?lB+&b@E(pz`B8QXev&%sWp#XnK^aNgpG1=R8Tg zxr1~6SeS4$V7KDnZF+$bkxFYbd`;wDaPTMjP!I#Oh*|^nv{JJLNGlmB^}ABU!q*%u z#b11W_!BnZs)koBCH*BNRnd9MN1}IT`G*lX!`JAjpje<7`!=Z5Ymk}(L0KNjMqya! x5Wz-07;VD|`I~Zuw!#-R42h8-VkDw=NALvls8In*{pruY0W4Y{RjFYU`CmYaIQ#$r diff --git a/res/drawable/switch_camera_over.png b/res/drawable/switch_camera_over.png index 7afcd0a2348aa16ddaf0165b2884a81217695245..2f12f0ea4396945b0f4c0a8fde40466c74402575 100644 GIT binary patch literal 2272 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 - + + - + - - \ No newline at end of file diff --git a/src/org/linphone/InCallActivity.java b/src/org/linphone/InCallActivity.java index 0025fd94d..40f1f0e1f 100644 --- a/src/org/linphone/InCallActivity.java +++ b/src/org/linphone/InCallActivity.java @@ -56,9 +56,10 @@ public class InCallActivity extends FragmentActivity implements private Handler mHandler = new Handler(); private Handler controlsHandler = new Handler(); private Runnable mControls; - private ImageView video, micro, speaker, addCall, pause, hangUp, dialer; + private ImageView video, micro, speaker, addCall, pause, hangUp, dialer, switchCamera; private StatusFragment status; private AudioCallFragment audioCallFragment; + private VideoCallFragment videoCallFragment; private boolean isSpeakerEnabled, isMicMuted, isVideoEnabled; private LinearLayout mControlsLayout; @@ -89,9 +90,12 @@ public class InCallActivity extends FragmentActivity implements Fragment callFragment; if (isVideoEnabled) { callFragment = new VideoCallFragment(); + videoCallFragment = (VideoCallFragment) callFragment; + switchCamera.setVisibility(View.VISIBLE); } else { callFragment = new AudioCallFragment(); audioCallFragment = (AudioCallFragment) callFragment; + switchCamera.setVisibility(View.GONE); } callFragment.setArguments(getIntent().getExtras()); getSupportFragmentManager().beginTransaction().add(R.id.fragmentContainer, callFragment).commit(); @@ -116,6 +120,9 @@ public class InCallActivity extends FragmentActivity implements dialer = (ImageView) findViewById(R.id.dialer); dialer.setOnClickListener(this); + switchCamera = (ImageView) findViewById(R.id.switchCamera); + switchCamera.setOnClickListener(this); + mControlsLayout = (LinearLayout) findViewById(R.id.menu); if (isVideoEnabled) { @@ -164,6 +171,11 @@ public class InCallActivity extends FragmentActivity implements else if (id == R.id.dialer) { } + else if (id == R.id.switchCamera) { + if (videoCallFragment != null) { + videoCallFragment.switchCamera(); + } + } } @@ -207,11 +219,12 @@ public class InCallActivity extends FragmentActivity implements } private void replaceFragmentAudioByVideo() { - VideoCallFragment videoCallFragment = new VideoCallFragment(); + switchCamera.setVisibility(View.VISIBLE); + videoCallFragment = new VideoCallFragment(); FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); transaction.replace(R.id.fragmentContainer, videoCallFragment); - transaction.commitAllowingStateLoss(); + transaction.commitAllowingStateLoss(); } private void toogleMicro() { @@ -270,12 +283,14 @@ public class InCallActivity extends FragmentActivity implements if (mControlsLayout.getVisibility() == View.GONE) { if (InCallActivity.this.getResources().getBoolean(R.bool.disable_animations)) { mControlsLayout.setVisibility(View.VISIBLE); + switchCamera.setVisibility(View.VISIBLE); } else { Animation animation = AnimationUtils.loadAnimation(this, R.anim.slide_in_bottom_to_top); animation.setAnimationListener(new AnimationListener() { @Override public void onAnimationStart(Animation animation) { mControlsLayout.setVisibility(View.VISIBLE); + switchCamera.setVisibility(View.VISIBLE); } @Override @@ -287,6 +302,7 @@ public class InCallActivity extends FragmentActivity implements } }); mControlsLayout.startAnimation(animation); + switchCamera.startAnimation(AnimationUtils.loadAnimation(this, R.anim.slide_in_top_to_bottom)); } } @@ -298,6 +314,7 @@ public class InCallActivity extends FragmentActivity implements public void run() { if (InCallActivity.this.getResources().getBoolean(R.bool.disable_animations)) { mControlsLayout.setVisibility(View.GONE); + switchCamera.setVisibility(View.GONE); } else { Animation animation = AnimationUtils.loadAnimation(InCallActivity.this, R.anim.slide_out_top_to_bottom); animation.setAnimationListener(new AnimationListener() { @@ -312,9 +329,11 @@ public class InCallActivity extends FragmentActivity implements @Override public void onAnimationEnd(Animation animation) { mControlsLayout.setVisibility(View.GONE); + switchCamera.setVisibility(View.GONE); } }); mControlsLayout.startAnimation(animation); + switchCamera.startAnimation(AnimationUtils.loadAnimation(InCallActivity.this, R.anim.slide_out_bottom_to_top)); } } }, SECONDS_BEFORE_HIDING_CONTROLS); @@ -328,6 +347,7 @@ public class InCallActivity extends FragmentActivity implements } mControlsLayout.setVisibility(View.VISIBLE); + switchCamera.setVisibility(View.GONE); } private boolean isCallRunning(LinphoneCall call) diff --git a/src/org/linphone/VideoCallFragment.java b/src/org/linphone/VideoCallFragment.java index fcda06aed..e4d9f1231 100644 --- a/src/org/linphone/VideoCallFragment.java +++ b/src/org/linphone/VideoCallFragment.java @@ -33,10 +33,8 @@ import android.view.MotionEvent; import android.view.SurfaceHolder; import android.view.SurfaceView; import android.view.View; -import android.view.View.OnClickListener; import android.view.View.OnTouchListener; import android.view.ViewGroup; -import android.widget.ImageView; //FIXME : preview gone after coming back from audio only /** @@ -47,7 +45,6 @@ public class VideoCallFragment extends Fragment { private WakeLock mWakeLock; private SurfaceView mVideoView; private SurfaceView mCaptureView; - private ImageView switchCamera; private AndroidVideoWindowImpl androidVideoWindowImpl; @Override @@ -55,14 +52,6 @@ public class VideoCallFragment extends Fragment { Bundle savedInstanceState) { instance = this; View view = inflater.inflate(R.layout.video, container, false); - - switchCamera = (ImageView) view.findViewById(R.id.switchCamera); - switchCamera.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - switchCamera(); - } - }); mVideoView = (SurfaceView) view.findViewById(R.id.videoSurface); mCaptureView = (SurfaceView) view.findViewById(R.id.videoCaptureSurface); @@ -124,7 +113,7 @@ public class VideoCallFragment extends Fragment { preview.setZOrderMediaOverlay(true); // Needed to be able to display control layout over } - private void switchCamera() { + public void switchCamera() { int videoDeviceId = LinphoneManager.getLc().getVideoDevice(); videoDeviceId = (videoDeviceId + 1) % AndroidCameraConfiguration.retrieveCameras().length; LinphoneManager.getLc().setVideoDevice(videoDeviceId);