Jeff Brown fb0448ab4b resolved conflicts for merge of 4f8cd188 to master ...

Change-Id: I148cd616cd14d834915978aa2dc3f9e27188dbd3

2014-05-01 18:19:31 -07:00

..

analytics

…

BiometricSensorUnlock.java

…

CameraWidgetFrame.java

…

CarrierText.java

Add carrier text on lockscreen in top left corner.

2014-04-25 14:18:07 +02:00

ChallengeLayout.java

…

CheckLongPressHelper.java

…

EmergencyButton.java

…

EmergencyCarrierArea.java

…

FaceUnlock.java

…

KeyguardAbsKeyInputView.java

…

KeyguardAccountView.java

…

KeyguardActivityLauncher.java

…

KeyguardCircleFramedDrawable.java

…

KeyguardConstants.java

…

KeyguardDisplayManager.java

…

KeyguardFaceUnlockView.java

…

KeyguardGlowStripView.java

…

KeyguardHostView.java

…

KeyguardLinearLayout.java

…

KeyguardMessageArea.java

resolved conflicts for merge of 02e85744 to master

2014-04-24 17:18:10 -07:00

KeyguardMultiUserAvatar.java

…

KeyguardMultiUserSelectorView.java

…

KeyguardPasswordView.java

…

KeyguardPatternView.java

…

KeyguardPINView.java

…

KeyguardSecurityCallback.java

…

KeyguardSecurityContainer.java

…

KeyguardSecurityModel.java

…

KeyguardSecurityView.java

…

KeyguardSecurityViewFlipper.java

…

KeyguardSecurityViewHelper.java

…

KeyguardSelectorView.java

…

KeyguardSimPinView.java

…

KeyguardSimpleHostView.java

…

KeyguardSimPukView.java

…

KeyguardStatusView.java

…

KeyguardStatusViewManager.java

…

KeyguardTransportControlView.java

…

KeyguardUpdateMonitor.java

Add new DevicePolicyManager disable flags for keyguard.

2014-04-25 13:27:10 -07:00

KeyguardUpdateMonitorCallback.java

resolved conflicts for merge of 4f8cd188 to master

2014-05-01 18:19:31 -07:00

KeyguardViewBase.java

…

KeyguardViewStateManager.java

…

KeyguardWidgetCarousel.java

…

KeyguardWidgetFrame.java

…

KeyguardWidgetPager.java

…

LiftToActivateListener.java

…

MultiPaneChallengeLayout.java

…

MultiUserAvatarCache.java

…

NumPadKey.java

…

ObscureSpeechDelegate.java

…

PagedView.java

…

SecurityMessageDisplay.java

…

SlidingChallengeLayout.java

…

ViewMediatorCallback.java

…