Scrapped my "dual" sidebar work of the last 3 weeks and started over with a new approach.
Implemented the following features from the sidebar spec:
Add a visual divider between the out-of-box collections and the user-defined collections using a grey line
Restore icons for the out of the box collections.
Display all of the OOTB collections as table view across all App areas
Disallow overlays for the OOTB collections (no rollover check-box icons at all) in the Calendar app
Items that aren't yet finished from the spec include:
Create new collection icons for both OOTB and user-defined collections.
Implement a temporarily de-activated, but still checked state for checked collections when users select an OOTB collection while they have user-defined collections overlayed.
Disallow overlays for all collections in the All, Mail and Tasks app areas
Implement a selected state for sidebar collection icons and sharing status icons.
Implement a selected state for greyed out collection names. bug#5120
I would have made a lot more progress, but I got hung up with what looks like a repository bug#6609
Got rid of kindToDisplayName in sidebar and displayNameAlternatives in UserCollection along with the associated code.
I will be away in DC September 1 through 4, then back to Utah. Due to Helen's schedule, I'm delaying my return to California until the following weekend. So I'll be back in Utah on the weekend of 9 September.