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

Add some checks before using deferred-set controllers

Browse Source 
Bug: 164201104
Test: Manual
Change-Id: Icfaaf661d7dd89a2e746dcfefb44731c275dcb06
This commit is contained in:
Winson Chung
2020-08-13 18:48:27 -07:00
parent ceb953fb13
commit 88d33ffa2c
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -860,10 +860,13 @@ public class NavigationBar implements View.OnAttachStateChangeListener,
final int barMode = barMode(mTransientShown, mAppearance);
mNavigationBarMode = barMode;
checkNavBarModes();
mAutoHideController.touchAutoHide();
mLightBarController.onNavigationBarAppearanceChanged(mAppearance, true /* nbModeChanged */,
barMode, false /* navbarColorManagedByIme */);
if (mAutoHideController != null) {
mAutoHideController.touchAutoHide();
}
if (mLightBarController != null) {
mLightBarController.onNavigationBarAppearanceChanged(mAppearance,
true /* nbModeChanged */, barMode, false /* navbarColorManagedByIme */);
}
}
@Override
@@ -880,8 +883,10 @@ public class NavigationBar implements View.OnAttachStateChangeListener,
}
nbModeChanged = updateBarMode(barMode(mTransientShown, appearance));
}
mLightBarController.onNavigationBarAppearanceChanged(appearance, nbModeChanged,
mNavigationBarMode, navbarColorManagedByIme);
if (mLightBarController != null) {
mLightBarController.onNavigationBarAppearanceChanged(appearance, nbModeChanged,
mNavigationBarMode, navbarColorManagedByIme);
}
}
@Override
@@ -924,7 +929,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener,
mNavigationBarView.onTransientStateChanged(mTransientShown);
}
final int barMode = barMode(mTransientShown, mAppearance);
if (updateBarMode(barMode)) {
if (updateBarMode(barMode) && mLightBarController != null) {
mLightBarController.onNavigationBarModeChanged(barMode);
}
}
@@ -938,7 +943,9 @@ public class NavigationBar implements View.OnAttachStateChangeListener,
}
mNavigationBarMode = barMode;
checkNavBarModes();
mAutoHideController.touchAutoHide();
if (mAutoHideController != null) {
mAutoHideController.touchAutoHide();
}
return true;
}
return false;
@@ -1097,7 +1104,9 @@ public class NavigationBar implements View.OnAttachStateChangeListener,
}
private boolean onNavigationTouch(View v, MotionEvent event) {
mAutoHideController.checkUserAutoHide(event);
if (mAutoHideController != null) {
mAutoHideController.checkUserAutoHide(event);
}
return false;
}
@@ -1356,7 +1365,10 @@ public class NavigationBar implements View.OnAttachStateChangeListener,
public void setLightBarController(LightBarController lightBarController) {
mLightBarController = lightBarController;
mLightBarController.setNavigationBar(mNavigationBarView.getLightTransitionsController());
if (mLightBarController != null) {
mLightBarController.setNavigationBar(
mNavigationBarView.getLightTransitionsController());
}
}
/** Sets {@link AutoHideController} to the navigation bar. */