Framework: CustomToggle Improvements (!Advanced)

Remove advanced Preference in favor of:
        If click = null, use longclick icon.
        This is all Advanced vs Basic was, really.
        User confusion might ensue, but ultimately,
        Exact same ability if you set click to null.
        This also clarifies the ShouldCollapse
        Preference through correlation of it not
        Collapsing on-click in basic.
        Also refresh Icons ondemand.

Change-Id: Ia56db7778c89bb38c5e77719e9fa47a9eef4c7eb

Conflicts:
	core/java/android/provider/Settings.java