diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index d86fe403b..ceadfee7f 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -329,11 +329,6 @@ android:key="@string/pref_service_notification_key" android:persistent="false"/> - - 1) { - switchCamera.startAnimation(slideInTopToBottom); - } - pause.startAnimation(slideInTopToBottom); - } + displayVideoCall(true); } resetControlsHidingCallBack(); } @@ -1004,45 +965,13 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve mControlsHandler.postDelayed(mControls = new Runnable() { public void run() { hideNumpad(); - - if (isAnimationDisabled) { - video.setEnabled(true); - transfer.setVisibility(View.INVISIBLE); - addCall.setVisibility(View.INVISIBLE); - conference.setVisibility(View.INVISIBLE); - displayVideoCall(false); - numpad.setVisibility(View.GONE); - options.setImageResource(R.drawable.options_default); - } else { - Animation animation = slideOutTopToBottom; - animation.setAnimationListener(new AnimationListener() { - @Override - public void onAnimationStart(Animation animation) { - video.setEnabled(false); // HACK: Used to avoid controls from being hided if video is switched while controls are hiding - } - - @Override - public void onAnimationRepeat(Animation animation) { - } - - @Override - public void onAnimationEnd(Animation animation) { - video.setEnabled(true); // HACK: Used to avoid controls from being hided if video is switched while controls are hiding - transfer.setVisibility(View.INVISIBLE); - addCall.setVisibility(View.INVISIBLE); - conference.setVisibility(View.INVISIBLE); - displayVideoCall(false); - numpad.setVisibility(View.GONE); - options.setImageResource(R.drawable.options_default); - animation.setAnimationListener(null); - } - }); - mControlsLayout.startAnimation(animation); - if (cameraNumber > 1) { - switchCamera.startAnimation(slideOutBottomToTop); - } - pause.startAnimation(slideOutBottomToTop); - } + video.setEnabled(true); + transfer.setVisibility(View.INVISIBLE); + addCall.setVisibility(View.INVISIBLE); + conference.setVisibility(View.INVISIBLE); + displayVideoCall(false); + numpad.setVisibility(View.GONE); + options.setImageResource(R.drawable.options_default); } }, SECONDS_BEFORE_HIDING_CONTROLS); } @@ -1061,29 +990,7 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve } dialer.setImageResource(R.drawable.footer_dialer); - if (isAnimationDisabled) { - numpad.setVisibility(View.GONE); - } else { - Animation animation = slideOutTopToBottom; - animation.setAnimationListener(new AnimationListener() { - @Override - public void onAnimationStart(Animation animation) { - - } - - @Override - public void onAnimationRepeat(Animation animation) { - - } - - @Override - public void onAnimationEnd(Animation animation) { - numpad.setVisibility(View.GONE); - animation.setAnimationListener(null); - } - }); - numpad.startAnimation(animation); - } + numpad.setVisibility(View.GONE); } private void hideOrDisplayNumpad() { @@ -1095,187 +1002,10 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve hideNumpad(); } else { dialer.setImageResource(R.drawable.dialer_alt_back); - if (isAnimationDisabled) { - numpad.setVisibility(View.VISIBLE); - } else { - Animation animation = slideInBottomToTop; - animation.setAnimationListener(new AnimationListener() { - @Override - public void onAnimationStart(Animation animation) { - - } - - @Override - public void onAnimationRepeat(Animation animation) { - - } - - @Override - public void onAnimationEnd(Animation animation) { - numpad.setVisibility(View.VISIBLE); - animation.setAnimationListener(null); - } - }); - numpad.startAnimation(animation); - } + numpad.setVisibility(View.VISIBLE); } } - private void hideAnimatedPortraitCallOptions() { - Animation animation = slideOutLeftToRight; - animation.setAnimationListener(new AnimationListener() { - @Override - public void onAnimationStart(Animation animation) { - } - - @Override - public void onAnimationRepeat(Animation animation) { - } - - @Override - public void onAnimationEnd(Animation animation) { - if (isTransferAllowed) { - transfer.setVisibility(View.INVISIBLE); - } - addCall.setVisibility(View.INVISIBLE); - conference.setVisibility(View.INVISIBLE); - animation.setAnimationListener(null); - } - }); - if (isTransferAllowed) { - transfer.startAnimation(animation); - } - addCall.startAnimation(animation); - conference.startAnimation(animation); - } - - private void hideAnimatedLandscapeCallOptions() { - Animation animation = slideOutTopToBottom; - if (isTransferAllowed) { - animation.setAnimationListener(new AnimationListener() { - @Override - public void onAnimationStart(Animation animation) { - } - - @Override - public void onAnimationRepeat(Animation animation) { - } - - @Override - public void onAnimationEnd(Animation animation) { - transfer.setAnimation(null); - transfer.setVisibility(View.INVISIBLE); - - animation = AnimationUtils.loadAnimation(CallActivity.this, R.anim.slide_out_top_to_bottom); // Reload animation to prevent transfer button to blink - animation.setAnimationListener(new AnimationListener() { - @Override - public void onAnimationStart(Animation animation) { - } - - @Override - public void onAnimationRepeat(Animation animation) { - } - - @Override - public void onAnimationEnd(Animation animation) { - addCall.setVisibility(View.INVISIBLE); - } - }); - addCall.startAnimation(animation); - } - }); - transfer.startAnimation(animation); - conference.startAnimation(animation); - } else { - animation.setAnimationListener(new AnimationListener() { - @Override - public void onAnimationStart(Animation animation) { - } - - @Override - public void onAnimationRepeat(Animation animation) { - } - - @Override - public void onAnimationEnd(Animation animation) { - addCall.setVisibility(View.INVISIBLE); - conference.setVisibility(View.INVISIBLE); - } - }); - addCall.startAnimation(animation); - conference.startAnimation(animation); - } - } - - private void showAnimatedPortraitCallOptions() { - Animation animation = slideInRightToLeft; - animation.setAnimationListener(new AnimationListener() { - @Override - public void onAnimationStart(Animation animation) { - } - - @Override - public void onAnimationRepeat(Animation animation) { - } - - @Override - public void onAnimationEnd(Animation animation) { - options.setImageResource(R.drawable.options_default); - if (isTransferAllowed) { - transfer.setVisibility(View.VISIBLE); - } - addCall.setVisibility(View.VISIBLE); - conference.setVisibility(View.VISIBLE); - animation.setAnimationListener(null); - } - }); - if (isTransferAllowed) { - transfer.startAnimation(animation); - } - conference.startAnimation(animation); - addCall.startAnimation(animation); - } - - private void showAnimatedLandscapeCallOptions() { - Animation animation = slideInBottomToTop; - animation.setAnimationListener(new AnimationListener() { - @Override - public void onAnimationStart(Animation animation) { - } - - @Override - public void onAnimationRepeat(Animation animation) { - } - - @Override - public void onAnimationEnd(Animation animation) { - addCall.setAnimation(null); - options.setImageResource(R.drawable.options_default); - addCall.setVisibility(View.VISIBLE); - conference.setVisibility(View.VISIBLE); - if (isTransferAllowed) { - animation.setAnimationListener(new AnimationListener() { - @Override - public void onAnimationStart(Animation animation) { - } - - @Override - public void onAnimationRepeat(Animation animation) { - } - - @Override - public void onAnimationEnd(Animation animation) { - transfer.setVisibility(View.VISIBLE); - } - }); - transfer.startAnimation(animation); - } - conference.startAnimation(animation); - } - }); - addCall.startAnimation(animation); - } - private void hideOrDisplayAudioRoutes() { if (routeSpeaker.getVisibility() == View.VISIBLE) { @@ -1290,40 +1020,21 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve } private void hideOrDisplayCallOptions() { - boolean isOrientationLandscape = getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE; - //Hide options if (addCall.getVisibility() == View.VISIBLE) { options.setImageResource(R.drawable.options_default); - if (isAnimationDisabled) { - if (isTransferAllowed) { - transfer.setVisibility(View.INVISIBLE); - } - addCall.setVisibility(View.INVISIBLE); - conference.setVisibility(View.INVISIBLE); - } else { - if (isOrientationLandscape) { - hideAnimatedLandscapeCallOptions(); - } else { - hideAnimatedPortraitCallOptions(); - } + if (isTransferAllowed) { + transfer.setVisibility(View.INVISIBLE); } - //Display options - } else { - if (isAnimationDisabled) { - if (isTransferAllowed) { - transfer.setVisibility(View.VISIBLE); - } - addCall.setVisibility(View.VISIBLE); - conference.setVisibility(View.VISIBLE); - options.setImageResource(R.drawable.options_selected); - } else { - if (isOrientationLandscape) { - showAnimatedLandscapeCallOptions(); - } else { - showAnimatedPortraitCallOptions(); - } + addCall.setVisibility(View.INVISIBLE); + conference.setVisibility(View.INVISIBLE); + } else { //Display options + if (isTransferAllowed) { + transfer.setVisibility(View.VISIBLE); } + addCall.setVisibility(View.VISIBLE); + conference.setVisibility(View.VISIBLE); + options.setImageResource(R.drawable.options_selected); transfer.setEnabled(LinphoneManager.getLc().getCurrentCall() != null); } } @@ -1864,12 +1575,6 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve if (count > 0) { missedChats.setText(count + ""); missedChats.setVisibility(View.VISIBLE); - if (!isAnimationDisabled) { - missedChats.startAnimation(AnimationUtils.loadAnimation(this, R.anim.bounce)); - } - if(count > 99){ - //TODO - } } else { missedChats.clearAnimation(); missedChats.setVisibility(View.GONE); diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java index 3d5d546c4..0fb419a5f 100644 --- a/src/org/linphone/LinphoneActivity.java +++ b/src/org/linphone/LinphoneActivity.java @@ -82,7 +82,6 @@ import android.view.View.OnClickListener; import android.view.ViewGroup; import android.view.Window; import android.view.WindowManager; -import android.view.animation.AnimationUtils; import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.BaseAdapter; @@ -116,12 +115,12 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta private View contacts_selected, history_selected, dialer_selected, chat_selected; private RelativeLayout mTopBar; private ImageView cancel; - private FragmentsAvailable pendingFragmentTransaction, currentFragment, nextFragment; + private FragmentsAvailable pendingFragmentTransaction, currentFragment; private Fragment fragment; private List fragmentsHistory; private Fragment.SavedState dialerSavedState; private boolean newProxyConfig; - private boolean isAnimationDisabled = true, emptyFragment = false; + private boolean emptyFragment = false; private OrientationEventListener mOrientationHelper; private LinphoneCoreListenerBase mListener; private LinearLayout mTabBar; @@ -198,7 +197,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta initButtons(); initSideMenu(); - currentFragment = nextFragment = FragmentsAvailable.EMPTY; + currentFragment = FragmentsAvailable.EMPTY; if (savedInstanceState == null) { changeCurrentFragment(FragmentsAvailable.DIALER, getIntent().getExtras()); } else { @@ -279,8 +278,6 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta LinphoneManager.getLc().setDeviceRotation(rotation); mAlwaysChangingPhoneAngle = rotation; - - updateAnimationsState(); } private void initButtons() { @@ -343,7 +340,6 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta if (newFragmentType == currentFragment && newFragmentType != FragmentsAvailable.CHAT) { return; } - nextFragment = newFragmentType; if (currentFragment == FragmentsAvailable.DIALER) { try { @@ -421,10 +417,6 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta } } - private void updateAnimationsState() { - isAnimationDisabled = !LinphonePreferences.instance().areAnimationsEnabled(); - } - private void changeFragment(Fragment newFragment, FragmentsAvailable newFragmentType, boolean withoutAnimation) { FragmentManager fm = getFragmentManager(); @@ -789,12 +781,6 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta changeCurrentFragment(FragmentsAvailable.SETTINGS, null); } - public void applyConfigChangesIfNeeded() { - if (nextFragment != FragmentsAvailable.SETTINGS && nextFragment != FragmentsAvailable.ACCOUNT_SETTINGS) { - updateAnimationsState(); - } - } - public void displayDialer() { changeCurrentFragment(FragmentsAvailable.DIALER, null); } @@ -861,9 +847,6 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta if (missedCallsCount > 0) { missedCalls.setText(missedCallsCount + ""); missedCalls.setVisibility(View.VISIBLE); - if (!isAnimationDisabled) { - missedCalls.startAnimation(AnimationUtils.loadAnimation(LinphoneActivity.this, R.anim.bounce)); - } } else { LinphoneManager.getLc().resetMissedCallsCount(); missedCalls.clearAnimation(); @@ -875,12 +858,6 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta if (missedChatCount > 0) { missedChats.setText(missedChatCount + ""); missedChats.setVisibility(View.VISIBLE); - if (!isAnimationDisabled) { - missedChats.startAnimation(AnimationUtils.loadAnimation(LinphoneActivity.this, R.anim.bounce)); - } - if(missedChatCount > 99){ - //TODO - } } else { missedChats.clearAnimation(); missedChats.setVisibility(View.GONE); @@ -1437,12 +1414,6 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta } else if (LinphoneUtils.onKeyBackGoHome(this, keyCode, event)) { return true; } - } else { - if (isTablet()) { - if (currentFragment == FragmentsAvailable.SETTINGS) { - updateAnimationsState(); - } - } } } return super.onKeyDown(keyCode, event); diff --git a/src/org/linphone/LinphonePreferences.java b/src/org/linphone/LinphonePreferences.java index defb36241..1c806a06c 100644 --- a/src/org/linphone/LinphonePreferences.java +++ b/src/org/linphone/LinphonePreferences.java @@ -1089,14 +1089,6 @@ public class LinphonePreferences { return getConfig().getBool("app", "background_mode", true); } - public void setAnimationsEnabled(boolean enabled) { - getConfig().setBool("app", "animations", enabled); - } - - public boolean areAnimationsEnabled() { - return getConfig().getBool("app", "animations", false); - } - public boolean isAutoStartEnabled() { return getConfig().getBool("app", "auto_start", false); } diff --git a/src/org/linphone/PreferencesMigrator.java b/src/org/linphone/PreferencesMigrator.java index e03a757b1..a18a3e87f 100644 --- a/src/org/linphone/PreferencesMigrator.java +++ b/src/org/linphone/PreferencesMigrator.java @@ -84,7 +84,6 @@ public class PreferencesMigrator { mNewPrefs.setPushNotificationRegistrationID(getPrefString(R.string.push_reg_id_key, null)); mNewPrefs.setDebugEnabled(getPrefBoolean(R.string.pref_debug_key, false)); mNewPrefs.setBackgroundModeEnabled(getPrefBoolean(R.string.pref_background_mode_key, true)); - mNewPrefs.setAnimationsEnabled(getPrefBoolean(R.string.pref_animation_enable_key, false)); mNewPrefs.setAutoStart(getPrefBoolean(R.string.pref_autostart_key, false)); mNewPrefs.setSharingPictureServerUrl(getPrefString(R.string.pref_image_sharing_server_key, null)); mNewPrefs.setRemoteProvisioningUrl(getPrefString(R.string.pref_remote_provisioning_key, null)); diff --git a/src/org/linphone/SettingsFragment.java b/src/org/linphone/SettingsFragment.java index 1ca547664..46ea526f9 100644 --- a/src/org/linphone/SettingsFragment.java +++ b/src/org/linphone/SettingsFragment.java @@ -1064,7 +1064,6 @@ public class SettingsFragment extends PreferencesListFragment { private void initAdvancedSettings() { ((CheckBoxPreference)findPreference(getString(R.string.pref_debug_key))).setChecked(mPrefs.isDebugEnabled()); ((CheckBoxPreference)findPreference(getString(R.string.pref_background_mode_key))).setChecked(mPrefs.isBackgroundModeEnabled()); - ((CheckBoxPreference)findPreference(getString(R.string.pref_animation_enable_key))).setChecked(mPrefs.areAnimationsEnabled()); ((CheckBoxPreference)findPreference(getString(R.string.pref_service_notification_key))).setChecked(mPrefs.getServiceNotificationVisibility()); ((CheckBoxPreference)findPreference(getString(R.string.pref_autostart_key))).setChecked(mPrefs.isAutoStartEnabled()); setPreferenceDefaultValueAndSummary(R.string.pref_remote_provisioning_key, mPrefs.getRemoteProvisioningUrl()); @@ -1091,15 +1090,6 @@ public class SettingsFragment extends PreferencesListFragment { } }); - findPreference(getString(R.string.pref_animation_enable_key)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() { - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - boolean value = (Boolean) newValue; - mPrefs.setAnimationsEnabled(value); - return true; - } - }); - findPreference(getString(R.string.pref_service_notification_key)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() { @Override public boolean onPreferenceChange(Preference preference, Object newValue) {