NavigationBar: Custom height (2/2)

Ported from http://review.cyanogenmod.org/#/c/23610/
Settings : Clock - right/center/off (Part 2 of 2)

ported from http://review.cyanogenmod.org/#/c/22967/
RC: Battery Bar + colorpicker

Port of https://github.com/AOKP/packages_apps_ROMControl/commit/4d23fe17046512f5d9841bd79cb1bc83480e73b0
NFC: Make polling mode switchable (3/3)

Change-Id: I14977aa5a21ec4b721f981988a96c71da27b0e62
Merge branch 'cm-10.1' of github.com:finnqBuilds/android_packages_apps_Settings into working

Conflicts:
	src/com/android/settings/cyanogenmod/SystemSettings.java

Change-Id: Ic29011716918d9e3f00a31eb835c34a99e30586a
Merge branch 'cm-10.1' of github.com:finnqBuilds/android_packages_apps_Settings into HEAD
Fix derp and add German translation

Change-Id: Ic00eaf27fc021d713df6c685a2f4791e08b1b956
Fix derp
Merge git://github.com/finnqBuilds/android_packages_apps_Settings
PowerUsage: show more apps with a more accurate percentage

- Increase the maximum displayed items from 10 to 20.
- Make visible items with lower usage percentage (from 1 to 0.1)
- Display two significant values (84%, 2.6%, 0.32%)

Change-Id: Ife4b40cd3297199665fffab5ca34b4cfa590efb0
solve Settings

Change-Id: I1e92407b8f68d760fbca734ecee597cc32f73213
more navbar height steps

Change-Id: Ib9e3417af30a60c534a4446c589388b52430e510
merge changes from remotes/github/cm-10.1 into master
add LED-Group in settings app

Change-Id: I887b0f20cdfd3937bb37c00f1c10c06833489b66
remove NFC on Lockscreen

Change-Id: I52dddcc26c2ade9da1e5f5098ab57db9c318031c
solve strings

Change-Id: I0dd2c7bc1d594c49c4f1cf0525c7c2fc93f48e94
merge changes from remotes/github/cm-10.1 into master
merge changes from remotes/github/cm-10.1 into master
solve merge

Change-Id: Ifb38853f141d98da59da4c4541d2974ceef32d85
remove finnqs changes for switchable NFC polling

Change-Id: I5a793b7652709aaa534742b479bacf8a7ea1531a