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

Merge "Fix issue with alphas not being applied to the same view on unlock" into sc-v2-dev am: 9e4c614404

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

Change-Id: I22a5e4200fb8231a2f380dc9f49e8081186d6b5b
This commit is contained in:
Winson Chung
2021-11-24 05:49:54 +00:00
committed by Automerger Merge Worker
parent febf2257b9 9e4c614404
commit 3ff5002d38
2 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -110,6 +110,7 @@ public class NavigationBarView extends FrameLayout implements
private final int mNavColorSampleMargin; private final int mNavColorSampleMargin;
private final SysUiState mSysUiFlagContainer; private final SysUiState mSysUiFlagContainer;
// The current view is one of mHorizontal or mVertical depending on the current configuration
View mCurrentView = null; View mCurrentView = null;
private View mVertical; private View mVertical;
private View mHorizontal; private View mHorizontal;
@@ -397,12 +398,6 @@ public class NavigationBarView extends FrameLayout implements
} }
} }
@Override
protected boolean onSetAlpha(int alpha) {
Log.e(TAG, "onSetAlpha", new Throwable());
return super.onSetAlpha(alpha);
}
public void setAutoHideController(AutoHideController autoHideController) { public void setAutoHideController(AutoHideController autoHideController) {
mAutoHideController = autoHideController; mAutoHideController = autoHideController;
} }
@@ -505,6 +500,18 @@ public class NavigationBarView extends FrameLayout implements
return mCurrentView; return mCurrentView;
} }
/**
* Applies {@param consumer} to each of the nav bar views.
*/
public void forEachView(Consumer<View> consumer) {
if (mVertical != null) {
consumer.accept(mVertical);
}
if (mHorizontal != null) {
consumer.accept(mHorizontal);
}
}
public RotationButtonController getRotationButtonController() { public RotationButtonController getRotationButtonController() {
return mRotationButtonController; return mRotationButtonController;
} }

29
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
View File

@@ -555,12 +555,13 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
public void onStartedWakingUp() { public void onStartedWakingUp() {
mStatusBar.getNotificationShadeWindowView().getWindowInsetsController() mStatusBar.getNotificationShadeWindowView().getWindowInsetsController()
.setAnimationsDisabled(false); .setAnimationsDisabled(false);
View currentView = getCurrentNavBarView(); NavigationBarView navBarView = mStatusBar.getNavigationBarView();
if (currentView != null) { if (navBarView != null) {
currentView.animate() navBarView.forEachView(view ->
view.animate()
.alpha(1f) .alpha(1f)
.setDuration(NAV_BAR_CONTENT_FADE_DURATION) .setDuration(NAV_BAR_CONTENT_FADE_DURATION)
.start(); .start());
} }
} }
@@ -568,12 +569,13 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
public void onStartedGoingToSleep() { public void onStartedGoingToSleep() {
mStatusBar.getNotificationShadeWindowView().getWindowInsetsController() mStatusBar.getNotificationShadeWindowView().getWindowInsetsController()
.setAnimationsDisabled(true); .setAnimationsDisabled(true);
View currentView = getCurrentNavBarView(); NavigationBarView navBarView = mStatusBar.getNavigationBarView();
if (currentView != null) { if (navBarView != null) {
currentView.animate() navBarView.forEachView(view ->
view.animate()
.alpha(0f) .alpha(0f)
.setDuration(NAV_BAR_CONTENT_FADE_DURATION) .setDuration(NAV_BAR_CONTENT_FADE_DURATION)
.start(); .start());
} }
} }
@@ -1015,17 +1017,6 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
mStatusBar.onKeyguardViewManagerStatesUpdated(); mStatusBar.onKeyguardViewManagerStatesUpdated();
} }
/**
* Updates the visibility of the nav bar content views.
*/
private void updateNavigationBarContentVisibility(boolean navBarContentVisible) {
final NavigationBarView navBarView = mStatusBar.getNavigationBarView();
if (navBarView != null && navBarView.getCurrentView() != null) {
final View currentView = navBarView.getCurrentView();
currentView.setVisibility(navBarContentVisible ? View.VISIBLE : View.INVISIBLE);
}
}
private View getCurrentNavBarView() { private View getCurrentNavBarView() {
final NavigationBarView navBarView = mStatusBar.getNavigationBarView(); final NavigationBarView navBarView = mStatusBar.getNavigationBarView();
return navBarView != null ? navBarView.getCurrentView() : null; return navBarView != null ? navBarView.getCurrentView() : null;