mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-04-30 18:56:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update main view

Browse source
This commit is contained in:
Margaux Clerc 2015-09-18 18:32:25 +02:00
parent 2b74a15268
commit 0db19cefb9
3 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
res/xml/preferences.xml
View file

@ -10,7 +10,7 @@
android:key="@string/pref_sipaccounts_key"/> android:key="@string/pref_sipaccounts_key"/>
<Preference <Preference
android:title="@string/setup_title" android:title="@string/assistant_title"
android:key="@string/setup_key"/> android:key="@string/setup_key"/>
<Preference <Preference

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

@ -791,7 +791,6 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
public void displaySettings() { public void displaySettings() {
changeCurrentFragment(FragmentsAvailable.SETTINGS, null); changeCurrentFragment(FragmentsAvailable.SETTINGS, null);
//settings.setSelected(true);
} }
public void applyConfigChangesIfNeeded() { public void applyConfigChangesIfNeeded() {

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

@ -151,10 +151,6 @@ public class SettingsFragment extends PreferencesListFragment {
// Read the values set in resources and hides the settings accordingly // Read the values set in resources and hides the settings accordingly
private void hideSettings() { private void hideSettings() {
if (!getResources().getBoolean(R.bool.display_about_in_settings)) {
hidePreference(R.string.menu_about_key);
}
if (getResources().getBoolean(R.bool.hide_accounts)) { if (getResources().getBoolean(R.bool.hide_accounts)) {
emptyAndHidePreference(R.string.pref_sipaccounts_key); emptyAndHidePreference(R.string.pref_sipaccounts_key);
} }