Fix the message when Bluetooth is turning off while on the tethering menu.

Currently says "Turning Wifi off..."
This change will display "Turning Bluetooth off..." instead.

Change-Id: I741e07f3b583e8e4cfb51073fe2556f58d8a89a1
Signed-off-by: Ryan Baxter <rbryanbaxter@gmail.com>
hide torch tile on devices that don't have led flash

Change-Id: I24b3efe31142857ce63dd2dd5d0a808be9ecce1d
QuickSettings: Fix load default tiles (CYAN-541)

This fix a issue unable to reorder tiles correctly caused by loading tiles device doesn't supported.

Change-Id: Id341e698394c14c1525115616128f019fc244598
JIRA: https://jira.cyanogenmod.org/browse/CYAN-541
Fix order in tile
Add Slider shortcuts

Includes Change I683d9c22: Add the new lockscreen drawables to the
picker list by Bjorn Lunden (blunden)

Settings : Lockscreen targets alignment fix

Add separate layouts for different layouts to fix alignment issues.

Change-Id: I2453225e8a683244a1e11f0a8d3c18954ba5885f

Change-Id: I155824abc0578d98d3e2f1f5c2dcde3fa7b2ef84

Conflicts:

	AndroidManifest.xml
	res/values/arrays.xml
	res/values/strings.xml
Move customizable lock screen under Purity Settings
Settings: Lockscreen Targets Icon Revamp

Adjust the size of custom app icons and resize and round the corners
of gallery icons for a more uniform look.

Before http://imgur.com/cTOqdwX

After http://imgur.com/EKAeFiw

Change-Id: I75f3656ae5b4ac4a4bd1c1cbed6c07ab2863f4fd
Settings : NavigationBar Customization

Contains:

- Settings side to customize the navigation bar buttons.
  Id: I39d9362f1930dc4181d20ff95077b4c290f6907e

- Settings : NavigationBar Customization
  Settings side to customize the navigation bar buttons.
  Id: Ibd51fbca96d5f0d5e75c7bd74dc5ec62ed1d969d

- Settings: Fix NavBar lock button when resetting default
  When the NavBar is reset to defaults while in edit mode, lock icon should
  re-lock
  Id: I876725046e380ebb7da774ae412ce2b68f5310f8

- And a few small fixes

- Add support for navbar editing on tablets

- Add npe check

Change-Id: Ic77ca21d976015a1f4b4e10cab27fa35760035da

Port from cm-10.1

Signed-off-by:  Paul Beeler <sparksco@gmail.com>

Fix derp

Conflicts:

	res/values/strings.xml
	src/com/android/settings/rascarlo/SystemSettings.java
Navbar.java
Navbar height settings
Fix custom lockscreen
Fix utils.java