FindBugs: Call to equals() comparing different types

Change-Id: If4185f9eec0adfa47a6741eb21111b6cdafac008
Merge "FindBugs: Call to equals() comparing different types" into cm-11.0
Settings: Add AOSP dummy strings

Add some empty strings to remove aapt warnings caused by
aosp strings without default translation.

Change-Id: I96f36e9768977d70bcc8ce717eb677c50ef4982d
Revert "Revert "settings: Add xxhdpi profile icon""

This reverts commit a97c4b862d5331df2252df50df9931a8574650c0.

Change-Id: I23473bf86dec09bf4d4a26287f911f25f5c21668
Merge "Revert "Revert "settings: Add xxhdpi profile icon""" into cm-11.0
New setting under "Debug settings" that enables the development shortcut

Resolve Conflicts:
	res/values/cm_strings.xml
	src/com/android/settings/DevelopmentSettings.java

Change-Id: I9a43e611911f2e278605715f714860ad11236fd9
settings: Fix build

Change-Id: Ia6a4bed9e8184f031ef1ef5be90516ca0714ee4f
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Revert "settings: Fix build"

This reverts commit 048637c00b814e534681293215cd2101b308f8c0.

Change-Id: I98ffeaff6573bfcfc5eb69b1ea49a50eb0a22013
Fix the build

This shouldn't be there in the first place
It's a result of a failed rebase

Change-Id: I48610dfc4214a096b1c4af61af59bf52c5e50529
Merge tag 'android-4.4.1_r1' into HEAD

Android 4.4.1 Release 1

Conflicts:
	src/com/android/settings/DisplaySettings.java
	src/com/android/settings/SecuritySettings.java
	src/com/android/settings/Settings.java

Change-Id: Id7de234388ba9e9b4223ddab900a335424207b2f
Merge commit '4.4.1_r1' into HEAD
Forward port "Display options: allow configuration of wake on plug behavior"

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

Change-Id: If1d50cbad76763bb8e12b2e7a4f7c21f42a58f31
DevelopmentSettings: Fix up save Advanced reboot state

This introduced on http://review.cyanogenmod.org/#/c/54859/

Change-Id: Ic4e2e5c5c3e4bd7649b6d715462c1bb63484a692
Merge "Forward port "Display options: allow configuration of wake on plug behavior"" into cm-11.0
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
Settings: Initial DE translation

PS1:  Forward port strings from CM10.2

PS2:  Add translation for:
      * SMS security
      * Font size control
      * Longpress back to kill app

PS3:  Add translation for:
      * CAF bluetooth strings
      * Hostname setting
      * Privacy guard advanced settings menu link
      * Adaptive backlight settings
      * Performance profile settings
      * Power connect/disconect notification

PS4:  Add translation for:
      * lockscreen shortcut configuration
      * navigation ring customization
      * navigation bar customization
      * hardware key settings

PS5:  Minor cleanup
      Add translation for:
      * APN settings
      * untranslated AOSP strings
      * Circle Battery
      * Advanced Settings

PS6:  Minor wording changes
      Add translation for
      *cLock settings

PS7:  Add translation for:
      * Display wake on plug
      * Wi-Fi country code
      * Display rotation

Change-Id: I26c43659973cd2e8c2fc99b5345ee03fa50ff084
Revert "Settings: Add AOSP dummy strings"

This reverts commit 680b6bc8f5d4265fbc762d89ab4259730cee8339.

Google removed those strings with 4.4.1

Change-Id: If67f01234ddca36879a24c616f4843972048a8e3
Modify Changelog to fragment

Patchset 1) Initial commit
(gweedo767)
Patchset 2) Clean up XML and imports
(gweedo767)
patchset 3) removed setHasOptionsMenu
(gweedo767)
patchset 4) removed hardcoded string and one unneeded string
(gweedo767)
patchset 5) fix spacing in Manifest
(gweedo767)

Settings: Remove Changelog Summary
Remove the redundant summary to the Changelog in About Phone.

Change-Id: Ia808792e31018ca91757b1956c14724a0e6f5c53

Ported from cm-10.2

Change-Id: Id39c3d44cf364b98bd8450db378d3dcfe7301fbb
Merge "Settings: Initial DE translation" into cm-11.0