DO NOT MERGE Allow pinEntry field to be outside pin_container
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:
@@ -112,13 +112,13 @@ public class KeyguardPINView extends KeyguardPinBasedInputView {
|
||||
|
||||
// Password entry area
|
||||
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();
|
||||
lp.height = passwordHeight;
|
||||
pinEntry.setLayoutParams(lp);
|
||||
|
||||
// Below row0
|
||||
View row0 = mContainer.findViewById(R.id.row0);
|
||||
View row0 = findViewById(R.id.row0);
|
||||
row0.setPadding(0, 0, 0, verticalMargin);
|
||||
|
||||
// Above the emergency contact area
|
||||
|
||||
Reference in New Issue
Block a user