From 332793ba05e286dec2ba83bc0ccd8bb2e4162099 Mon Sep 17 00:00:00 2001 From: Tiger Huang Date: Tue, 29 Oct 2019 23:21:27 +0800 Subject: Window Manager Flag Migration (6/n) Refactor the insets APIs: - Remove top/side in the names of types - Add a type for the caption bar - Rename InsetSide to InternalInsetsSide which is a enumeration, so that we can have a public @InsetsSide which is a bit-wise variable - Fix the naming about insets: inset --> insets Bug: 118118435 Test: atest InsetsSourceProviderTest InsetsStateControllerTest InsetsPolicyTest WindowStateTests CommandQueueTest RegisterStatusBarResultTest InsetsFlagsTest LightBarControllerTest RegisterStatusBarResultTest Change-Id: I27a066299eea9927ce61f6cb5d489ad79bca42ba --- core/java/android/view/WindowInsetsAnimationController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'core/java/android/view/WindowInsetsAnimationController.java') diff --git a/core/java/android/view/WindowInsetsAnimationController.java b/core/java/android/view/WindowInsetsAnimationController.java index cf4415d2b2ba..5cbf3b852018 100644 --- a/core/java/android/view/WindowInsetsAnimationController.java +++ b/core/java/android/view/WindowInsetsAnimationController.java @@ -18,7 +18,7 @@ package android.view; import android.annotation.NonNull; import android.graphics.Insets; -import android.view.WindowInsets.Type.InsetType; +import android.view.WindowInsets.Type.InsetsType; import android.view.WindowInsetsAnimationListener.InsetsAnimation; /** @@ -60,9 +60,9 @@ public interface WindowInsetsAnimationController { @NonNull Insets getCurrentInsets(); /** - * @return The {@link InsetType}s this object is currently controlling. + * @return The {@link InsetsType}s this object is currently controlling. */ - @InsetType int getTypes(); + @InsetsType int getTypes(); /** * Modifies the insets by indirectly moving the windows around in the system that are causing @@ -94,5 +94,5 @@ public interface WindowInsetsAnimationController { * @param shownTypes The list of windows causing insets that should remain shown after finishing * the animation. */ - void finish(@InsetType int shownTypes); + void finish(@InsetsType int shownTypes); } -- cgit v1.2.3