diff --git a/res/drawable-xhdpi/linphone_notification_icon.png b/res/drawable-xhdpi/linphone_notification_icon.png new file mode 100644 index 000000000..fa36e433e Binary files /dev/null and b/res/drawable-xhdpi/linphone_notification_icon.png differ 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) {