PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VpnSettings: bind OnPreferenceClickListener later.

Browse Source 
Bug: 4999108

Change-Id: Idab3029a30943d1118584e6a1b01db96340858ed
This commit is contained in:
Chia-chi Yeh
2011-07-15 11:05:46 -07:00
parent 42a7a7112f
commit d501b5c963
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/vpn2/VpnSettings.java
View File

@@ -73,9 +73,7 @@ public class VpnSettings extends SettingsPreferenceFragment implements
public void onCreate(Bundle savedState) { public void onCreate(Bundle savedState) {
super.onCreate(savedState); super.onCreate(savedState);
addPreferencesFromResource(R.xml.vpn_settings2); addPreferencesFromResource(R.xml.vpn_settings2);
PreferenceGroup group = getPreferenceScreen(); getPreferenceScreen().setOrderingAsAdded(false);
group.setOrderingAsAdded(false);
group.findPreference("add_network").setOnPreferenceClickListener(this);
if (savedState != null) { if (savedState != null) {
VpnProfile profile = VpnProfile.decode(savedState.getString("VpnKey"), VpnProfile profile = VpnProfile.decode(savedState.getString("VpnKey"),
@@ -124,6 +122,7 @@ public class VpnSettings extends SettingsPreferenceFragment implements
// safely cache profiles in the memory. // safely cache profiles in the memory.
if (mPreferences == null) { if (mPreferences == null) {
mPreferences = new HashMap<String, VpnPreference>(); mPreferences = new HashMap<String, VpnPreference>();
PreferenceGroup group = getPreferenceScreen();
String[] keys = mKeyStore.saw(Credentials.VPN); String[] keys = mKeyStore.saw(Credentials.VPN);
if (keys != null && keys.length > 0) { if (keys != null && keys.length > 0) {
@@ -138,14 +137,12 @@ public class VpnSettings extends SettingsPreferenceFragment implements
} else { } else {
VpnPreference preference = new VpnPreference(context, profile); VpnPreference preference = new VpnPreference(context, profile);
mPreferences.put(key, preference); mPreferences.put(key, preference);
}
}
}
}
PreferenceGroup group = getPreferenceScreen();
for (VpnPreference preference : mPreferences.values()) {
group.addPreference(preference); group.addPreference(preference);
} }
}
}
group.findPreference("add_network").setOnPreferenceClickListener(this);
}
// Show the dialog if there is one. // Show the dialog if there is one.
if (mDialog != null) { if (mDialog != null) {