Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update statusViewCentered after reinflation" into sc-v2-dev

Browse Source
This commit is contained in:
Alex Florescu
2021-08-23 14:08:34 +00:00
committed by Android (Google) Code Review
parent a6a85a9be2 abcd474df8
commit 9ecf739f8f
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
View File

@@ -652,7 +652,7 @@ public class NotificationPanelViewController extends PanelViewController {
private KeyguardMediaController mKeyguardMediaController; private KeyguardMediaController mKeyguardMediaController;
private boolean mStatusViewCentered = false; private boolean mStatusViewCentered = true;
private View.AccessibilityDelegate mAccessibilityDelegate = new View.AccessibilityDelegate() { private View.AccessibilityDelegate mAccessibilityDelegate = new View.AccessibilityDelegate() {
@Override @Override
@@ -1082,7 +1082,7 @@ public class NotificationPanelViewController extends PanelViewController {
constraintSet.applyTo(mNotificationContainerParent); constraintSet.applyTo(mNotificationContainerParent);
mNotificationContainerParent.setSplitShadeEnabled(mShouldUseSplitNotificationShade); mNotificationContainerParent.setSplitShadeEnabled(mShouldUseSplitNotificationShade);
updateKeyguardStatusViewAlignment(false /* animate */); updateKeyguardStatusViewAlignment(/* animate= */false);
mLockscreenSmartspaceController.onSplitShadeChanged(mShouldUseSplitNotificationShade); mLockscreenSmartspaceController.onSplitShadeChanged(mShouldUseSplitNotificationShade);
mKeyguardMediaController.refreshMediaPosition(); mKeyguardMediaController.refreshMediaPosition();
} }
@@ -1129,6 +1129,9 @@ public class NotificationPanelViewController extends PanelViewController {
keyguardStatusView = (KeyguardStatusView) mLayoutInflater.inflate( keyguardStatusView = (KeyguardStatusView) mLayoutInflater.inflate(
R.layout.keyguard_status_view, mNotificationContainerParent, false); R.layout.keyguard_status_view, mNotificationContainerParent, false);
mNotificationContainerParent.addView(keyguardStatusView, statusIndex); 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( attachSplitShadeMediaPlayerContainer(
keyguardStatusView.findViewById(R.id.status_view_media_container)); keyguardStatusView.findViewById(R.id.status_view_media_container));