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

Added two more booleans in resources to help customize preferences

Browse source
This commit is contained in:
Sylvain Berfini 2012-05-30 10:58:45 +02:00
parent 1b7c2bb707
commit abc2c722a6
2 changed files with 33 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
res/values/non_localizable_custom.xml
View file

@ -8,6 +8,8 @@
<bool name="disable_dialer_sliding_drawer">false</bool> <bool name="disable_dialer_sliding_drawer">false</bool>
<bool name="hide_camera_settings">false</bool> <bool name="hide_camera_settings">false</bool>
<bool name="hide_wizard">false</bool> <bool name="hide_wizard">false</bool>
<bool name="hide_accounts">false</bool>
<bool name="hide_add_account_button">false</bool> <!-- Accounts have to be displayed to show add account button -->
<bool name="useFirstLoginActivity">false</bool> <bool name="useFirstLoginActivity">false</bool>
<bool name="useMenuSettings">true</bool> <bool name="useMenuSettings">true</bool>
<bool name="useMenuAbout">true</bool> <bool name="useMenuAbout">true</bool>

49
src/org/linphone/LinphonePreferencesActivity.java
View file

@ -95,6 +95,8 @@ public class LinphonePreferencesActivity extends PreferenceActivity implements E
private static final int ADD_SIP_ACCOUNT = 0x666; private static final int ADD_SIP_ACCOUNT = 0x666;
private static final int WIZARD_ID = 0x667; private static final int WIZARD_ID = 0x667;
private static final int CONFIRM_ID = 0x668; private static final int CONFIRM_ID = 0x668;
private static final int ACCOUNTS_SETTINGS_ID = 0;
private static final int ADD_ACCOUNT_SETTINGS_ID = 1;
private static final int WIZARD_SETTINGS_ID = 2; private static final int WIZARD_SETTINGS_ID = 2;
private static final int CAMERA_SETTINGS_ID = 6; private static final int CAMERA_SETTINGS_ID = 6;
@ -120,13 +122,20 @@ public class LinphonePreferencesActivity extends PreferenceActivity implements E
} }
private void createDynamicAccountsPreferences() { private void createDynamicAccountsPreferences() {
PreferenceScreen root = getPreferenceScreen(); accounts = (PreferenceCategory) getPreferenceScreen().getPreference(ACCOUNTS_SETTINGS_ID);
// Get the good preference screen
accounts = (PreferenceCategory) root.getPreference(0);
accounts.removeAll(); accounts.removeAll();
Preference addAccount = (Preference) root.getPreference(1); // Get already configured extra accounts
SharedPreferences prefs = getPreferenceManager().getSharedPreferences();
nbAccounts = prefs.getInt(getString(R.string.pref_extra_accounts), 0);
for (int i = 0; i < nbAccounts; i++) {
// For each, add menus to configure it
addExtraAccountPreferencesButton(accounts, i, false);
}
}
private void createAddAccountButton() {
Preference addAccount = (Preference) getPreferenceScreen().getPreference(ADD_ACCOUNT_SETTINGS_ID);
addAccount.setOnPreferenceClickListener(new OnPreferenceClickListener() { addAccount.setOnPreferenceClickListener(new OnPreferenceClickListener() {
public boolean onPreferenceClick(Preference preference) { public boolean onPreferenceClick(Preference preference) {
addExtraAccountPreferencesButton(accounts, nbAccounts, true); addExtraAccountPreferencesButton(accounts, nbAccounts, true);
@ -138,14 +147,6 @@ public class LinphonePreferencesActivity extends PreferenceActivity implements E
return true; return true;
} }
}); });
// Get already configured extra accounts
SharedPreferences prefs = getPreferenceManager().getSharedPreferences();
nbAccounts = prefs.getInt(getString(R.string.pref_extra_accounts), 0);
for (int i = 0; i < nbAccounts; i++) {
// For each, add menus to configure it
addExtraAccountPreferencesButton(accounts, i, false);
}
} }
public int getNbAccountsExtra() { public int getNbAccountsExtra() {
@ -565,20 +566,32 @@ public class LinphonePreferencesActivity extends PreferenceActivity implements E
// Load the preferences from an XML resource // Load the preferences from an XML resource
addPreferencesFromResource(R.xml.preferences); addPreferencesFromResource(R.xml.preferences);
createDynamicAccountsPreferences(); if (!getResources().getBoolean(R.bool.hide_accounts)) {
createDynamicAccountsPreferences();
// Accounts have to be displayed to show add account button
if (getResources().getBoolean(R.bool.hide_add_account_button)) {
Preference addAccount = (Preference) getPreferenceScreen().getPreference(ADD_ACCOUNT_SETTINGS_ID);
addAccount.setLayoutResource(R.layout.hidden);
} else {
createAddAccountButton();
}
} else {
// Hide add account button if accounts are hidden
Preference addAccount = (Preference) getPreferenceScreen().getPreference(ADD_ACCOUNT_SETTINGS_ID);
addAccount.setLayoutResource(R.layout.hidden);
}
if (getResources().getBoolean(R.bool.hide_wizard)) { if (getResources().getBoolean(R.bool.hide_wizard)) {
PreferenceScreen screen = getPreferenceScreen(); Preference wizard = (Preference) getPreferenceScreen().getPreference(WIZARD_SETTINGS_ID);
Preference wizard = (Preference) screen.getPreference(WIZARD_SETTINGS_ID);
wizard.setLayoutResource(R.layout.hidden); wizard.setLayoutResource(R.layout.hidden);
} else { } else {
addWizardPreferenceButton(); addWizardPreferenceButton();
verifiyAccountsActivated();
} }
addTransportChecboxesListener(); addTransportChecboxesListener();
verifiyAccountsActivated();
ecCalibratePref = (CheckBoxPreference) findPreference(pref_echo_canceller_calibration_key); ecCalibratePref = (CheckBoxPreference) findPreference(pref_echo_canceller_calibration_key);
ecCalibratePref.setOnPreferenceClickListener(new OnPreferenceClickListener() { ecCalibratePref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
public boolean onPreferenceClick(Preference preference) { public boolean onPreferenceClick(Preference preference) {