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

Merge "Revert "Notify the visibility change to update color views without control."" into rvc-dev am: d1cfb337cf am: 493b5e0048 am: fd59d085d6

Browse Source 
Change-Id: I0bd769f2570d4fe27c213678bf2b0516ad1ac2b7
This commit is contained in:
Yuncheol Heo
2020-05-05 23:21:22 +00:00
committed by Automerger Merge Worker
parent f01da0b1da fd59d085d6
commit b79d61c68c
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/view/InsetsSourceConsumer.java
View File

@@ -200,15 +200,6 @@ public class InsetsSourceConsumer {
}
boolean applyLocalVisibilityOverride() {
return applyLocalVisibilityOverride(false /* notifyWithoutControl */);
}
/**
* @param notifyWithoutControl set it true when the caller wants to notify the visibility
* changes even if the consumer doesn't have the control.
* @return true if it needs to notify the visibility changes to the controller
*/
private boolean applyLocalVisibilityOverride(boolean notifyWithoutControl) {
InsetsSource source = mState.peekSource(mType);
final boolean isVisible = source != null && source.isVisible();
final boolean hasControl = mSourceControl != null;
@@ -220,7 +211,7 @@ public class InsetsSourceConsumer {
// If we don't have control, we are not able to change the visibility.
if (!hasControl) {
return notifyWithoutControl;
return false;
}
if (isVisible == mRequestedVisible) {
return false;
@@ -302,9 +293,7 @@ public class InsetsSourceConsumer {
mRequestedVisible = requestedVisible;
mIsAnimationPending = false;
}
// We need to notify the visibility changed even if we don't have mSourceControl in order
// to update color views.
if (applyLocalVisibilityOverride(true /* notifyWithoutControl */)) {
if (applyLocalVisibilityOverride()) {
mController.notifyVisibilityChanged();
}
}