option to hide battery icon
Forward port "Display options: allow configuration of wake on plug behavior"

From http://review.cyanogenmod.org/#/c/47159/

Change-Id: If1d50cbad76763bb8e12b2e7a4f7c21f42a58f31
wifi: Allow configuration of country code for wifi (2/2)

Wifi country code handling is a nightmare - Most retail devices
have region customization in /system for each country a device
is shipped to.

This doesn't work very well for a firmware like Cyanogenmod,
where we try to support all target countries with one firmware
package.  For whatever reason, with newer Broadcom drivers/
firmware blobs, the old trick of using a universal region code
(ccode=ALL in nvram_net.txt) does not seem to work.  Who knows
what the deal is for other wifi chipsets.

The good thing is that wpa_supplicant has a standardized
cross-chipset method for setting the region code, and we
use that here.

Ported from cm-10.2
Framework part: http://review.cyanogenmod.org/54997

Change-Id: Ia9f5133f61f56d89ccb290e37a393f5de507e1cf
Setings: Forward port Display Rotation settings

Originaly authored by Robert Burns (burnsra)

Settings: Fix possible NPE in Display settings
Change-Id: I186203782aa27fb4eaa77500fecb82946bfdd173

Display : Enable rotation on large screens
The auto-rotate toggle in statusbar is no longer present, so the check
is no longer valid.

Change-Id: I0a23e251b3cb793481d14ea8ad8a9079c7c0e962

Fix the spacing between displayed rotation angles
Before: http://goo.gl/QJ7hE
After:  http://goo.gl/V0alW

Change-Id: I0319f8e84e4b278b2f720cbc77cecc280c82d461

Settings: rotation settings for devices with hardware rotation lock
All settings would be disabled on devices with hardware rotation
lock due to dependency setting. Disable dependency to allow setting
swap volume and rotation degrees on those devices.

Change-Id: Iee0532902d59fa80666e17b3853db8e3d7ed5ddc

Add lockscreen rotation as an optional rotation setting (2/2)
This will allow the user to select wether or not to use the
rotation settings for the lockscreen.  This is dependent
upon the rotation setting being checked.

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: If45c13a395e0d71b7c4cdcf484a6b8cef964ee37
JIRA: CYAN-339

Ported from cm-10.2, adjusted for 4.4

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: I4f96b3f804ee4732b277c35340790f3561d69764

Conflicts:

	res/values/cm_strings.xml
Revert "Settings: Add AOSP dummy strings"

This reverts commit 680b6bc8f5d4265fbc762d89ab4259730cee8339.

Google removed those strings with 4.4.1

Change-Id: If67f01234ddca36879a24c616f4843972048a8e3

Conflicts:

	res/values/cm_strings.xml