Bring in Profiles support from mr0

Change-Id: Icae838838ce2c34aec22c50f166b957205db8394

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

Change-Id: I3cda345208171c5b45daf2d5d263017bc538bd48

Conflicts:
	src/com/android/settings/Settings.java
Profiles: Airplanmode Settings with Checkbox (2/2)

Change Airplanemode Settings to look like Connection/SilentMode etc.

Change-Id: Ida61c51a04e609c7f44d1e320a1cc3fe4208cd7b

Conflicts:
	res/values/arrays.xml
	src/com/android/settings/profiles/ProfileConfig.java
Profile: fix airplane mode

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

Change-Id: Ib8f267f588ca756b51035ae7ca3eb0e2ecf1bfe5

Conflicts:
	res/values/arrays.xml
	src/com/android/settings/profiles/ProfileConfig.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:
	src/com/android/settings/profiles/ProfileConfig.java
Move profiles under Personal header

Conflicts:
	AndroidManifest.xml
	res/xml/settings_headers.xml
Add Profiles in Manifest

Conflicts:
	AndroidManifest.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
Profile: respect DPM when overriding screen lock (2/2)

Change-Id: Ia0c2b51cfa35e47328a68366964f231e2bb7ebfa
ProfilesSettings : Allow nfc override (2/2)

Allow user to override nfc state via profiles

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

Add UI for configuring triggers to active profiles.

Change-Id: I4903ef64d3eced687136a7dcf4d2048ce4b7ca63

Conflicts:
	res/values/arrays.xml
	res/values/strings.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
Add 2G/3G option to profile connections (2/2)

Only show option when network type is GSM not CDMA

Change-Id: Ib225366c63ae928f23afd5bbe8b5f68818a4976b
Use holo alert drawable

These instances of the GB icon got missed in the big feature merge.

Change-Id: I4725be79af6e51e1aa5d575a32232bbac0a11275
Settings: Call Ring mode what Google calls it, not Silent mode (1 of 2)

Silent mode -> Ring mode cleanup

Change-Id: I4c0c182d59ebeb9e2372a24131506f1a111fe33f

Conflicts:
	res/values/arrays.xml
	src/com/android/settings/profiles/ProfileConfig.java