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

Commit e6953238 authored by Alex Florescu's avatar Alex Florescu Committed by Automerger Merge Worker
Browse files

Merge "Update statusViewCentered after reinflation" into sc-v2-dev am: 9ecf739f am: c4c2e4c3

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

Change-Id: I57816571568044713665c0305a1d9f6f35fa9148
parents 8f70bad6 c4c2e4c3
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -691,7 +691,7 @@ public class NotificationPanelViewController extends PanelViewController {

    private KeyguardMediaController mKeyguardMediaController;

    private boolean mStatusViewCentered = false;
    private boolean mStatusViewCentered = true;

    private View.AccessibilityDelegate mAccessibilityDelegate = new View.AccessibilityDelegate() {
        @Override
@@ -1173,7 +1173,7 @@ public class NotificationPanelViewController extends PanelViewController {
        constraintSet.applyTo(mNotificationContainerParent);
        mNotificationContainerParent.setSplitShadeEnabled(mShouldUseSplitNotificationShade);

        updateKeyguardStatusViewAlignment(false /* animate */);
        updateKeyguardStatusViewAlignment(/* animate= */false);
        mLockscreenSmartspaceController.onSplitShadeChanged(mShouldUseSplitNotificationShade);
        mKeyguardMediaController.refreshMediaPosition();
    }
@@ -1220,6 +1220,9 @@ public class NotificationPanelViewController extends PanelViewController {
        keyguardStatusView = (KeyguardStatusView) mLayoutInflater.inflate(
                R.layout.keyguard_status_view, mNotificationContainerParent, false);
        mNotificationContainerParent.addView(keyguardStatusView, statusIndex);
        // When it's reinflated, this is centered by default. If it shouldn't be, this will update
        // below when resources are updated.
        mStatusViewCentered = true;
        attachSplitShadeMediaPlayerContainer(
                keyguardStatusView.findViewById(R.id.status_view_media_container));