Merge "Fix scrolling in WidgetsBottomSheet" into sc-dev

import android.util.Pair;

import android.view.Gravity;

import android.view.LayoutInflater;

import android.view.MotionEvent;

import android.view.View;

import android.view.ViewGroup;

import android.view.animation.Interpolator;

        });

    }

    @Override

    public boolean onControllerInterceptTouchEvent(MotionEvent ev) {

        if (ev.getAction() == MotionEvent.ACTION_DOWN) {

            mNoIntercept = false;

            ScrollView scrollView = findViewById(R.id.widgets_table_scroll_view);

            if (getPopupContainer().isEventOverView(scrollView, ev)

                    && scrollView.getScrollY() > 0) {

                mNoIntercept = true;

            }

        }

        return super.onControllerInterceptTouchEvent(ev);

    }

    protected WidgetCell addItemCell(ViewGroup parent) {

        WidgetCell widget = (WidgetCell) LayoutInflater.from(getContext())

                .inflate(R.layout.widget_cell, parent, false);