Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DO NOT MERGE Allow pinEntry field to be outside pin_container

Browse Source 
On automotive, the pinEntry field lives outside the pin_container.
Because of this, ag/16719218 broke the auto layout since
R.id.pinEntry cannot be found inside the container. Looking across the
entire pin view fixes this.

Bug: 217401027
Test: manual
Change-Id: I860b3f93e5e96e439dae542725f7aceadba6f9db
This commit is contained in:
Alex Stetson
2022-02-01 15:43:21 -08:00
parent e8d0b6bdca
commit 2bbaf5d099
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java
View File

@@ -112,13 +112,13 @@ public class KeyguardPINView extends KeyguardPinBasedInputView {
// Password entry area // Password entry area
int passwordHeight = res.getDimensionPixelSize(R.dimen.keyguard_password_height); int passwordHeight = res.getDimensionPixelSize(R.dimen.keyguard_password_height);
View pinEntry = mContainer.findViewById(R.id.pinEntry); View pinEntry = findViewById(getPasswordTextViewId());
ViewGroup.LayoutParams lp = pinEntry.getLayoutParams(); ViewGroup.LayoutParams lp = pinEntry.getLayoutParams();
lp.height = passwordHeight; lp.height = passwordHeight;
pinEntry.setLayoutParams(lp); pinEntry.setLayoutParams(lp);
// Below row0 // Below row0
View row0 = mContainer.findViewById(R.id.row0); View row0 = findViewById(R.id.row0);
row0.setPadding(0, 0, 0, verticalMargin); row0.setPadding(0, 0, 0, verticalMargin);
// Above the emergency contact area // Above the emergency contact area