Revert "Separate scroll and swipe views in SwipeRefreshLayout"

This reverts commit cb084a5eea8cc641096fc288cb7156e0bb866d81.

Change-Id: If8606bea02389900832a68bc84144c9e552797c4
2 files changed