diff options
| author | Adrian Roos <roosa@google.com> | 2015-06-19 19:59:53 -0700 |
|---|---|---|
| committer | Adrian Roos <roosa@google.com> | 2015-06-19 20:01:56 -0700 |
| commit | ba59f5b222190f423d20298e0328ec3f8c1c45cd (patch) | |
| tree | 79587f3712490d2424e10c4ec22164881c600692 | |
| parent | d63e696902cbefaa7361aaa16e6b20d0fe593cdb (diff) | |
| download | packages_apps_Settings-ba59f5b222190f423d20298e0328ec3f8c1c45cd.zip packages_apps_Settings-ba59f5b222190f423d20298e0328ec3f8c1c45cd.tar.gz packages_apps_Settings-ba59f5b222190f423d20298e0328ec3f8c1c45cd.tar.bz2 | |
Work around improper ListView recycling in TrustAgentSettings
Previously, the views for our SwitchPreference would never
be recycled because they weren't present in onCreate, which
broke accessibility events.
Bug: 21837103
Change-Id: I01f40b4e6df6d807b77f985116a57334e4ca4868
| -rw-r--r-- | res/xml/trust_agent_settings.xml | 7 | ||||
| -rw-r--r-- | src/com/android/settings/TrustAgentSettings.java | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/res/xml/trust_agent_settings.xml b/res/xml/trust_agent_settings.xml index e9374f3..2bf71fb 100644 --- a/res/xml/trust_agent_settings.xml +++ b/res/xml/trust_agent_settings.xml @@ -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> diff --git a/src/com/android/settings/TrustAgentSettings.java b/src/com/android/settings/TrustAgentSettings.java index 37a86eb..498ec5b 100644 --- a/src/com/android/settings/TrustAgentSettings.java +++ b/src/com/android/settings/TrustAgentSettings.java @@ -79,6 +79,7 @@ public class TrustAgentSettings extends SettingsPreferenceFragment implements public void onResume() { super.onResume(); + removePreference("dummy_preference"); updateAgents(); }; |