From 41d998beb9ff1872c76d9d93aaa194fb6f6763be Mon Sep 17 00:00:00 2001 From: Margaux Clerc Date: Thu, 19 Nov 2015 15:08:15 +0100 Subject: [PATCH] Clean settings and add orientation preference --- .../linphone_notification_icon.png | Bin 0 -> 10524 bytes res/values/non_localizable_custom.xml | 8 ++- res/values/non_localizable_strings.xml | 1 - res/values/strings.xml | 7 +++ res/xml/preferences.xml | 15 +---- src/org/linphone/LinphoneActivity.java | 2 +- .../linphone/LinphoneLauncherActivity.java | 6 +- src/org/linphone/SettingsFragment.java | 55 +++--------------- 8 files changed, 28 insertions(+), 66 deletions(-) create mode 100644 res/drawable-xhdpi/linphone_notification_icon.png diff --git a/res/drawable-xhdpi/linphone_notification_icon.png b/res/drawable-xhdpi/linphone_notification_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..fa36e433e24277e614fddfd9b0e6761937c9d5a6 GIT binary patch literal 10524 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 OEGo&X$yLdih5Rpg1ojI6 literal 0 HcmV?d00001 diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml index 23c6d3942..fea153c50 100644 --- a/res/values/non_localizable_custom.xml +++ b/res/values/non_localizable_custom.xml @@ -1,13 +1,16 @@ - false - false sip.linphone.org stun.linphone.org + + + false + false false false false + false https://www.linphone.org/wizard.php @@ -70,7 +73,6 @@ false false false - false true diff --git a/res/values/non_localizable_strings.xml b/res/values/non_localizable_strings.xml index 8830a329b..6ef3b512f 100644 --- a/res/values/non_localizable_strings.xml +++ b/res/values/non_localizable_strings.xml @@ -36,7 +36,6 @@ pref_add_account_key pref_video_key pref_video_codecs_key - pref_linphone_friend_key pref_transport_key pref_transport_udp_key diff --git a/res/values/strings.xml b/res/values/strings.xml index 7a6d7845f..d1a4a95b7 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -85,6 +85,13 @@ Your correspondent paused the call ZRTP token is %s\nYou should only accept if you have the same token as your correspondent + + + default + high-fps + custom + + Toggle micro diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index e796b6d5b..2c96ad9ec 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -104,7 +104,9 @@ + android:key="@string/pref_video_preset_key" + android:entries="@array/video_preset_entries" + android:entryValues="@array/video_preset_entries" /> - - - - - - diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java index a2cadcb97..5341568c6 100644 --- a/src/org/linphone/LinphoneActivity.java +++ b/src/org/linphone/LinphoneActivity.java @@ -135,7 +135,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta if (isTablet() && getRequestedOrientation() != ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) { setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); - } else if (!isTablet() && getResources().getBoolean(R.bool.orientation_portrait_only)) { + } else if (getResources().getBoolean(R.bool.orientation_portrait_only)) { setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); } diff --git a/src/org/linphone/LinphoneLauncherActivity.java b/src/org/linphone/LinphoneLauncherActivity.java index 378ee9372..3dca406b9 100644 --- a/src/org/linphone/LinphoneLauncherActivity.java +++ b/src/org/linphone/LinphoneLauncherActivity.java @@ -52,9 +52,9 @@ public class LinphoneLauncherActivity extends Activity { // Hack to avoid to draw twice LinphoneActivity on tablets if (getResources().getBoolean(R.bool.isTablet)) { setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); - } else { - setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); - } + } else if (getResources().getBoolean(R.bool.orientation_portrait_only)) { + setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); + } setContentView(R.layout.launch_screen); mHandler = new Handler(); diff --git a/src/org/linphone/SettingsFragment.java b/src/org/linphone/SettingsFragment.java index 71fb78163..6fbbdab8a 100644 --- a/src/org/linphone/SettingsFragment.java +++ b/src/org/linphone/SettingsFragment.java @@ -28,7 +28,6 @@ import org.linphone.core.LinphoneCore.AdaptiveRateAlgorithm; import org.linphone.core.LinphoneCore.EcCalibratorStatus; import org.linphone.core.LinphoneCore.MediaEncryption; import org.linphone.core.LinphoneCoreException; -import org.linphone.core.LinphoneCoreFactory; import org.linphone.core.LinphoneCoreListenerBase; import org.linphone.core.LinphoneProxyConfig; import org.linphone.core.PayloadType; @@ -98,8 +97,6 @@ public class SettingsFragment extends PreferencesListFragment { // Inits the values or the listener on some settings private void initSettings() { - //Init accounts on Resume instead of on Create to update the account list when coming back from wizard - initTunnelSettings(); initAudioSettings(); initVideoSettings(); @@ -133,7 +130,7 @@ public class SettingsFragment extends PreferencesListFragment { emptyAndHidePreference(R.string.pref_sipaccounts_key); } - if(!getResources().getBoolean(R.bool.replace_wizard_with_old_interface)){ + if(!getResources().getBoolean(R.bool.replace_assistant_with_old_interface)){ hidePreference(R.string.pref_add_account_key); } @@ -141,10 +138,6 @@ public class SettingsFragment extends PreferencesListFragment { uncheckAndHidePreference(R.string.pref_animation_enable_key); } - if (!getResources().getBoolean(R.bool.enable_linphone_friends)) { - emptyAndHidePreference(R.string.pref_linphone_friend_key); - } - if (getResources().getBoolean(R.bool.disable_chat)) { findPreference(getString(R.string.pref_image_sharing_server_key)).setLayoutResource(R.layout.hidden); } @@ -320,13 +313,7 @@ public class SettingsFragment extends PreferencesListFragment { if (LinphoneManager.getLcIfManagerNotDestroyedOrNull() != null) { for (LinphoneProxyConfig lpc : LinphoneManager.getLc().getProxyConfigList()) { - LinphoneAddress addr = null; - try { - addr = LinphoneCoreFactory.instance().createLinphoneAddress(lpc.getIdentity()); - } catch (LinphoneCoreException e) { - me.setLed(R.drawable.led_disconnected); - return; - } + LinphoneAddress addr = lpc.getAddress(); if (addr.getUserName().equals(username) && addr.getDomain().equals(domain)) { if (lpc.getState() == LinphoneCore.RegistrationState.RegistrationOk) { me.setLed(R.drawable.led_connected); @@ -397,21 +384,6 @@ public class SettingsFragment extends PreferencesListFragment { pref.setValue(key); } - private void initializeVideoPresetPreferences(ListPreference pref) { - List entries = new ArrayList(); - List values = new ArrayList(); - entries.add("default"); - values.add("default"); - entries.add("high-fps"); - values.add("high-fps"); - entries.add("custom"); - values.add("custom"); - setListPreferenceValues(pref, entries, values); - String value = mPrefs.getVideoPreset(); - pref.setSummary(value); - pref.setValue(value); - } - private void initializePreferredVideoSizePreferences(ListPreference pref) { List entries = new ArrayList(); List values = new ArrayList(); @@ -581,7 +553,6 @@ public class SettingsFragment extends PreferencesListFragment { } private void initVideoSettings() { - initializeVideoPresetPreferences((ListPreference) findPreference(getString(R.string.pref_video_preset_key))); initializePreferredVideoSizePreferences((ListPreference) findPreference(getString(R.string.pref_preferred_video_size_key))); initializePreferredVideoFpsPreferences((ListPreference) findPreference(getString(R.string.pref_preferred_video_fps_key))); EditTextPreference bandwidth = (EditTextPreference) findPreference(getString(R.string.pref_bandwidth_limit_key)); @@ -589,6 +560,10 @@ public class SettingsFragment extends PreferencesListFragment { bandwidth.setSummary(bandwidth.getText()); updateVideoPreferencesAccordingToPreset(); + ListPreference videoPresetPref = (ListPreference) findPreference(getString(R.string.pref_video_preset_key)); + videoPresetPref.setSummary(mPrefs.getVideoPreset()); + videoPresetPref.setValue(mPrefs.getVideoPreset()); + PreferenceCategory codecs = (PreferenceCategory) findPreference(getString(R.string.pref_video_codecs_key)); codecs.removeAll(); @@ -630,7 +605,6 @@ public class SettingsFragment extends PreferencesListFragment { ((CheckBoxPreference) findPreference(getString(R.string.pref_video_enable_key))).setChecked(mPrefs.isVideoEnabled()); ((CheckBoxPreference) findPreference(getString(R.string.pref_video_use_front_camera_key))).setChecked(mPrefs.useFrontCam()); ((CheckBoxPreference) findPreference(getString(R.string.pref_video_initiate_call_with_video_key))).setChecked(mPrefs.shouldInitiateVideoCall()); - //((CheckBoxPreference) findPreference(getString(R.string.pref_video_automatically_share_my_video_key))).setChecked(mPrefs.shouldAutomaticallyShareMyVideo()); ((CheckBoxPreference) findPreference(getString(R.string.pref_video_automatically_accept_video_key))).setChecked(mPrefs.shouldAutomaticallyAcceptVideoRequests()); } @@ -642,14 +616,14 @@ public class SettingsFragment extends PreferencesListFragment { findPreference(getString(R.string.pref_preferred_video_fps_key)).setEnabled(false); findPreference(getString(R.string.pref_bandwidth_limit_key)).setEnabled(false); } - ((ListPreference) findPreference(getString(R.string.pref_video_preset_key))).setSummary(mPrefs.getVideoPreset()); + findPreference(getString(R.string.pref_video_preset_key)).setSummary(mPrefs.getVideoPreset()); int fps = mPrefs.getPreferredVideoFps(); String fpsStr = Integer.toString(fps); if (fpsStr.equals("0")) { fpsStr = "none"; } - ((ListPreference) findPreference(getString(R.string.pref_preferred_video_fps_key))).setSummary(fpsStr); - ((EditTextPreference) findPreference(getString(R.string.pref_bandwidth_limit_key))).setSummary(Integer.toString(mPrefs.getBandwidthLimit())); + findPreference(getString(R.string.pref_preferred_video_fps_key)).setSummary(fpsStr); + findPreference(getString(R.string.pref_bandwidth_limit_key)).setSummary(Integer.toString(mPrefs.getBandwidthLimit())); } private void setVideoPreferencesListener() { @@ -680,17 +654,6 @@ public class SettingsFragment extends PreferencesListFragment { } }); - /* - findPreference(getString(R.string.pref_video_automatically_share_my_video_key)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() { - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - boolean enable = (Boolean) newValue; - mPrefs.setAutomaticallyShareMyVideo(enable); - return true; - } - }); - */ - findPreference(getString(R.string.pref_video_automatically_accept_video_key)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() { @Override public boolean onPreferenceChange(Preference preference, Object newValue) {