diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-16 23:01:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-16 23:01:15 +0000 |
| commit | 11fcb1987afced671b0af54c37070ed2eb47ccd1 (patch) | |
| tree | 7d9d3e2eb0e98dfa9c8e09d80d6a933cb2b588d5 /core/java/android/view/InsetsSourceConsumer.java | |
| parent | 02f853ebe69071e6172d1688b9844b3982d37b85 (diff) | |
| parent | f35971dfca4517097d3d30873443ae4f0d60bbe2 (diff) | |
Merge "Revert "Disable user animations on insets whose visible frame is empty"" into rvc-dev
Diffstat (limited to 'core/java/android/view/InsetsSourceConsumer.java')
| -rw-r--r-- | core/java/android/view/InsetsSourceConsumer.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/view/InsetsSourceConsumer.java b/core/java/android/view/InsetsSourceConsumer.java index 8d92d7b5ab20..565846638acc 100644 --- a/core/java/android/view/InsetsSourceConsumer.java +++ b/core/java/android/view/InsetsSourceConsumer.java @@ -18,8 +18,8 @@ package android.view; import static android.view.InsetsController.ANIMATION_TYPE_NONE; import static android.view.InsetsController.AnimationType; -import static android.view.InsetsController.DEBUG; import static android.view.InsetsState.getDefaultVisibility; +import static android.view.InsetsController.DEBUG; import static android.view.InsetsState.toPublicType; import static com.android.internal.annotations.VisibleForTesting.Visibility.PACKAGE; @@ -275,9 +275,9 @@ public class InsetsSourceConsumer { } @VisibleForTesting(visibility = PACKAGE) - public void updateSource(InsetsSource newSource, @AnimationType int animationType) { + public void updateSource(InsetsSource newSource) { InsetsSource source = mState.peekSource(mType); - if (source == null || animationType == ANIMATION_TYPE_NONE + if (source == null || mController.getAnimationType(mType) == ANIMATION_TYPE_NONE || source.getFrame().equals(newSource.getFrame())) { mPendingFrame = null; mPendingVisibleFrame = null; @@ -286,7 +286,7 @@ public class InsetsSourceConsumer { } // Frame is changing while animating. Keep note of the new frame but keep existing frame - // until animation is finished. + // until animaition is finished. newSource = new InsetsSource(newSource); mPendingFrame = new Rect(newSource.getFrame()); mPendingVisibleFrame = newSource.getVisibleFrame() != null |