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

Removed animations settings as they aren't supported anymore

Browse source
This commit is contained in:
Sylvain Berfini 2016-07-25 15:10:19 +02:00
parent 30aab3cad8
commit 0da493a81e
6 changed files with 24 additions and 372 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
res/xml/preferences.xml
View file

@ -329,11 +329,6 @@
android:key="@string/pref_service_notification_key"
android:persistent="false"/>
<CheckBoxPreference
android:title="@string/pref_animation_enable_title"
android:key="@string/pref_animation_enable_key"
android:persistent="false"/>
<CheckBoxPreference
android:title="@string/pref_autostart"
android:key="@string/pref_autostart_key"

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

@ -43,7 +43,6 @@ import android.content.Context;
import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
@ -67,9 +66,6 @@ import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.view.Window;
import android.view.WindowManager;
import android.view.animation.Animation;
import android.view.animation.Animation.AnimationListener;
import android.view.animation.AnimationUtils;
import android.widget.AdapterView;
import android.widget.Button;
import android.widget.Chronometer;
@ -104,11 +100,10 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve
private StatusFragment status;
private CallAudioFragment audioCallFragment;
private CallVideoFragment videoCallFragment;
private boolean isSpeakerEnabled = false, isMicMuted = false, isTransferAllowed, isAnimationDisabled;
private boolean isSpeakerEnabled = false, isMicMuted = false, isTransferAllowed;
private LinearLayout mControlsLayout;
private Numpad numpad;
private int cameraNumber;
private Animation slideOutLeftToRight, slideInRightToLeft, slideInBottomToTop, slideInTopToBottom, slideOutBottomToTop, slideOutTopToBottom;
private CountDownTimer timer;
private boolean isVideoCallPaused = false;
@ -151,7 +146,6 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve
BluetoothManager.getInstance().initBluetooth();
}
isAnimationDisabled = !LinphonePreferences.instance().areAnimationsEnabled();
cameraNumber = AndroidCameraConfiguration.retrieveCameras().length;
try {
@ -423,15 +417,6 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve
addCall.setBackgroundResource(R.drawable.options_add_call);
}
if (!isAnimationDisabled) {
slideInRightToLeft = AnimationUtils.loadAnimation(this, R.anim.slide_in_right_to_left);
slideOutLeftToRight = AnimationUtils.loadAnimation(this, R.anim.slide_out_left_to_right);
slideInBottomToTop = AnimationUtils.loadAnimation(this, R.anim.slide_in_bottom_to_top);
slideInTopToBottom = AnimationUtils.loadAnimation(this, R.anim.slide_in_top_to_bottom);
slideOutBottomToTop = AnimationUtils.loadAnimation(this, R.anim.slide_out_bottom_to_top);
slideOutTopToBottom = AnimationUtils.loadAnimation(this, R.anim.slide_out_top_to_bottom);
}
if (BluetoothManager.getInstance().isBluetoothHeadsetAvailable()) {
try {
audioRoute.setVisibility(View.VISIBLE);
@ -964,31 +949,7 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve
public void displayVideoCallControlsIfHidden() {
if (mControlsLayout != null) {
if (mControlsLayout.getVisibility() != View.VISIBLE) {
if (isAnimationDisabled) {
displayVideoCall(true);
} else {
Animation animation = slideInBottomToTop;
animation.setAnimationListener(new AnimationListener() {
@Override
public void onAnimationStart(Animation animation) {
displayVideoCall(true);
}
@Override
public void onAnimationRepeat(Animation animation) {
}
@Override
public void onAnimationEnd(Animation animation) {
animation.setAnimationListener(null);
}
});
mControlsLayout.startAnimation(animation);
if (cameraNumber > 1) {
switchCamera.startAnimation(slideInTopToBottom);
}
pause.startAnimation(slideInTopToBottom);
}
}
resetControlsHidingCallBack();
}
@ -1004,8 +965,6 @@ 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);
@ -1013,36 +972,6 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve
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);
}
}
}, 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);
}
}
private void hideOrDisplayNumpad() {
@ -1095,185 +1002,8 @@ 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);
}
}
}
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()
@ -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();
}
}
//Display options
} else {
if (isAnimationDisabled) {
} else { //Display options
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();
}
}
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);

35
src/org/linphone/LinphoneActivity.java
View file

@ -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<FragmentsAvailable> 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);

8
src/org/linphone/LinphonePreferences.java
View file

@ -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);
}

1
src/org/linphone/PreferencesMigrator.java
View file

@ -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));

10
src/org/linphone/SettingsFragment.java
View file

@ -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) {