ROMControl: GlowPad Torch (NavRing)

NavRing allows Secure Locks to use
    this feature as well.

PS6: Merge NavRing And LockRing torch into
    one spinner (only one active at once)
PS8: String edit
PS9: Fixed option showing up on devices
    that don't have torch if they clicked
    in the ROMControl>Lockscreens Glowpad
    Also did the same for SW600DP devices
    and the MinimizeChallenge option (they
    have this option hidden on create, so
    this was a bug for them as well).
PS10: Completely align spinner with other
    options
PS11: Rebase
PS12: Small reformatting to match
    AOSP guidelines
PS13: Missed a space
PS14: Despite not having merge errors
    Lockscreens.Java lost a lot of imports
    that were needed.

Change-Id: I4017c97f8f52dfe3019b2bb73ccf839af0948552
ROMControl:  Collapse Shade TogglePref

All other toggles set their collapse
    on their own, or should not collapse

Method left in BaseToggle for future
    (if needed) use.
Change-Id: I3250122f9f773df2036a339f896cd42cc07461ae
Merge remote-tracking branch 'm/jb-mr1' into jb-mr1-mod

Conflicts:
	src/com/aokp/romcontrol/fragments/Lockscreens.java

Change-Id: I47e77543bf4a721bb1c2e35c41168bf35a7ec7a8