Move shake options on same place
Fix derp
Settings: Skip apps where the LED's already set up

The Settings app should not have shown a package in the "Choose
application" dialog if it was already configured with custom
notification lights since it just introduces confusion

Change-Id: Ib64fc3733601a5a5c3e61068b376f82b5f4720ae
Wi-Fi: Manage Wi-Fi AP priorities

AOSP has a basic LRU priority for Wi-Fi networks (last connected has more priority).
This changes added the ability of graphically set the priority of any of the configured
Wi-Fi networks through Settings -> Wi-Fi -> Advanced Settings -> Wi-Fi priority.

Port from cm-10.2:
* Added ic_grabber icons

Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: Ief590e799cdb7ef760b631d0b22d9719f867393f

Conflicts:
	res/values/crom_strings.xml
Wi-Fi AP priorities: Add RTL support

Change-Id: Ie24f6e4fc37e2ffc9a0e830d4287fbe7b2935a63
Revert "Fix another derp in Lockscreen Notifications Settings"

This reverts commit 3dc342ed78053e58bf2df7302cb13751d73b664e.
Revert "Lockscreen: Notifications: Fix for devices without proximity sensor"

This reverts commit 8a5dce99688858c5bd04da7a8d2e5172e96b18dc.
Revert "Try to fix settings FC"

This reverts commit 747cba1c0df431d282a46f56de506c8c8b31c78d.
Move Notification Options On One Place
small changes
Remove Active display icon
Lockscreen: Notifications: Fix for devices without proximity sensor

*also fix some dependencies
fix error
Revert "[1/2] Add option to change size of QS ribbon bar"

This reverts commit ebd446863630f01d9a347ef6e820fc752ad90be2.
Show connected to Wi-Fi hotspot devices

Change-Id: Icf51db5ae0204ed2bf153a5223aec986d3b496c4

Conflicts:
	res/values/kang_strings.xml
fix derps
Settings: fixed battery stats app list

The check of mAppListGroup getPreferenceCount is no longer working
after we added other options on this page. Add a separate counter to get
back the full possible list of 12 apps

Change-Id: I679b01deec0f52d4fa2012a31b7b305f8fe176b5
Revert "Settings: Add HeadsUp setting."

This reverts commit bf1c0b404655f2efc2b14fae2911173b5f3c27e5.

Conflicts:
	res/values/crom_strings.xml
HeadsUp [2/2]

Change-Id: Ib7a59145843bedb16aacc87bf6d3c6da143e8d3e
HeadsUp: User configurable timeout [2/2]

Change-Id: I6c55636205237044891324f0dd855046aaafb256