Bye, bye Talk. Welcome Hangouts (2/2)
Signed-off-by: scotthartbti <scott.hart.bti@gmail.com>

Change-Id: Ifd118b485ecf04f2e4c740dce4319f07f626c37f
Settings: Camera button rebinding and lockscreen action additions (2/2)

Adds new config_deviceHardwareKeys bitmask for camera button.
Lets you rebind the camera press/longpress and adds a new KEYCODE_CAMERA handler to inject a longpress KeyEvent
in order to let you bind keys to actually trigger the shutter, in addition to launching the app itself.

This also adds KEYCODE_ASSIST and KEYCODE_APP_SWITCH to the available keys to assign longpress lockscreen actions to.

Change-Id: Iad1c850e07974ef45313b32c9427b9e0d31dedd7
Signed-off-by: scotthartbti <scott.hart.bti@gmail.com>

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
ProfilesSettings : Allow nfc override (2/2)

Allow user to override nfc state via profiles

Change-Id: I2a401f17ce42b1711588242e0604997e1f5d8399
Fix build and feature

sorry my bad on NFC profile feature pushed the wrong commit.
Fixes build and removes unsupported features on profile
settings

Change-Id: I2c1c27dbf080898286b5ed034926ccde5905bdf7
1/2 HALO feature kanged from PA, modified to work by scotthartbti

Change-Id: Iae920152a1949261f535721ec3fe44ffe0811a24
Halo is so awesome it needs its own menu
Signed-off-by: scotthartbti <scott.hart.bti@gmail.com>

Change-Id: I6f7f1f315028ebacd79a74d6294ffad91ac3dee4
Settings - add an AlertDialog before to delete APN to avoid fails

patch 1: fix blank space
patch 2: remove FR translation and change NegativeButton string
patch 3: improve the NegativeButton (thank you, David)
patch 4: remove create()

Change-Id: I3361d4160a7e1c4eaee094f08c7d212f71e9e0e7
Signed-off-by: scotthartbti <scott.hart.bti@gmail.com>

Conflicts:
	res/values/cm_strings.xml
[1/2] Permit home button wake to be configurable

To activate, enable bool config_show_homeWake in
device overlay/packages/apps/Settings/res/values

Change-Id: I00afe89ba5bf36d74b93a40b9d15eef2e805611f
Signed-off-by: scotthartbti <scott.hart.bti@gmail.com>

Conflicts:
	res/values/cm_strings.xml
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java
fix derp
Signed-off-by: scotthartbti <scott.hart.bti@gmail.com>

Change-Id: Iefdb0138c150603ce1ee153f207bf9fdf77ad950
Fix up remove Wakeup preferences

Follow the bug fix addressed in http://review.cyanogenmod.org/#/c/43544/

This fix the issue both Home key wake and Volume rocker wake preferences will be displayed
if either of them activated in device config.

If both of them are not activated it looks fine because eventually Wakeup category
itself removed,though.

Change-Id: I28b7b45d209c3beb9559ed9e7b89612bf8df8bab
[2/2] Add triggers to change profile based on AP

Add UI for configuring triggers to active profiles.

Change-Id: I4903ef64d3eced687136a7dcf4d2048ce4b7ca63
Signed-off-by: scotthartbti <scott.hart.bti@gmail.com>

Conflicts:
	AndroidManifest.xml
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
Fix up bad cherry-pick
Signed-off-by: scotthartbti <scott.hart.bti@gmail.com>

Change-Id: If9de3ce3b309318e51b0ae9232dad2d37dd89c5b