Merge remote-tracking branch 'cm/cm-12.0' into HEAD
Merge remote-tracking branch 'vanir/L5' into HEAD
Fix blacklist unknown number mode query string.

The same was string was being used to query the database for both private and
unknown numbers, with the effect that enabling private number blocking also
blocked unknown numbers.

Change-Id: I5a77566fde3187ff6044415c64e74ce4e10cd4dc
Frameworks: Gesture Lockscreen (1/2)

This adds the ability to us a hand drawn gesture as
a means to unlock the device.

In the case that the gesture is forgotton or not
being recognized correctly, the fallback will be the
same as when using patterns.

Androidx:
Some changes needed for 5.0

Conflicts:
	core/java/android/provider/Settings.java
	core/java/com/android/internal/widget/ILockSettings.aidl
	core/java/com/android/internal/widget/LockPatternUtils.java
	packages/Keyguard/res/values/strings.xml
	packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java
	services/java/com/android/server/DevicePolicyManagerService.java
	services/java/com/android/server/LockSettingsService.java

Conflicts:
	core/java/com/android/internal/widget/LockPatternUtils.java

Change-Id: Ia54282682372394793ec019380cc7f09fcefa7f9
Gesture panel [2/2]

This adds a gesture panel to launch custom actions. The panel can be
opened from the navbar or quicksettings panel. Hardware key binding
support will be added next

Squashed commit of the following:

commit 4eaea27979e49709ff09c216389a71fd0ef1a711
Author: PrimeDirective <activethrasher00@gmail.com>
Date:   Thu Aug 28 22:31:56 2014 -0400

    clean up styling.. fix button to go to settings

    Change-Id: Icf8e16d9439b5698bd4b48c4ced5977ef184e84f

commit 2bdf61dc577e689fc60ca2b061acd0b20681ef2f
Author: PrimeDirective <activethrasher00@gmail.com>
Date:   Wed Aug 27 16:37:49 2014 -0400

    fix merge fail

    Change-Id: Ia5ab13b0a0574f625db06fd2b9c427b6301563d6

commit d196724a462fe39b0b80760c82c22e93552027ae
Author: PrimeDirective <activethrasher00@gmail.com>
Date:   Tue Aug 26 18:29:01 2014 -0400

    QS: add Gesture panel tile

    PS2: drawables

    Change-Id: I5efd488a131bd7944bff61e8477f68d0eb7d5850

commit 90450e090e093d9db36dc528431e838fd96fca70
Author: PrimeDirective <activethrasher00@gmail.com>
Date:   Sun Aug 24 02:25:45 2014 -0400

    Navbar: gesture actions key

    opens a gesture receiver panel to launch user set actions

    to do: add a QS tile, possibly move to vanir actions, add hardware key support.

    Change-Id: I3e9d9fcbf12549c198e9e2bfbc98d34fb0c0da6a

    Conflicts:
    	core/java/com/android/internal/util/aokp/AwesomeAction.java

Conflicts:
	core/java/android/content/Intent.java
	core/java/com/android/internal/util/aokp/AwesomeAction.java
	core/java/com/android/internal/util/aokp/AwesomeConstants.java
	core/java/com/android/internal/util/cm/QSConstants.java
	core/res/res/values/vanir_strings.xml
	core/res/res/values/vanir_symbols.xml
	packages/SystemUI/res/values/cm_strings.xml
	packages/SystemUI/res/values/vanir_colors.xml
	packages/SystemUI/res/values/vanir_dimens.xml
	packages/SystemUI/res/values/vanir_strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsController.java

Conflicts:
	core/java/android/provider/Settings.java
	core/res/res/values/config.xml
	core/res/res/values/custom_strings.xml
	core/res/res/values/custom_symbols.xml
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

Change-Id: Ibdb91ba7ceb1a4d538e9153834058cf00275836f
Merge branch 'cm' into HEAD
Allow ADB to be enabled by default via a config overlay

This is useful for developers that are testing and troubleshooting boot issues
and adb ends up being disabled by default once the system kicks in.  This should
only be used for testing and removed once a device is deemed stable and able to
boot.

PS2:fix wrong default set by default

Change-Id: Ib17d4e10ec68640ce55a91d5b1067d3d37eeec9d
Signed-off-by: DHOMD <DHO@dho.im>
Conflicts:
	core/res/res/values/config.xml
base: added national roaming info for Play in Poland

Cherry-picked from OmniROM:
https://gerrit.omnirom.org/#/c/3382/

Users of Play in Poland (MCC 260 MNC 06) can roam on
Plus, T-Mobile, Orange (MNCs 01/02/03)

Change-Id: I8ea62b0ca40bac9ced11802ee8ef583d6392a199
National roaming info for Drei in Austria

3AT roams in T-Mobile AT networks

Change-Id: I915edccf92bcbb088fa25b958eb345c624f61597
National roaming info for yesss! in Austria

Change-Id: I930198d3cb311b23752a8c2f54852ebd48d65b86
National roaming info for 3 in Ireland

Change-Id: I451831f4144b72feac1a38ef1e8693cb947d6d7e
core: added national roaming info for Tesco Mobile in Ireland.

Users of Tesco Mobile in Ireland(MCC 272 MNC 11)
  can roam on O2 Ireland (MNC 02)

Change-Id: Ie0b32d51511c2bbc726c43cdec78332397d1ecb9
core: added national roaming info for Bob in Austria.

Users of Bob in Austria(MCC 232 MNC 11)
  can roam on A1 Austria (MNC 01)

Change-Id: I12dfa3d63643af1026dcfea28a4c9d7acec5f9e9
core: added national roaming info for Spring Mobil in Sweden...

Spring Mobil users in Sweden (MCC 240, MNC 10)
can roam on Sweden 3G (MNC 05) and on Sweden 2G (MNC 24).

Change-Id: Ie27ad3561de32557a1713d4962fcc9ec52a8b7fe
National roaming for Telfort in the Netherlands

Don't roam on KPN.nl (204/08)

Change-Id: I4b7614bcdf679bbcb8822077c32d97117d878a8a
Added Non-Roaming for carrier BSNL in UP East and WEST INDIA

Added No-roaming for BSNL from circle UP East to UP West, India

Change-Id: I45e804da143e844d794cca98652f5fc6ac4e209b
Allow 3 AT (mnc05) to roam on T-Mobile in Austria

Change-Id: Ie1a62db9a48cfaf594ddda7b413299a9b587ddd4
National Roaming: Allow T-Mobile AT (MNC03) to roam on 3 AT (MNC10) in Austria

Change-Id: Ief827259fdcb5bfa13bd643f80a8547a56cc934c
Saunalahti considered non-roaming on Elisa

Change-Id: I51b554cf578c6027d52ad6e111e41d269c1f579f
Tele2 considered non-roaming on T-Mo

Change-Id: Ibb05f277b701861b8716168b54e96f63127e686d