LockscreenPattern : Toggle dots/error pattern visibility (2/2)

Give user ability to hide error pattern / dots.

Patchset 2 : Cleanup commit msg

Change-Id: Ifdd4615c7116f974a0a67079d58a521e84d76367
Add Afrikaans translation

Translated Settings to Afrikaans

Patchset 15 - Update to AOSP terms and writing style
            - Make strings consistent

Change-Id: I29a95214d2bdc33c037aebe79c11cb19aa5ce7ac
merge changes from remotes/github/cm-10.1 into master
QuickSettings: Honors config_show_cmIMESwitcher setting (2/2)

Change-Id: If1900d35e562c27822322551343c4556539c4f4e
Required: http://review.cyanogenmod.org/#/c/33184
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Custom Carrier Label by BeerGang

https://github.com/BeerGang/android_packages_apps_Settings/commit/7efebbc66d7a8585c329c73a5dc2412f8745a156

Change-Id: I3510d45f182e6868c5f598a46502c47f8ab4376a
modified:   res/values/strings.xml
modified:   res/xml/display_settings.xml
modified:   src/com/android/settings/DisplaySettings.java
fix derp

Change-Id: I7c24a760270046a9c660d5b54ca81b8b921f5539
Advanced reboot enabled by default (2/2)

Change-Id: I2697d3f570d1411ab2b0826e2f31b59db65b2498
Remove warning on performance settings

Change-Id: I44bad84682868859231b8d12a7d265f95733b53f
Port Dualpanel for Settings from Beergang

Change-Id: I3c07fd9081c549ed3b01f11f0fefa8c0fad7b43c

Conflicts:
	res/values/strings.xml
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java
merge changes from remotes/github/cm-10.1 into master
Merge "LockscreenPattern : Toggle dots/error pattern visibility (2/2)" into cm-10.1
merge changes from remotes/github/cm-10.1 into master
Switch to new Superuser

Change-Id: I9d91392ad6fbc9953d19059ab59b91d214c00e0c
Switch to new Superuser

Change-Id: I9d91392ad6fbc9953d19059ab59b91d214c00e0c

Conflicts:
	Android.mk
	AndroidManifest.xml
	proguard.flags
	res/xml/settings_headers.xml
settings.cyanogenmod: Added option to always pull down quick settings

Added options, and new summary to always pull down quick settings,
except when there are dismissible notifications.

Patch set 1-3 : Initial commits
Patch set 4   : Better wording in the strings

Change-Id: I51043161d5c8838e266cdcced7d60b87ec926da7
Added hungarian translation for lockpattern_settings

Change-Id: I5b5ca986bb7074dbfcbbac0191b4d6117cfe97d6
cleanup / fix NPE

Change-Id: I5d4242ca55a30ee692319b174fc2739300cd06cb
Settings: Navigation bar Quick launch shortcuts (1 of 2)

This allows up to 3 targets on the Navigation bar ring
or Home buttons with custom Quick launch shortcut actions.

Patchset 1 to 17 - Initial commits and edits
Patchset 18 - Update preference layout
            - Use AOSP terminology for the feature name
            - Group under new 'Navigation bar' category
            - Rename Navigationbar buttons configurator
Patchset 19 - Update commit message with x of y indicator

Change-Id: I91a7b86b7bfa79526b537e28b510ec078a58c956

Conflicts:
	res/values/strings.xml
	res/xml/system_settings.xml
	src/com/android/settings/cyanogenmod/SystemSettings.java
Hide Superuser entry if root access for apps is disabled.

Change-Id: Ibb77ba5a0fccf22564a26b8b1e13f7762c65718e
Merge "Added hungarian translation for lockpattern_settings" into cm-10.1