Merge "Ensure OK/Cancel buttons always shown" into rvc-qpr-dev am: b26c104b45

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13306565

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2099b50557604fa6e3dfc14a3fd8d4ba6b54fbc8
This commit is contained in:
TreeHugger Robot
2021-01-11 10:47:44 +00:00
committed by Automerger Merge Worker

View File

@@ -343,17 +343,19 @@ public class PackageInstallerActivity extends AlertActivity {
if (!wasSetUp) { if (!wasSetUp) {
return; return;
} }
// load dummy layout with OK button disabled until we override this layout in
// startInstallConfirm
bindUi();
checkIfAllowedAndInitiateInstall();
} }
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
if (mAppSnippet != null) {
// load dummy layout with OK button disabled until we override this layout in
// startInstallConfirm
bindUi();
checkIfAllowedAndInitiateInstall();
}
if (mOk != null) { if (mOk != null) {
mOk.setEnabled(mEnableOk); mOk.setEnabled(mEnableOk);
} }