Fix derp
Return: Custom Carrier Label [1/2]

PS 3 : Fix code style
PS 5 : Rebase
PS 6 : Fix derp

Change-Id: Ic865e3c5204ab05f1e9ab0e081a54b155b577086

Conflicts:

	core/java/android/provider/Settings.java
[1/2] FB: Make menu unlock configurable

For devices with hardware menu keys, menu unlock is turned on by default
This can cause unintentional unlocks. This commit adds the ability to turn
Menu Unlock on or off as desired (Settings -> Security)

System Default is for menu unlock to be ON. This default value can be
overriden using a device overlay:

overlay/frameworks/base/packages/Keyguard/res/values/config.xml
<!-- Allow the menu hard key to be disabled in LockScreen on some devices -->
    <bool name="config_disableMenuKeyInLockScreen">true</bool>

This commit requires the matching commit from Settings repo:
https://gerrit.slimroms.net/#/c/2395/

Based On: https://gerrit.omnirom.org/#/c/3317/

PS6: correct config/overlay location and make multiuser compatible
PS7: derp
PS8: remove the symbol
PS12: rebase

Conflicts:
	core/java/android/provider/Settings.java

Change-Id: I3b6108e4bd403cb76827daed226a4d6a5b868741

Conflicts:

	core/java/android/provider/Settings.java
	core/res/res/values/config.xml
Keyguard: Ensure that a widget and page is attached before attaching the ChallengeLayout.OnBouncerStateChangedListener

otherwise it can result in a NPE due that the page was not loaded. Especially on low end
devices this can happen (see zoomOutToBouncer() method @KeyguardWidgetPager)

Change-Id: I7e940eb2fdf885f158f4c5ff2872ebafcda76da0

Conflicts:

	packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java
Attempt to fix a bug where SIM progress dialog gets stuck.

The fix makes sure onPause() is called when KeyguardHostView
is removed.

Bug 10323372

Change-Id: I20dd1f68c270adbd4582f2cd8ed9b03964b4477c

Conflicts:

	packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java
Framework: Lockscreen Slider Logic && Fix

Part 1: Keyguard array points directly to
	unlock handle and unlock handle
	ONLY.  Assist/Camera intents will
	never be used. It seems this logic
	in the code was devalued %100 by
	an array change that we'll never
	take advantage of.  I assume this
	was done so OEMs can revert the
	array and get camera/assist
	slider targets with minimal effort.

Part 2: Fix unlock icon colorizing if user
	lock targets are null.

Change-Id: I58206829de03828c7a0b838a4bbc56dbbc33c0c9

Conflicts:

	packages/Keyguard/src/com/android/keyguard/KeyguardSelectorView.java
Frameworks: Lockscreen Rotation Optional (1/2)

PS2: Change method to allow disable, enable
	portrait, landscape rotation.

PS3: Just clean up...same code.  Different
	style.

Change-Id: I164d31b8980562eb5df68dcb2846410d932a4e73

Conflicts:

	packages/Keyguard/src/com/android/keyguard/KeyguardSelectorView.java
	packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java
Fix the build.  DO NOT MERGE

Change-Id: Ic34e351f86cfb8299b666e860c067d905cce6747
Framework: Notify User Interaction on Unlock

If user is unlocking or opening an app...
	Notify so the screen timeout is
	reset.

PS2: Dependency

Change-Id: Id605aa1ee01adfb1a1f043eaac1627eb524442d8

Conflicts:

	packages/Keyguard/src/com/android/keyguard/KeyguardSelectorView.java
Frameworks: More Keyguard Colors (1/2)

No content resolver?  Colors EVERYWHERE!!!

