Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aaa7a42e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2099b50557604fa6e3dfc14a3fd8d4ba6b54fbc8
parents 49698f5c b26c104b

packages/PackageInstaller/src/com/android/packageinstaller/PackageInstallerActivity.java

+7 −5
Original line number Diff line number Diff line
@@ -343,17 +343,19 @@ public class PackageInstallerActivity extends AlertActivity { 
        if (!wasSetUp) {

            return;

        }

    }



    @Override

    protected void onResume() {

        super.onResume();



        if (mAppSnippet != null) {

            // load dummy layout with OK button disabled until we override this layout in

            // startInstallConfirm

            bindUi();

            checkIfAllowedAndInitiateInstall();

        }



    @Override

    protected void onResume() {

        super.onResume();



        if (mOk != null) {

            mOk.setEnabled(mEnableOk);

        }