Settings : Port lockscreen shortcut configuration

Port lockscreen configuration from cm-10.2

Change-Id: Ib4fd41f747912cc741eca1983c5f56df56176aad
Add back navigation ring customization.

Patchset 6 : Hide nav bar category on devices without nav bar

Change-Id: Iec29417ab65efc8df593508204b0981d5b193b74
Add back navigation bar customization.

Change-Id: I6431a611f3107fd1022df11362d1d2aa27b2f436
Add back hardware key settings.

Change-Id: I925fd9d9c02b86d8e93c8b9e25870433f7c20bde
Settings: Add back expanded desktop settings.

Change-Id: If36282d1bf110baaa6a3a6d4807081b06dcc086b
Use holo alert drawable

These instances of the GB icon got missed in the big feature merge.

Change-Id: I4725be79af6e51e1aa5d575a32232bbac0a11275
Merge branch 'cm-11.0' of github.com:CyanogenMod/android_packages_apps_Settings into cm-11.0

Merged changes from upstream