From 4b2e456e901b992897b534a4ecb894163a947bf6 Mon Sep 17 00:00:00 2001
From: Jason Monk <jmonk@google.com>
Date: Tue, 27 Oct 2015 10:14:09 -0400
Subject: [PATCH] Fix accounts screen

Bug: 25212341
Change-Id: Ia8953b6a9fbbd4c90cd0eb327081c478420f7db6
---
 res/layout/account_sync_screen.xml                         | 4 ++--
 src/com/android/settings/accounts/AccountSyncSettings.java | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/res/layout/account_sync_screen.xml b/res/layout/account_sync_screen.xml
index 64697793e51..7e981f15d48 100644
--- a/res/layout/account_sync_screen.xml
+++ b/res/layout/account_sync_screen.xml
@@ -32,8 +32,8 @@
         android:scaleType="fitXY"
         android:src="?android:attr/listDivider" />
 
-    <ListView
-        android:id="@android:id/list"
+    <FrameLayout
+        android:id="@+id/prefs_container"
         android:layout_width="match_parent"
         android:layout_height="0dip"
         android:layout_weight="1"
diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java
index 5cb1c4ae230..0590cbda770 100644
--- a/src/com/android/settings/accounts/AccountSyncSettings.java
+++ b/src/com/android/settings/accounts/AccountSyncSettings.java
@@ -161,8 +161,10 @@ public class AccountSyncSettings extends AccountPreferenceBase {
             Bundle savedInstanceState) {
         final View view = inflater.inflate(R.layout.account_sync_screen, container, false);
 
-        final ListView list = (ListView) view.findViewById(android.R.id.list);
-        Utils.prepareCustomPreferencesList(container, view, list, false);
+        final ViewGroup prefs_container = (ViewGroup) view.findViewById(R.id.prefs_container);
+        Utils.prepareCustomPreferencesList(container, view, prefs_container, false);
+        View prefs = super.onCreateView(inflater, prefs_container, savedInstanceState);
+        prefs_container.addView(prefs);
 
         initializeUi(view);