Merge changes from topic "presubmit-am-87faed4a998c421fb52d7c407d7577eb" into sc-v2-dev-plus-aosp

* changes:
  [automerge] DO NOT MERGE Allow pinEntry field to be outside pin_container 2p: 2bbaf5d099
  DO NOT MERGE Allow pinEntry field to be outside pin_container
This commit is contained in:
TreeHugger Robot
2022-02-18 21:33:06 +00:00
committed by Android (Google) Code Review

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