Fix volume steps not showing chosen options in their respective settings
- Also follow  a better coding style

Change-Id: I7fb983fd880e46c43f5610b9a5ae1b7f5782dbea
Revert "Buttons: Allow disabling hard navigation keys"

This reverts commit 586f0a825248552e8d0a1007798f35b3325be3de.
Merge branch 'lego' of https://github.com/LEGO-ROM/android_packages_apps_Settings into lego