Update hierarchical folders; implement this "the right way"

Have 2 list adapters that understand when to setup a hierarchy
and when to not

Change-Id: I98b349ac373689c091bd8227a975bc47ae3f5092
7 files changed