Bring in Profiles support from mr0

Change-Id: Icae838838ce2c34aec22c50f166b957205db8394

Conflicts:
	AndroidManifest.xml
	res/values/arrays.xml

Conflicts:
	AndroidManifest.xml
	res/values/arrays.xml
Settings: Forward port missing Profiles related changes

Change-Id: I3cda345208171c5b45daf2d5d263017bc538bd48

Conflicts:
	src/com/android/settings/Settings.java
migrate vibrator to silent mode settings (2/2)

Change profiles:
* remove deprecated vibrator settings
* add silent mode settings

Available modes:
* off
* vibrate
* silent

Patch Set 1:
Initial patch with plain ListPreference

Patch Set 2:
Use Checkbox + Dialog like ConnectionSettings

Patch Set 3:
Rebase

Change-Id: I227f8b00f8dc17f06c8de6716c0f34b2faf82e2c

Conflicts:
	res/values/arrays.xml

Conflicts:
	res/values/arrays.xml
Profiles: Airplanmode Settings with Checkbox (2/2)

Change Airplanemode Settings to look like Connection/SilentMode etc.

Change-Id: Ida61c51a04e609c7f44d1e320a1cc3fe4208cd7b

Conflicts:
	res/values/arrays.xml

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
Use API Level 16 method for creating a MIME NDEF record

When writing a profile ID to an NFC tag to have it trigger a profile change,
use the NdefRecord.createMime()-method instead of manually creating the NDEF
record.

Change-Id: Iaa1f105c3f0b46a1d672e96224eafea4fd99d7d5
Profile: fix airplane mode

Entering ProfileConfig used to flip back airplane mode settings to "deactivate".

Change-Id: Ib8f267f588ca756b51035ae7ca3eb0e2ecf1bfe5

Conflicts:
	res/values/arrays.xml

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
Settings: fix profiles TabManager

Whenever an user enters in the profiles settings a new TabHost, but the TabManager is neither created
or updated with this new tabhost. On tablets when the user returns to profiles from a fragment
activity, the tabhost is not displayed.
TabManager need to be created along with the tabhost.

Patchset 2: Fixed ProfileEnabler on tablets. The instance of ProfileEnabler of Settings that
            is the one used on tablets doesn't have a reference of ProfileSettings, so this class
            never will be updated. With this pathset the profiles enabler follows the rules of
            wifi and bluetooth enablers: broadcast intent. Now, settings listen for
            PROFILES_STATE_CHANGED_ACTION events, and refresh its own ui.

Requires: http://review.cyanogenmod.org/#/c/32460/1

Change-Id: I5eae79cd20cee3c14f7d2c30a2238425ccd15e09
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

Conflicts:
	src/com/android/settings/Settings.java
ProfilesSettings : Allow nfc override (2/2)

Allow user to override nfc state via profiles

Change-Id: I2a401f17ce42b1711588242e0604997e1f5d8399

Conflicts:
	res/values/strings.xml
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
[2/2] Add triggers to change profile based on AP

Add UI for configuring triggers to active profiles.

Change-Id: I4903ef64d3eced687136a7dcf4d2048ce4b7ca63

Conflicts:
	res/values/cm_arrays.xml
	res/values/cm_strings.xml

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
Profiles: show ring and notification tone title in summary

Change-Id: Id05d2b8941a4074bfc79370914eaebf4db48681c
Profiles: reuse AppPicker

Change-Id: I28585f12bbac9cf8d4cf37b5ac59816b7f996acb

Conflicts:
	AndroidManifest.xml

Conflicts:
	AndroidManifest.xml
[1/2] Add bluetooth triggers to profiles

Renamed WifiTriggerFragment to TriggersFragment as it is used by
multiple trigger types
Made AbstractTriggerPreference used by multiple trigger types
Renamed some strings to make more sense

Make sure the configured triggers are shown even if type is disabled.
E.g. when Wi-Fi is disable listing AccessPoints does not work for
triggers, already configured triggers will still be shown.

Change-Id: Ife78269586aa2ab7fa94d3462582e259f9228ab2

Conflicts:
	res/values/cm_arrays.xml
	res/values/cm_strings.xml

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
Remove option for wimax as we don't have it

Signed-off-by: iceandfire <arhamjamal@gmail.com>
Update assets to build

Change-Id: Iee67a2a29d3f51b375eb9fa0e32a097718cabcbb

Conflicts:
	res/values/dimens.xml
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.

Patchset 2: Move WiFiPriority from cyanogenmod folder to wifi folder
            Remove double quotes in SSID name
Patchset 3: Fixed code issues

Change-Id: Ief590e799cdb7ef760b631d0b22d9719f867393f
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

Conflicts:
	res/xml/wifi_advanced_settings.xml
Profiles Activity

Change-Id: If905e54f4a34dbed0c52caaaf76198c31846bee3

Conflicts:
	AndroidManifest.xml
	src/com/android/settings/Settings.java