Revert "dirty fix for navbarhide derp"

This reverts commit 5cc53dd91b87596d2d435698b6563901fc823089.
refactor the options shown for tablets and phablets

add isPhablet and hasPhoneAbility to remove certain
preferences

Change-Id: Ic7f9a17553a5652a15941ff34fe2badec1431fcd
Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>

Conflicts:
	src/com/aokp/romcontrol/fragments/Lockscreens.java
	src/com/aokp/romcontrol/fragments/Sound.java
Fix Expanded Desktop State

Change-Id: I35edb9e0e95340b5b07af51797558cf3aa0a83fc