Merge "Revert "Hide LightRevealScrim when pulsing"" into sc-dev
This commit is contained in:
@@ -4460,7 +4460,6 @@ public class StatusBar extends SystemUI implements DemoMode,
|
|||||||
} else {
|
} else {
|
||||||
mScrimController.transitionTo(ScrimState.UNLOCKED, mUnlockScrimCallback);
|
mScrimController.transitionTo(ScrimState.UNLOCKED, mUnlockScrimCallback);
|
||||||
}
|
}
|
||||||
updateLightRevealScrimVisibility();
|
|
||||||
Trace.endSection();
|
Trace.endSection();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4895,11 +4894,6 @@ public class StatusBar extends SystemUI implements DemoMode,
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mDozeServiceHost.isPulsing()) {
|
|
||||||
mLightRevealScrim.setVisibility(View.GONE);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (mFeatureFlags.useNewLockscreenAnimations()
|
if (mFeatureFlags.useNewLockscreenAnimations()
|
||||||
&& (mDozeParameters.getAlwaysOn() || mDozeParameters.isQuickPickupEnabled())) {
|
&& (mDozeParameters.getAlwaysOn() || mDozeParameters.isQuickPickupEnabled())) {
|
||||||
mLightRevealScrim.setVisibility(View.VISIBLE);
|
mLightRevealScrim.setVisibility(View.VISIBLE);
|
||||||
|
|||||||
Reference in New Issue
Block a user