Revert "Fix build and feature"

This reverts commit 4f939d109f4456fbb10214652b5625f1dcdbf31c.
Revert "ProfilesSettings : Allow nfc override (2/2)"

This reverts commit 76c247b4f6aca0c1944a0e2bde64c1932153d0fa.
ProfilesSettings : Allow nfc override (2/2)

Allow user to override nfc state via profiles

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

Conflicts:
	res/values/cm_strings.xml
Settings: TR translations

Change-Id: Ibeae57d6f8d4435dcf7044505e28d20116975fca
No back icon in action bar of APN Settings

When entering the APN menu, the actionbar is missing a back
icon allowing the user to go back to the previous pane.

Added parentActivityName in ApnSettings, to enable action
bar back icon.

Change-Id: Iee8bb420f47c0e2c0d9a43739f534466abba30db
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 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
Signed-off-by: scotthartbti <scott.hart.bti@gmail.com>

Conflicts:
	src/com/android/settings/DisplaySettings.java
[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
accidentally added these.
Signed-off-by: scotthartbti <scott.hart.bti@gmail.com>

Change-Id: Icddc5b50f26abf82a545c8256cb9e602c9cb9b13