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

Commit be0a3d95 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "SystemUI : Move shortcut helper instantiation before updateVisibility"

parents e0c57983 a0be62b9

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java

+1 −1
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL 
        mLockIcon = (KeyguardAffordanceView) findViewById(R.id.lock_icon);

        mIndicationText = (TextView) findViewById(R.id.keyguard_indication_text);

        mEmergencyButton = (EmergencyButton) findViewById(R.id.emergency_call_button);

        mShortcutHelper = new LockscreenShortcutsHelper(mContext, this);

        watchForCameraPolicyChanges();

        updateCameraVisibility();

        updatePhoneVisibility();
@@ -184,7 +185,6 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL 
        mCameraImageView.setOnClickListener(this);

        mPhoneImageView.setOnClickListener(this);

        initAccessibility();

        mShortcutHelper = new LockscreenShortcutsHelper(mContext, this);

        updateCustomShortcuts();

    }