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

Commit 48fef8ce authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Revert "Don't add other's child as header or footer" 

This reverts commit 358d0d32.

This CL resulted in b/37933333 regression, so it'll have to re-land with a target API check.

Change-Id: I1c2e4de43a15c1851d98f6aff432585ada80fb5b
parent 358d0d32

core/java/android/widget/ListView.java

+0 −11
Original line number Original line Diff line number Diff line
@@ -49,7 +49,6 @@ import android.view.accessibility.AccessibilityNodeProvider; 
import android.widget.RemoteViews.RemoteView;

import android.widget.RemoteViews.RemoteView;





import com.android.internal.R;

import com.android.internal.R;

import com.android.internal.util.Preconditions;





import com.google.android.collect.Lists;

import com.google.android.collect.Lists;
@@ -336,11 +335,6 @@ public class ListView extends AbsListView { 
     * @param isSelectable whether the item is selectable

     * @param isSelectable whether the item is selectable

     */

     */

    public void addHeaderView(View v, Object data, boolean isSelectable) {

    public void addHeaderView(View v, Object data, boolean isSelectable) {

        Preconditions.checkState(

                v.getParent() == null,

                "The specified child already has a parent. "

                + "You must call removeView() on the child's parent first.");



        final FixedViewInfo info = new FixedViewInfo();

        final FixedViewInfo info = new FixedViewInfo();

        info.view = v;

        info.view = v;

        info.data = data;

        info.data = data;
@@ -435,11 +429,6 @@ public class ListView extends AbsListView { 
     * @param isSelectable true if the footer view can be selected

     * @param isSelectable true if the footer view can be selected

     */

     */

    public void addFooterView(View v, Object data, boolean isSelectable) {

    public void addFooterView(View v, Object data, boolean isSelectable) {

        Preconditions.checkState(

                v.getParent() == null,

                "The specified child already has a parent. "

                + "You must call removeView() on the child's parent first.");



        final FixedViewInfo info = new FixedViewInfo();

        final FixedViewInfo info = new FixedViewInfo();

        info.view = v;

        info.view = v;

        info.data = data;

        info.data = data;