[Settings] Add reboot tile to QS part2

Conflicts:
	src/com/android/settings/aoip/quicksettings/QuickSettingsUtil.java
Settings: Add Quick Settings Sync tile (1 of 2)

Also, put tiles in alpha order

Change-Id: I8fcb229f7c123529ed273a34138c0306345f237d

Conflicts:
	src/com/android/settings/aoip/quicksettings/QuickSettingsUtil.java
Quick Settings: Clean up Torch tile (1 of 2)

Change-Id: I1e047278879ef88c71f81c3078760e1d1ff57fbd

Conflicts:
	src/com/android/settings/aoip/quicksettings/QuickSettingsUtil.java
Fixes
Settings: Add Screen timeout Quick Settings Tile (1 of 2)

Change-Id: I385ef755ad7cf4a3c02dd8c7b739d5cb33aa2e90

Conflicts:
	res/values/strings.xml
String correction

to fit PW with QS

Conflicts:
	res/values/strings.xml
Status bar brightness control from CM10 (2/2)

Patchset2+3 cleanup

Change-Id: I9d352635fce4dd045ac227c93220c15c74e38175

Conflicts:
	src/com/android/settings/aoip/StatusBar.java
Settings: Lockscreen interface initial push

- add ASS Lockscreen
- add shotcutpicker for targets (from CM)
- changes to be multidpi compatible
- QS add new locckscreen drawable

Change-Id: Ia256a9865d890448f9850749b666836f0cfbcccc

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
Settings: Add option to always show battery status on lockscreen (2/2)

Based on the feature by burnsra in CM7

Authored by blunden
Tweaked by dvtonder
slimed by kufikugel ;)

Change-Id: I1c8c8eef3d0c913c621f735e7d5e395c8768fe76

Conflicts:
	res/values/strings.xml
	res/xml/lockscreen_interface_settings.xml
Settings: Forward port Hardware key custom rebinding (2/2)

Settings for rebinding the actions performed on the following key press events:
Home long-press, menu press, menu long-press, search press, search long-press,
app-switch press and app-switch long-press.

The available actions are: Nothing, open/close menu, recent apps switcher,
search assistant, voice search and in-app search.

Devices with a key configuration other than home, back, menu and search need to
set config_deviceHardwareKeys in an overlay to have the correct preferences
show up.

Change-Id: Id04a598aeb9829d7971dedbd171a61999ce2f919

Conflicts:
	AndroidManifest.xml
	res/values/arrays.xml
	res/values/strings.xml
	res/xml/user_interface_settings.xml
	src/com/android/settings/slim/UserInterface.java