Merge "Fix accounts screen"

This commit is contained in:
Jason Monk
2015-10-30 16:51:09 +00:00
committed by Android (Google) Code Review
2 changed files with 6 additions and 4 deletions

View File

@@ -32,8 +32,8 @@
android:scaleType="fitXY" android:scaleType="fitXY"
android:src="?android:attr/listDivider" /> android:src="?android:attr/listDivider" />
<ListView <FrameLayout
android:id="@android:id/list" android:id="@+id/prefs_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dip" android:layout_height="0dip"
android:layout_weight="1" android:layout_weight="1"

View File

@@ -161,8 +161,10 @@ public class AccountSyncSettings extends AccountPreferenceBase {
Bundle savedInstanceState) { Bundle savedInstanceState) {
final View view = inflater.inflate(R.layout.account_sync_screen, container, false); final View view = inflater.inflate(R.layout.account_sync_screen, container, false);
final ListView list = (ListView) view.findViewById(android.R.id.list); final ViewGroup prefs_container = (ViewGroup) view.findViewById(R.id.prefs_container);
Utils.prepareCustomPreferencesList(container, view, list, false); Utils.prepareCustomPreferencesList(container, view, prefs_container, false);
View prefs = super.onCreateView(inflater, prefs_container, savedInstanceState);
prefs_container.addView(prefs);
initializeUi(view); initializeUi(view);