diff --git a/convert.sh b/convert.sh new file mode 100755 index 000000000..3fb21e15c --- /dev/null +++ b/convert.sh @@ -0,0 +1,5 @@ +#/bin/sh +for file in *.png +do + convert $file -resize 67% $file +done diff --git a/res/drawable/pause_default b/res/drawable/pause_default deleted file mode 100644 index 0ca4db8c1..000000000 Binary files a/res/drawable/pause_default and /dev/null differ diff --git a/res/drawable/pause_over b/res/drawable/pause_over deleted file mode 100644 index a2a15e52b..000000000 Binary files a/res/drawable/pause_over and /dev/null differ diff --git a/res/drawable/play_default b/res/drawable/play_default deleted file mode 100644 index cf455e337..000000000 Binary files a/res/drawable/play_default and /dev/null differ diff --git a/res/drawable/play_over b/res/drawable/play_over deleted file mode 100644 index 42d81a845..000000000 Binary files a/res/drawable/play_over and /dev/null differ diff --git a/src/org/linphone/AudioCallFragment.java b/src/org/linphone/AudioCallFragment.java index 8ef8b8c0b..d952f9d77 100644 --- a/src/org/linphone/AudioCallFragment.java +++ b/src/org/linphone/AudioCallFragment.java @@ -19,7 +19,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ import org.linphone.core.LinphoneAddress; import org.linphone.core.LinphoneCall; -import org.linphone.core.Log; import org.linphone.core.LinphoneCall.State; import org.linphone.core.LinphoneCoreFactory; import org.linphone.ui.AvatarWithShadow; diff --git a/src/org/linphone/InCallActivity.java b/src/org/linphone/InCallActivity.java index 88bfec761..e9bac3bcf 100644 --- a/src/org/linphone/InCallActivity.java +++ b/src/org/linphone/InCallActivity.java @@ -86,7 +86,6 @@ public class InCallActivity extends FragmentActivity implements isVideoEnabled = call.getCurrentParamsCopy().getVideoEnabled(); } } - LinphoneManager.addListener(this); if (savedInstanceState != null) { return; @@ -612,13 +611,24 @@ public class InCallActivity extends FragmentActivity implements @Override protected void onResume() { - super.onResume(); + LinphoneManager.addListener(this); + LinphoneManager.startProximitySensorForActivity(this); if (isVideoEnabled) { displayVideoCallControlsIfHidden(); } else { setCallControlsVisibleAndRemoveCallbacks(); } + + super.onResume(); + } + + @Override + protected void onPause() { + LinphoneManager.removeListener(this); + LinphoneManager.startProximitySensorForActivity(this); + + super.onPause(); } @Override @@ -631,10 +641,4 @@ public class InCallActivity extends FragmentActivity implements public void bindAudioFragment(AudioCallFragment fragment) { audioCallFragment = fragment; } - - @Override - protected void onDestroy() { - LinphoneManager.removeListener(this); - super.onDestroy(); - } }