From ba59f5b222190f423d20298e0328ec3f8c1c45cd Mon Sep 17 00:00:00 2001
From: Adrian Roos <roosa@google.com>
Date: Fri, 19 Jun 2015 19:59:53 -0700
Subject: [PATCH] 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
---
 res/xml/trust_agent_settings.xml                 | 7 ++++++-
 src/com/android/settings/TrustAgentSettings.java | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/res/xml/trust_agent_settings.xml b/res/xml/trust_agent_settings.xml
index e9374f3a9dc..2bf71fb028c 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 37a86ebb164..498ec5b754b 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();
     };