Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a029671b authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

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

parents 5f0976a0 ba59f5b2

res/xml/trust_agent_settings.xml

+6 −1
Original line number Diff line number Diff line
@@ -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>

src/com/android/settings/TrustAgentSettings.java

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ public class TrustAgentSettings extends SettingsPreferenceFragment implements 


    public void onResume() {

        super.onResume();

        removePreference("dummy_preference");

        updateAgents();

    };