ProfilesSettings : Allow nfc override (2/2)

Allow user to override nfc state via profiles

Change-Id: I2a401f17ce42b1711588242e0604997e1f5d8399
Clean up CMStats code.

Besides the cleanup, make sure to wait a bit between retries if upload fails for whatever reason.

JIRA:CYAN-1187
Change-Id: Ifca8364721007aadef31b328d22d764ef7cb3b0a
Pie controls: Tweaking UX for pie service (2/2)

This is the Settings application part of the
user settable activation sensitivity patch for pie controls.

For the complete message look at the commit in
frameworks/base.

Patch Set #3:
* Enabled "Very High"
* Changed title from "Sensitivity" to "Responsiveness"
* Display summary

Patch Set #4:
* "Very High" -> "Very high"

Change-Id: I99fbbc94c75b64121fd04ff5deb8f5a10a04a63b
Allow changing auto-brightness responsitivity.

Change-Id: Icf62db26735f9ab7ad63e750a1824eb7823c3d70
Merge "Clean up CMStats code." into cm-10.1
merge changes from remotes/github/cm-10.1 into master
Merge "Allow changing auto-brightness responsitivity." into cm-10.1
Merge "Pie controls: Tweaking UX for pie service (2/2)" into cm-10.1
Settings: ES translations

- Pie controls
- Auto-brighness

Change-Id: Id39711a7ad70ab1ec796a7b445aa1fa5a67eda56
Option to disable fullscreen keyboard [1/2]

Change-Id: I8030c5b52608b45b48174305c01529abfd1038c5
Make Fullscreen_StatusBar switchable [1/2]

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

Conflicts:
	res/values/cm_arrays.xml
	src/com/android/settings/cyanogenmod/PieControl.java

Change-Id: Ic010fd019d8208c8949e131c6beaed5317ab7266
Fix Fullscreen Keyboard Setting

Change-Id: I54d6be4f71ddb1d5846997834d6721cc26086b84
Notification Light: Fix apps with same name not showing up

Applications with the same name didn't show up in the
notification light add-app-dialog (with Facebook's "Messenager"
and Google's "Messenager" being the prominent example here).

This happend due to the fact that the list of applications
was sorted by names only and inserts with collisions were
dropped.

This commit refactor notification light settings to use packages
instead of application semantics. Further the list of packages
is now ordered by human readable name followed by package name,
which avoids the collision.

Additionally we handle situtations gracefully where a package
has more than one launcher activity (Again for example,
Google's "Messenger" and "Google+" is in the same package).

Bonus: potential race condition in the list adapter was
fixed, concurrent semantics were emphasized, unused imports
removed.

Change-Id: I87ad32f535ca866883df337432d1b0cecc9485a8
Merge "ProfilesSettings : Allow nfc override (2/2)" into cm-10.1
merge changes from remotes/github/cm-10.1 into master

Conflicts:
	src/com/android/settings/profiles/ProfileConfig.java

Change-Id: I239ff8ad136277a0637d20ccb7a87b22a602fe60
Merge "Settings: ES translations" into cm-10.1
Notification Light: Fix apps with same name not showing up

Applications with the same name didn't show up in the
notification light add-app-dialog (with Facebook's "Messenager"
and Google's "Messenager" being the prominent example here).

This happend due to the fact that the list of applications
was sorted by names only and inserts with collisions were
dropped.

This commit refactor notification light settings to use packages
instead of application semantics. Further the list of packages
is now ordered by human readable name followed by package name,
which avoids the collision.

Additionally we handle situtations gracefully where a package
has more than one launcher activity (Again for example,
Google's "Messenger" and "Google+" is in the same package).

Bonus: potential race condition in the list adapter was
fixed, concurrent semantics were emphasized, unused imports
removed.

Change-Id: I87ad32f535ca866883df337432d1b0cecc9485a8
merge changes from remotes/github/cm-10.1 into master
Merge "Notification Light: Fix apps with same name not showing up" into cm-10.1