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

Merge "Guard one more use of CentralSurfaces in NavBar" into tm-qpr-dev am: fee4f5374f

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

Change-Id: I6b89a8aad7bb832fd0ec4d98b462a05aacdf9747
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-10-18 04:27:33 +00:00
committed by Automerger Merge Worker
parent 74b22230d9 fee4f5374f
commit 27fb261fd2
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java
View File

@@ -679,7 +679,9 @@ public class NavigationBar extends ViewController<NavigationBarView> implements
public void onViewAttached() { public void onViewAttached() {
final Display display = mView.getDisplay(); final Display display = mView.getDisplay();
mView.setComponents(mRecentsOptional); mView.setComponents(mRecentsOptional);
if (mCentralSurfacesOptionalLazy.get().isPresent()) {
mView.setComponents(mCentralSurfacesOptionalLazy.get().get().getPanelController()); mView.setComponents(mCentralSurfacesOptionalLazy.get().get().getPanelController());
}
mView.setDisabledFlags(mDisabledFlags1, mSysUiFlagsContainer); mView.setDisabledFlags(mDisabledFlags1, mSysUiFlagsContainer);
mView.setOnVerticalChangedListener(this::onVerticalChanged); mView.setOnVerticalChangedListener(this::onVerticalChanged);
mView.setOnTouchListener(this::onNavigationTouch); mView.setOnTouchListener(this::onNavigationTouch);

1
packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java
View File

@@ -148,6 +148,7 @@ public class NavigationBarView extends FrameLayout {
private NavigationBarInflaterView mNavigationInflaterView; private NavigationBarInflaterView mNavigationInflaterView;
private Optional<Recents> mRecentsOptional = Optional.empty(); private Optional<Recents> mRecentsOptional = Optional.empty();
@Nullable
private NotificationPanelViewController mPanelView; private NotificationPanelViewController mPanelView;
private RotationContextButton mRotationContextButton; private RotationContextButton mRotationContextButton;
private FloatingRotationButton mFloatingRotationButton; private FloatingRotationButton mFloatingRotationButton;