FindBugs: Call to equals() comparing different types

Change-Id: If4185f9eec0adfa47a6741eb21111b6cdafac008
Settings: Add AOSP dummy strings

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

Change-Id: I96f36e9768977d70bcc8ce717eb677c50ef4982d
Signed-off-by: scott <scott@ubuntu>

Conflicts:
	res/values/cm_strings.xml
Revert "Brings performance settings up-to-date with cm-10.2"

This reverts commit 35f2df859ce77c168d9d25e99ddb77bbab42371d.
Revert "Settings: QS performance profiles tile"

This reverts commit a93bfc53278fb93ca56de88d0f5f303ef3b028f9.

Signed-off-by: scott <scott@ubuntu>

Conflicts:
	res/values/config.xml

Change-Id: I9f817da89c6424d09aaa40858de2b3fe5510deed
Revert "Settings : Quick settings/Ribbons (Squashed commit)"

This reverts commit 663ca560130a91786ef1a34a4915e8cb1db4b786.

Signed-off-by: scott <scott@ubuntu>

Conflicts:
	res/values/cm_strings.xml

Change-Id: Ifc491300cd9c836345cd0f789151b7f88fa5e0b3
Add fully customizable quicksettings.  All credit to slim

Change-Id: Ie4970f246520c6e1004cdbc8c88ab64bc68222e4
Signed-off-by: scott <scott@ubuntu>
Settings: Quick Settings Pulldown

Change-Id: Id626410b8c2953eeafb803296e63a7a2d281c388
Signed-off-by: scott <scott@ubuntu>

Conflicts:
	res/values/bs_arrays.xml
fix quiet hours and move to beanstalk folder

Change-Id: I78fee7316bdd5958c4b26d26d201cb2441785c60
Signed-off-by: scott <scott@ubuntu>
Merge remote-tracking branch 'aosps/kitkat-mr1-release' into HEAD

Signed-off-by: scott <scott@ubuntu>

Conflicts:
	res/values-hi/strings.xml
	src/com/android/settings/DisplaySettings.java
	src/com/android/settings/Settings.java

Change-Id: Ibf2b31f0f4a400ba2b1ecc74ed70e4fcc41c9765

Conflicts:
	src/com/android/settings/DisplaySettings.java
settings: qs tweeks

- fix fc problem on tablets
- fix filtering of unsupported tiles
- add music tile options (disable artwork, disable track title optional)
- add instance handling as well to the tile chooser dialog
- add cancel button to chooser dialog
- battery tile short press now battery stats - longpress batteryicon settings
- rotation tile lonpress - rotation settings

prevend fc on devices without mobile

Change-Id: If53fa598eb261b803dbacd4384220bdfe28df04a
Signed-off-by: scott <scott@ubuntu>

Conflicts:
	res/values/bs_strings.xml
	src/com/android/settings/Settings.java
Settings: Lockscreen Colors and Lock Image [2/2]

PS2: Separate settings into mutiple and
	create fragment to hold them
PS3: String change.
PS?: Lock image selector
PS?: Custom Lock-image colorize option

Change-Id: I46bb16570916645712b75c05f34235fdbd271650
Signed-off-by: scott <scott@ubuntu>

Conflicts:
	res/values/bs_strings.xml
	res/xml/security_settings_lockscreen.xml
Settings: Fix Lock Size

Get lock size for device.

Change-Id: Ie9bcbb7ff2fec73128254b8ad290f3e03c4e2f0b
Settings: Display Rotation (All Devices)

Change-Id: I66705138a7593762c6338e1afa11fc4178ca25c3
Settings: Remove Setting From Tablets

Change-Id: I3929da4316cd203b992c9070d67972f2a7359b81
Signed-off-by: scott <scott@ubuntu>
Add lockscreen style to lockscreen interface menu.  Why wouldnt u?

Change-Id: I166c728267a4bb37f591025fbdc94ca68405a99c
Signed-off-by: scott <scott@ubuntu>
Development Settings: fix setting reset on disable

When Development Settings are disabled, some settings are
reset to values other than the default. This fixes it.

 - No need to have resetAdvancedReboot(), as it is already
   reset by the "unckeck all checkboxes" logic.

 - Adb notify should reset to enabled

 - Verify apps over usb should reset to enabled

Change-Id: If5d88d220d2a17d6e172b2f54facd4afa3bae904
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
Signed-off-by: scott <scott@ubuntu>

Conflicts:
	src/com/android/settings/DevelopmentSettings.java
Fix the build

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

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

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

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

This reverts commit 680b6bc8f5d4265fbc762d89ab4259730cee8339.

Google removed those strings with 4.4.1

Change-Id: If67f01234ddca36879a24c616f4843972048a8e3
Signed-off-by: scott <scott@ubuntu>

Conflicts:
	res/values/cm_strings.xml