PS2: Code clean-up && fix avatar
	text color && set avatar
	border color (AOSP was never
	using their own color value
	either <_< so fix that as well

Change-Id: Ie4daaf1588cd2bbff8871c2beea862f2a15faef7

Conflicts:

	packages/Keyguard/src/com/android/keyguard/KeyguardMultiUserAvatar.java
	packages/Keyguard/src/com/android/keyguard/KeyguardSelectorView.java
Framework: disable keyguard widget frame (1/2)

And another user request.  But...I can understand
	it now that I see it without.  They actually
	look quite nice this way.

Change-Id: Id0222140a41eec9e5cd27b769cf860ac62ede1c0
Fix problem where PhoneWindowManager waits for keyguard to draw

This fixes a problem where PhoneWindowManager times out waiting
for keyguard to draw when it's disabled.  Instead, we pass a null
token back which allows PhoneWindowManager to continue.

Fixes bug 11190932

Change-Id: I041ea1d88dca681476d9477a3aab54559976b312
Send out USER_PRESENT broadcast on screen on if lockscreen is disabled.

This makes sure to turn off the notification LED on screen on when the
lockscreen is disabled by lockscreen toggle tile.

Change-Id: Ibf2fdcd912a2719d973a253aaf3752add7a22e00
Fix visibility of camera widget on insecure lock screens with DPM

The camera widget should be visible on an insecure lockscreen even
with the KEYGUARD_DISABLE_SECURE_CAMERA policy flag set.

Change-Id: I37ff905c6325be9120b16984d3401f334ad00e4c
Keyguard: We need to ensure that keyguard is showing as well to set the token

Google fix

https://github.com/SlimRoms/frameworks_base/commit/021806ec33f5f59567f3bb3af135b2a1d88c0951

fixes what it is meant to fix.

But still we need to ensure if the keyguard eg is disabled by 3rd party
apps or the keyguard is not showing due of other reasons to inform PhoneWindowManager over the token
not to wait to draw for the Keyguard and go ahead.

Fix:
Just check for isShowing in addition to the check if KeyGuard is disabled

Change-Id: I5f017a6ccebf12dc717fb6d44802a1c1fee15abc
Framework: Shake to Temporarily Secure && Fixes(1/2)

PS2: Reduce bloat, grab correct user
	Dependency
PS3: Rebase correctly
PS4: Tired of working these commits into eachother
	correctly, merge into this one commit.
	Fix simpin && face unlock
	Disable shake security if device admin
	requires screen security of any sort
PS5: Hack to fix double-inflation on boot
	registers a listener that stays alive
	until you shake
PS6: Better logic from introduction in PS5
        && make the initial feature enabled
        boolean check for security enabled
        before processing everything else
        without reason.
PS7: Fix potential issue with timer
        && shake staying registered.  Still
        retains accuracy of  without
        unnecessary processing due to
        PS6's security check.

Commit changes: Shake to temporarily secure
	Fix all lock-before-unlock issues
	Shake to temporarily secure timer

Lock-Before-Unlock issues fixed:
	On rotate, secure lock is shown without
		slider.
	On boot, secure lock is shown without
		slider
	Widgets aren't focused correctly if
		screen is turned on twice
		without unlocking
	Unlock target cut-off in landscape
	Smaller unlock ring size && mismatched
		bouncer size

Change-Id: Id6b0b85d2c7d086e1bd1199d7206b1e96b345328

Conflicts:

	packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java
Framework: Minor shake to secure fixes

Match insecure lockscreen feel completely:
	Allow camera roll to be viewed while
		shake to secure enabled and
		device is currently insecure
	Launch activities as though insecure
		which makes the process faster
		and uses the correct animation

Change-Id: I5752e68c022cdb9b9cbffa1bae4dcb901e23137b
Framework: Ensure Intent.ACTION_USER_PRESENT Is Sent

If the user set a keyguard delay (AOSP-Secure-Delay)
	and the screen turned off, many processes will
	thus assume the user is no longer present (true).
	If the screen is turned on before the keyguard
	enables itself, the USER_PRESENT broadcast is never
	sent and the app/process will not know the user has
	returned to using their device.

Change-Id: I6301848043fbf2d76513a20ae189d28018473202
Framework: All Shake Patches (1/X)

Included:
	Keyguard - Disable Shake if isHidden
	Disabled Shake Apps (1/2)
	Shake Sensitivity (1/2)
	Keyguard Shake Events (1/2)
	Shake To Perform Event (1/2)
	430942 miscellaneous fixes

Change-Id: I47707f51e61ba0d4687e0232d684de7ee6b0eb72

Conflicts:

	core/java/android/provider/Settings.java
	core/java/com/android/internal/util/slim/QSConstants.java
	packages/SystemUI/AndroidManifest.xml
	packages/SystemUI/res/values/slim_strings.xml
	packages/SystemUI/src/com/android/systemui/CreateShortcut.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsController.java
Framework: Allow All Widgets On Keyguard (1/2)

Change-Id: I2f25d403740a9ee8822c684436bc28283c356f6c