Revert "Launch Heads Up in floating window [2/2]"

This reverts commit 40ae4423dab997db0d616c253c3de0cd207449c1.

Change-Id: I9fb438f142d09c0f515dd1885a7bae28cdfd27bb
Settings : Make proximity opt-in

Change-Id: Idfa64758a3c6d60ca4801f6f7f34f0429f95cbec

Conflicts:

	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java
Detailed Device Info

- This adds the ability to give users extra info in the About Phone/Tablet section
- This also does not require us to clutter up the build.prop
- The information provided to the user will be pulled from several places automatically

http://imgur.com/7Yk8S7X
http://imgur.com/d1py86M

Credit/Thanks to Chris_84 for his guide explaining build.prop values
http://forum.xda-developers.com/galaxy-s3/general/guide-build-prop-wiki-t2047076

Conflicts:
	AndroidManifest.xml
	res/values/custom_strings.xml
	res/values/strings.xml
	res/xml/device_info_settings.xml
	src/com/android/settings/DeviceInfoSettings.java

Change-Id: Ia22735508935d675ed5a9deca17953a9de03f23e
Refactor Device/More... to voodoo/Hardware:

this accomplishes 3 goals:
move all hardware related features to a common header
comply with google development guidelines for number of entries per category
place non-aosp "voodoo" under our ROM settings category for better organization

note: set config_userWantsLegacyFormat to true in an overlay if you feel the hardware
button rebinding should be part of the software interface instead of hardware/compatibility
specific settings... as it was before this commit.

Change-Id: I7821dae6d8d3ba3e23d11cf7a89b26e3a35879f2
Reorder hardware header to be undeneath interface

Change-Id: Ie45b90b4b284ea3551e0c166a7c0b931380459c5
Animation control: fix default listview animation

Change-Id: I4a405d3ac5280d7b67d1c1fa56a5bd38c7c2b6e2
Add most settings to recursive setting search feature

Some features were missing or forgotten because we use different fragments than CM.
Also correct a package name. There's still a few setting fragments left behind
but too tired of this to care atm.

Change-Id: I1b2f3ad46b61f7d391ee1723dfaf11d51b9fb348
Immersive desktop: fix array values/entries update when toggling navbar

Previously, whatever setting you chose would be reset every time you reentered
the fragment for both hardware and softkey devices.  this attaches a settings
observer to watch when the navbar is toggled for hardware key devices while ignoring
navbar only devices, then uses sharedpreferences to restore the set value for both
navbar on and off states.

Change-Id: I6ab1de5729e73047b3e1102b3b78f31c0f111dea
Navbar: update enable switch state based on hardware key navbar toggle

Change-Id: Icc3118a403efabdeffc41c7f0f147cf3ee2bb447
remove disable navkeys option

This shouldn't be mutually exclusive. Since we have no navbar key to disable the
navbar and revert back to hardware keys this shouldn't be made mutually exclusive.
This currently doesn't display or work on bacon anyways.

Change-Id: I07563257b4b5e5261f82794df3ef2ef2ae33413a
Navbar: configurable IME layout

ps4: make it a little less of a shit show
     kill unused fields and imports

Change-Id: Ie9be71ef32e1c073292e0f9cd02ce2c144cb78ae
Merge remote-tracking branch 'upstream/kk44' into kk44