FW - Restore Padding in NavBar Buttons.

In a prior patch to adjust NavBar glow I removed extra padding
that was inserted when there was only 3 buttons.  This caused
the NavBar to tighten up a bit on this case.  This restores
the previous condition of adding a little extra space when
only 3 buttons involved.

Change-Id: I9177cd7eaa795c3705f4e83362648aca992d2fe3
Signed-off-by: Zaphod <mwilson@acesappraisal.com>
xFW: Ribbons Colorize action icons, unlockmethod

Unlock method for if action should be unlock or not.

now torch, notification, and power shouldnt unlock.

Change-Id: Ic0978f145c8ad4f6f944cd603bfe744415d44561
Merge "xFW: Ribbons Colorize action icons, unlockmethod" into jb-mr1
Merge remote-tracking branch 'aokp/jb-mr1' into jb-mr1