Changes the Collapse interface and makes DataItem collapsible.

This reverts commit e71d24368f53b9d9f2b99eb0a72ddb19bc790097.

Change-Id: I13d1b5f6f6be38086fd983ee8688316e2a9ce874
2 files changed