am 8bd49e40: Merge "Don\'t save scroll position inside nested scroller" into lmp-dev

package com.android.contacts.widget;

import android.content.Context;

import android.os.Parcelable;

import android.util.AttributeSet;

import android.view.MotionEvent;

import android.widget.ScrollView;

 * A {@link ScrollView} that doesn't respond or intercept touch events.

 *

 * This is used in combination with {@link com.android.contacts.widget.MultiShrinkScroller} so

 * that MultiShrinkScroller can handle all scrolling.

 * that MultiShrinkScroller can handle all scrolling & saving.

 */

public class TouchlessScrollView extends ScrollView {

        super(context, attrs, defStyleAttr);

    }

    @Override

    protected Parcelable onSaveInstanceState() {

        // Do not save the current scroll position. Always store scrollY=0 and delegate

        // responsibility of saving state to the MultiShrinkScroller.

        final int scrollY = getScrollY();

        setScrollY(0);

        final Parcelable returnValue = super.onSaveInstanceState();

        setScrollY(scrollY);

        return returnValue;

    }

    /**

     * {@inheritDoc}

     */