am a029671b: Merge "Work around improper ListView recycling in TrustAgentSettings" into mnc-dev

* commit 'a029671bfd2d915ce6d43fa31a896058454cfe24':
  Work around improper ListView recycling in TrustAgentSettings
This commit is contained in:
Adrian Roos
2015-06-20 03:28:00 +00:00
committed by Android Git Automerger
2 changed files with 7 additions and 1 deletions

View File

@@ -16,4 +16,9 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:key="trust_agents"
android:title="@string/manage_trust_agents" />
android:title="@string/manage_trust_agents">
<!-- Needed so PreferenceGroupAdapter allows SwitchPreference to be
recycled. Removed in onResume -->
<SwitchPreference android:key="dummy_preference" />
</PreferenceScreen>

View File

@@ -79,6 +79,7 @@ public class TrustAgentSettings extends SettingsPreferenceFragment implements
public void onResume() {
super.onResume();
removePreference("dummy_preference");
updateAgents();
};