summaryrefslogtreecommitdiff
path: root/packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputView.java
diff options
context:
space:
mode:
authorLucas Dupin <dupin@google.com>2019-04-17 16:50:58 -0700
committerLucas Dupin <dupin@google.com>2019-04-18 16:53:35 -0700
commit2e838ac0837a597f250a2b25073dc498def65364 (patch)
treefbb70e35eda5b67bab6bc0b479896461c696a982 /packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputView.java
parentdb44ba1e85fbba8ad9628d48af6948fb3757c0d9 (diff)
Move padlock to the top of the lock screen
Test: tap on notification on lock screen Test: tap on notification on shade locked Test: swipe down from the top expanding QS Test: swipe up from LS Test: switch between pin, pattern and password Test: add and remove locked sim card Test: atest KeyguardBottomAreaTest Test: atest KeyguardClockPositionAlgorithmTest Test: atest KeyguardMessageAreaTest Test: atest KeyguardIndicationControllerTest Test: atest StatusBarKeyguardViewManagerTest Test: atest KeyguardBouncerTest Test: atest KeyguardPatternViewTest Fixes: 130398499 Fixes: 130298363 Fixes: 129784068 Fixes: 130223966 Change-Id: Ib1706de259fa4b1f4ef13f654cbd931457733d82
Diffstat (limited to 'packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputView.java')
-rw-r--r--packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputView.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputView.java
index 4cb8d90927fd..2ff7266baecf 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputView.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputView.java
@@ -100,7 +100,6 @@ public abstract class KeyguardAbsKeyInputView extends LinearLayout
@Override
protected void onFinishInflate() {
mLockPatternUtils = new LockPatternUtils(mContext);
- mSecurityMessageDisplay = KeyguardMessageArea.findSecurityMessageDisplay(this);
mEcaView = findViewById(R.id.keyguard_selector_fade_container);
EmergencyButton button = findViewById(R.id.emergency_call_button);
@@ -110,6 +109,12 @@ public abstract class KeyguardAbsKeyInputView extends LinearLayout
}
@Override
+ protected void onAttachedToWindow() {
+ super.onAttachedToWindow();
+ mSecurityMessageDisplay = KeyguardMessageArea.findSecurityMessageDisplay(this);
+ }
+
+ @Override
public void onEmergencyButtonClickedWhenInCall() {
mCallback.reset();
}