Revert all lockscreen stuff.
Revert "keyguard: enable magnetic target if no custom targets defined"

This reverts commit c58c17b1e80adbc3fcec5f66ebdae7604fb7c979.

Revert "Frameworks: Support advanced lockscreen shortcuts"

This reverts commit cf288e7d828b5c8b7a8dd241b853689a86e01aef.

Revert "Frameworks: Lockscreen custom shortcuts and 8 targets (1/2)"

This reverts commit 4c5ca7725119d6c19c39a17d835b8cef68816a3c.

Conflicts:
	core/res/res/values/symbols.xml

Revert "Lockscreen Targets : Make multi-user compatible"

This reverts commit 18946e24a55ce217fb3f8b07ed60ed2803dbbf61.

Revert "Re-implement magnetic targets"

This reverts commit 1397f4447872f001fc683753a34ca6a308440d44.

Revert "Framework : Lockscreen - Customizable shortcuts"

This reverts commit 36bf09233701a968469647a757477f4e8e7161ec.

Conflicts:
	core/java/com/android/internal/widget/multiwaveview/GlowPadView.java
	core/res/res/values/dimens.xml
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardSelectorView.java
FW: Lockscreen rework WIP

The frameworks side of trhese rework is basiclly adding
Lockscreen targets and removing unneeded and used variable left
in by google.

Patchset 2: fixed landscape issues with phones

Patchset 3: Added null check for uninstalled apps.
            Add some logic for padding if the 6-8 targets are used.

Patchset 4: Removed option for long press challange unlock, I dont think
            this need to be an option it should just be default.

Patchset 5: Fix rings around targets.

Patchset 6/7: Fix big empty icons in the rc ui.
            Fix layout for 6-8 targets again...

Change-Id: Ic9a4b4f85c674dc9d4097541d447723e2dd47956

Conflicts:
	core/java/android/provider/Settings.java
	core/java/com/android/internal/util/aokp/AwesomeConstants.java
	core/java/com/android/internal/widget/multiwaveview/GlowPadView.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardSelectorView.java
FW: New unlock logic for lockscreen

This lets you move the unlock button and still keep
the magnetic targets...

Change-Id: I4f70036836f44362bfc19ad7a3ab3fb7863ea664
Policy: Lockscreen Targets Unlock speed update

Fixes lag on the classic lockscreen targets and sets up a broadcast
receiver to use those methods from outside of policy like navring
example this commit and the future AOKP Ribbon.

Change-Id: Ia0735aa26a4cd1a2c95d0860992837daf5cacf6d
FW: AOKP Ribbon

This creates a series of options for shortcuts in a few places

The AOKP Swipe ribbon
Lockscreen ribbon
Notifications ribbon
Quick Settings ribbon

Options for Long Press, Icons size, Custom Icons,
  Text on and off, Text color, and options for
  Swipe ribbon color and Opacity.

Change-Id: I6bfb541801bd428b5eee06ef1c3f7d23ef7eeede

Conflicts:
	core/java/android/provider/Settings.java
	core/java/com/android/internal/util/aokp/AwesomeConstants.java
	packages/SystemUI/res/layout/status_bar_expanded.xml
	packages/SystemUI/src/com/android/systemui/aokp/AwesomeAction.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardSelectorView.java
FW: Method for exluding options from navbar.

Change-Id: Icd6d51fe95a2dabd20c7c138d0b31159d4cd78ff
Signed-off-by: Stevespear426 <stephen.k.spear@gmail.com>

Conflicts:
	core/java/com/android/internal/util/aokp/NavBarHelpers.java
Fixups.
FX: NavRing fix longpress derp.

Change-Id: Icebb34612b65ff30e427f237780b366f94a9b24e
Signed-off-by: Stevespear426 <stephen.k.spear@gmail.com>
FW: Ribbon Fix flakey autohide.

Change-Id: I619b47b2bfc87e189333ad386c8a61ca60758ed9
Signed-off-by: Stevespear426 <stephen.k.spear@gmail.com>

Conflicts:
	packages/SystemUI/src/com/android/systemui/aokp/AokpSwipeRibbon.java
FW: Ribbon Dont unlock for torch.

Change-Id: I4f9d02911f565040034033e87510c559332d0a2d
Signed-off-by: Stevespear426 <stephen.k.spear@gmail.com>

Conflicts:
	core/java/com/android/internal/util/aokp/RibbonTarget.java
Don't let apps disable the SIM PIN entry screen.

As the user (who controls the app behaviour after all) likely doesn't
see the PIN screen as a lock screen (he likely wants telephony) and the
PIN screen is not shown on a timer-driven basis, it should be treated
specially.

Change-Id: I3572a80d4a515d72e3aa4a6e933e980fa4516c2b
Merge remote-tracking branch 'CarbonDev/jb2' into jb2

Conflicts:
	packages/SystemUI/src/com/android/systemui/crom/AwesomeAction.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardSelectorView.java
Merge branch 'jb2' of github.com:aways/android_frameworks_base into jb2