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

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

Browse Source 
* 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
parent e4daef16c5 a029671bfd
commit 5023c89d24
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/xml/trust_agent_settings.xml
View File

@@ -16,4 +16,9 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:key="trust_agents" 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>

1
src/com/android/settings/TrustAgentSettings.java
View File

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