Rename FadingBackgroundView to ScrimView

This patch renames the questionably named "FadingBackgroundView" to
something that makes sense, "ScrimView". All associated interfaces
have also been updated.

Change-Id: Ib95226264c9f23f3aaa1a0053cf81e44722eb910
Reviewed-on: https://chromium-review.googlesource.com/1005623
Commit-Queue: Matthew Jones <mdjones@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#569268}

chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java

@@ -141,7 +141,7 @@ import org.chromium.chrome.browser.vr_shell.VrIntentUtils;
 import org.chromium.chrome.browser.vr_shell.VrShellDelegate;
 import org.chromium.chrome.browser.webapps.AddToHomescreenManager;
 import org.chromium.chrome.browser.widget.ControlContainer;
-import org.chromium.chrome.browser.widget.FadingBackgroundView;
+import org.chromium.chrome.browser.widget.ScrimView;
 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet;
 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheetController;
 import org.chromium.chrome.browser.widget.findinpage.FindToolbarManager;
@@ -264,7 +264,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
     private BottomSheetController mBottomSheetController;
     private BottomSheet mBottomSheet;
     private ContextualSuggestionsCoordinator mContextualSuggestionsCoordinator;
-    private FadingBackgroundView mFadingBackgroundView;
+    private ScrimView mScrimView;
     private ManualFillingCoordinator mManualFillingController;
     private float mStatusBarScrimFraction;
     private int mBaseStatusBarColor;
@@ -753,8 +753,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
     /**
      * @return The View used to obscure content and bring focus to a foreground view.
      */
-    public FadingBackgroundView getFadingBackgroundView() {
-        return mFadingBackgroundView;
+    public ScrimView getScrim() {
+        return mScrimView;
     }
 
     /**
@@ -1398,7 +1398,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
         super.finishNativeInitialization();
 
         ViewGroup coordinator = findViewById(R.id.coordinator);
-        mFadingBackgroundView = new FadingBackgroundView(this, (fraction) -> {
+        mScrimView = new ScrimView(this, (fraction) -> {
             mStatusBarScrimFraction = fraction;
             setStatusBarColor(null, mBaseStatusBarColor);
         }, coordinator);
@@ -1408,7 +1408,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
                 findViewById(R.id.keyboard_accessory_sheet_stub));
 
         if (mToolbarManager != null && mToolbarManager.getToolbar() != null) {
-            mToolbarManager.getToolbar().setScrim(mFadingBackgroundView);
+            mToolbarManager.getToolbar().setScrim(mScrimView);
         }
 
         if (supportsContextualSuggestionsBottomSheet()
@@ -1420,7 +1420,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
             ((BottomContainer) findViewById(R.id.bottom_container)).setBottomSheet(mBottomSheet);
 
             mBottomSheetController = new BottomSheetController(this, getTabModelSelector(),
-                    getCompositorViewHolder().getLayoutManager(), mFadingBackgroundView,
+                    getCompositorViewHolder().getLayoutManager(), mScrimView,
                     getContextualSearchManager(), mBottomSheet);
 
             mContextualSuggestionsCoordinator = new ContextualSuggestionsCoordinator(

chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBar.java

@@ -17,7 +17,7 @@ import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.toolbar.Toolbar;
 import org.chromium.chrome.browser.toolbar.ToolbarActionModeCallback;
 import org.chromium.chrome.browser.toolbar.ToolbarDataProvider;
-import org.chromium.chrome.browser.widget.FadingBackgroundView;
+import org.chromium.chrome.browser.widget.ScrimView;
 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet;
 import org.chromium.ui.base.WindowAndroid;
 
@@ -198,5 +198,5 @@ public interface LocationBar extends UrlBarDelegate {
     /**
      * @param scrim The scrim for this location bar to use.
      */
-    void setScrim(FadingBackgroundView scrim);
+    void setScrim(ScrimView scrim);
 }

chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java

@@ -73,8 +73,8 @@ import org.chromium.chrome.browser.toolbar.ToolbarPhone;
 import org.chromium.chrome.browser.util.ColorUtils;
 import org.chromium.chrome.browser.util.FeatureUtilities;
 import org.chromium.chrome.browser.util.KeyNavigationUtil;
-import org.chromium.chrome.browser.widget.FadingBackgroundView;
-import org.chromium.chrome.browser.widget.FadingBackgroundView.ScrimParams;
+import org.chromium.chrome.browser.widget.ScrimView;
+import org.chromium.chrome.browser.widget.ScrimView.ScrimParams;
 import org.chromium.chrome.browser.widget.TintedDrawable;
 import org.chromium.chrome.browser.widget.TintedImageButton;
 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet;
@@ -94,10 +94,9 @@ import java.util.List;
  * This class represents the location bar where the user types in URLs and
  * search terms.
  */
-public class LocationBarLayout
-        extends FrameLayout implements OnClickListener, OnSuggestionsReceivedListener, LocationBar,
-                                       FakeboxDelegate, FadingBackgroundView.FadingViewObserver,
-                                       LocationBarVoiceRecognitionHandler.Delegate {
+public class LocationBarLayout extends FrameLayout
+        implements OnClickListener, OnSuggestionsReceivedListener, LocationBar, FakeboxDelegate,
+                   ScrimView.ScrimObserver, LocationBarVoiceRecognitionHandler.Delegate {
     private static final String TAG = "cr_LocationBar";
 
     // Delay triggering the omnibox results upon key press to allow the location bar to repaint
@@ -156,7 +155,7 @@ public class LocationBarLayout
     private Runnable mRequestSuggestions;
 
     private ViewGroup mOmniboxResultsContainer;
-    private FadingBackgroundView mFadingView;
+    private ScrimView mScrim;
 
     private boolean mSuggestionsShown;
     private boolean mUrlHasFocus;
@@ -1997,28 +1996,28 @@ public class LocationBarLayout
     }
 
     @Override
-    public void onFadingViewClick() {
+    public void onScrimClick() {
         setUrlBarFocus(false);
         updateFadingBackgroundView(false, false);
     }
 
     @Override
-    public void onFadingViewVisibilityChanged(boolean visible) {
+    public void onScrimVisibilityChanged(boolean visible) {
         Activity activity = mWindowAndroid.getActivity().get();
         if (!(activity instanceof ChromeActivity)) return;
         ChromeActivity chromeActivity = (ChromeActivity) activity;
 
         if (visible) {
-            chromeActivity.addViewObscuringAllTabs(mFadingView);
+            chromeActivity.addViewObscuringAllTabs(mScrim);
         } else {
-            chromeActivity.removeViewObscuringAllTabs(mFadingView);
+            chromeActivity.removeViewObscuringAllTabs(mScrim);
             updateOmniboxResultsContainerVisibility(false);
         }
     }
 
     @Override
-    public void setScrim(FadingBackgroundView scrim) {
-        mFadingView = scrim;
+    public void setScrim(ScrimView scrim) {
+        mScrim = scrim;
 
         // In some cases, users can start chrome and immediately start tapping the omnibox. In that
         // case, the omnibox will focus, but there is no scrim. This checks if the scrim needs to
@@ -2034,16 +2033,16 @@ public class LocationBarLayout
      *                        scrim.
      */
     protected void updateFadingBackgroundView(boolean visible, boolean ignoreNtpChecks) {
-        if (mFadingView == null) return;
+        if (mScrim == null) return;
         NewTabPage ntp = mToolbarDataProvider.getNewTabPageForCurrentTab();
         boolean locationBarShownInNTP = ntp != null && ntp.isLocationBarShownInNTP();
 
         if (visible && (!locationBarShownInNTP || ignoreNtpChecks)) {
             // If the location bar is shown in the NTP, the toolbar will eventually trigger a
             // fade in.
-            mFadingView.showFadingOverlay(mScrimParams);
+            mScrim.showScrim(mScrimParams);
         } else {
-            mFadingView.hideFadingOverlay(!locationBarShownInNTP);
+            mScrim.hideScrim(!locationBarShownInNTP);
         }
     }
 

chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java

@@ -54,7 +54,7 @@ import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.util.AccessibilityUtil;
 import org.chromium.chrome.browser.util.ColorUtils;
 import org.chromium.chrome.browser.util.FeatureUtilities;
-import org.chromium.chrome.browser.widget.FadingBackgroundView;
+import org.chromium.chrome.browser.widget.ScrimView;
 import org.chromium.chrome.browser.widget.TintedDrawable;
 import org.chromium.chrome.browser.widget.TintedImageButton;
 import org.chromium.components.url_formatter.UrlFormatter;
@@ -823,5 +823,5 @@ public class CustomTabToolbar extends ToolbarLayout implements LocationBar,
     }
 
     @Override
-    public void setScrim(FadingBackgroundView scrim) {}
+    public void setScrim(ScrimView scrim) {}
 }

chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar.java

@@ -8,7 +8,7 @@ import android.graphics.Rect;
 import android.view.View;
 
 import org.chromium.chrome.browser.compositor.layouts.LayoutUpdateHost;
-import org.chromium.chrome.browser.widget.FadingBackgroundView;
+import org.chromium.chrome.browser.widget.ScrimView;
 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet;
 
 /**
@@ -116,5 +116,5 @@ public interface Toolbar {
     /**
      * @param scrim The scrim for this location bar to use.
      */
-    void setScrim(FadingBackgroundView scrim);
+    void setScrim(ScrimView scrim);
 }

chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java

@@ -40,8 +40,8 @@ import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.util.ViewUtils;
-import org.chromium.chrome.browser.widget.FadingBackgroundView;
 import org.chromium.chrome.browser.widget.PulseDrawable;
+import org.chromium.chrome.browser.widget.ScrimView;
 import org.chromium.chrome.browser.widget.TintedImageButton;
 import org.chromium.chrome.browser.widget.ToolbarProgressBar;
 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet;
@@ -981,7 +981,7 @@ public abstract class ToolbarLayout extends FrameLayout implements Toolbar {
     }
 
     @Override
-    public void setScrim(FadingBackgroundView scrim) {
+    public void setScrim(ScrimView scrim) {
         getLocationBar().setScrim(scrim);
     }
 }

chrome/android/java/src/org/chromium/chrome/browser/widget/FadingBackgroundView.java → chrome/android/java/src/org/chromium/chrome/browser/widget/ScrimView.java

@@ -27,12 +27,12 @@ import javax.annotation.Nullable;
  *
  * If the view is disabled, then its alpha will be set to 0f and it will not receive touch events.
  *
- * To use the scrim, {@link #showFadingOverlay(ScrimParams)} must be called to set the params for
- * how the scrimm will behave. After that, users can either allow the default animation to run or
+ * To use the scrim, {@link #showScrim(ScrimParams)} must be called to set the params for
+ * how the scrim will behave. After that, users can either allow the default animation to run or
  * change the view's alpha manually using {@link #setViewAlpha(float)}. Once the scrim is done being
- * used, {@link #hideFadingOverlay(boolean)} should be called.
+ * used, {@link #hideScrim(boolean)} should be called.
  */
-public class FadingBackgroundView extends View implements View.OnClickListener {
+public class ScrimView extends View implements View.OnClickListener {
     /** Params that define the behavior of the scrim for a single user. */
     public static class ScrimParams {
         /**
@@ -51,7 +51,7 @@ public class FadingBackgroundView extends View implements View.OnClickListener {
         public final boolean showInFrontOfAnchorView;
 
         /** An observer for visibility and input related events. */
-        public final FadingViewObserver observer;
+        public final ScrimObserver observer;
 
         /**
          * Build a new set of params to control the scrim.
@@ -63,7 +63,7 @@ public class FadingBackgroundView extends View implements View.OnClickListener {
          * @param observer n observer for visibility and input related events.
          */
         public ScrimParams(View anchorView, boolean showInFrontOfAnchorView,
-                boolean affectsStatusBar, int topMargin, FadingViewObserver observer) {
+                boolean affectsStatusBar, int topMargin, ScrimObserver observer) {
             this.topMargin = topMargin;
             this.affectsStatusBar = affectsStatusBar;
             this.anchorView = anchorView;
@@ -89,18 +89,18 @@ public class FadingBackgroundView extends View implements View.OnClickListener {
     /**
      * An interface for listening to events on the fading view.
      */
-    public interface FadingViewObserver {
+    public interface ScrimObserver {
         /**
          * An event that triggers when the view is clicked.
          */
-        void onFadingViewClick();
+        void onScrimClick();
 
         /**
          * An event that triggers when the visibility of the overlay has changed. Visibility is true
          * if the overlay's opacity is > 0f.
          * @param visible True if the overlay has become visible.
          */
-        void onFadingViewVisibilityChanged(boolean visible);
+        void onScrimVisibilityChanged(boolean visible);
     }
 
     /** The duration for the fading animation. */
@@ -129,7 +129,7 @@ public class FadingBackgroundView extends View implements View.OnClickListener {
      * @param scrimDelegate A means of changing the scrim over the status bar.
      * @param parent The {@link ViewGroup} the scrim should exist in.
      */
-    public FadingBackgroundView(
+    public ScrimView(
             Context context, @Nullable StatusBarScrimDelegate scrimDelegate, ViewGroup parent) {
         super(context);
         mStatusBarScrimDelegate = scrimDelegate;
@@ -170,7 +170,7 @@ public class FadingBackgroundView extends View implements View.OnClickListener {
      * @param alpha The desired alpha for this view.
      */
     public void setViewAlpha(float alpha) {
-        assert mActiveParams != null : "#showFadingOverlay must be called before setting alpha!";
+        assert mActiveParams != null : "#showScrim must be called before setting alpha!";
 
         if (!isEnabled() || MathUtils.areFloatsEqual(alpha, getAlpha())) return;
 
@@ -221,26 +221,25 @@ public class FadingBackgroundView extends View implements View.OnClickListener {
     /**
      * Triggers a fade in of the omnibox results background creating a new animation if necessary.
      */
-    public void showFadingOverlay(ScrimParams params) {
+    public void showScrim(ScrimParams params) {
         onParamsChanged(params);
         setVisibility(View.VISIBLE);
         if (mActiveParams.observer != null) {
-            mActiveParams.observer.onFadingViewVisibilityChanged(true);
+            mActiveParams.observer.onScrimVisibilityChanged(true);
         }
         if (mOverlayFadeInAnimator == null) {
             mOverlayFadeInAnimator = ObjectAnimator.ofFloat(this, ALPHA, 1f);
             mOverlayFadeInAnimator.setDuration(FADE_DURATION_MS);
-            mOverlayFadeInAnimator.setInterpolator(
-                    BakedBezierInterpolator.FADE_IN_CURVE);
+            mOverlayFadeInAnimator.setInterpolator(BakedBezierInterpolator.FADE_IN_CURVE);
         }
 
-        runFadeOverlayAnimation(mOverlayFadeInAnimator);
+        runFadeAnimation(mOverlayFadeInAnimator);
     }
 
     /**
      * Triggers a fade out of the omnibox results background creating a new animation if necessary.
      */
-    public void hideFadingOverlay(boolean fadeOut) {
+    public void hideScrim(boolean fadeOut) {
         if (mOverlayFadeOutAnimator == null) {
             mOverlayFadeOutAnimator = ObjectAnimator.ofFloat(this, ALPHA, 0f);
             mOverlayFadeOutAnimator.setDuration(FADE_DURATION_MS);
@@ -250,7 +249,7 @@ public class FadingBackgroundView extends View implements View.OnClickListener {
                 public void onAnimationEnd(Animator animation) {
                     setVisibility(View.GONE);
                     if (mActiveParams != null && mActiveParams.observer != null) {
-                        mActiveParams.observer.onFadingViewVisibilityChanged(false);
+                        mActiveParams.observer.onScrimVisibilityChanged(false);
                     }
                     onParamsChanged(null);
                 }
@@ -258,7 +257,7 @@ public class FadingBackgroundView extends View implements View.OnClickListener {
         }
 
         mOverlayFadeOutAnimator.setFloatValues(getAlpha(), 0f);
-        runFadeOverlayAnimation(mOverlayFadeOutAnimator);
+        runFadeAnimation(mOverlayFadeOutAnimator);
         if (!fadeOut) mOverlayFadeOutAnimator.end();
     }
 
@@ -266,7 +265,7 @@ public class FadingBackgroundView extends View implements View.OnClickListener {
      * Runs an animation for this view. If one is running, the existing one will be canceled.
      * @param fadeAnimation The animation to run.
      */
-    private void runFadeOverlayAnimation(Animator fadeAnimation) {
+    private void runFadeAnimation(Animator fadeAnimation) {
         if (mOverlayAnimator == fadeAnimation && mOverlayAnimator.isRunning()) {
             return;
         } else if (mOverlayAnimator != null) {
@@ -279,6 +278,6 @@ public class FadingBackgroundView extends View implements View.OnClickListener {
     @Override
     public void onClick(View view) {
         if (mActiveParams == null || mActiveParams.observer == null) return;
-        mActiveParams.observer.onFadingViewClick();
+        mActiveParams.observer.onScrimClick();
     }
 }

chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheetController.java

@@ -26,9 +26,9 @@ import org.chromium.chrome.browser.tabmodel.TabModelObserver;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.tabmodel.TabModelSelectorObserver;
 import org.chromium.chrome.browser.tabmodel.TabModelSelectorTabObserver;
-import org.chromium.chrome.browser.widget.FadingBackgroundView;
-import org.chromium.chrome.browser.widget.FadingBackgroundView.FadingViewObserver;
-import org.chromium.chrome.browser.widget.FadingBackgroundView.ScrimParams;
+import org.chromium.chrome.browser.widget.ScrimView;
+import org.chromium.chrome.browser.widget.ScrimView.ScrimObserver;
+import org.chromium.chrome.browser.widget.ScrimView.ScrimParams;
 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet.BottomSheetContent;
 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet.StateChangeReason;
 
@@ -82,12 +82,12 @@ public class BottomSheetController implements ApplicationStatus.ActivityStateLis
      * Build a new controller of the bottom sheet.
      * @param tabModelSelector A tab model selector to track events on tabs open in the browser.
      * @param layoutManager A layout manager for detecting changes in the active layout.
-     * @param fadingBackgroundView The scrim that shows when the bottom sheet is opened.
+     * @param scrim The scrim that shows when the bottom sheet is opened.
      * @param contextualSearchManager The manager for Contextual Search to attach listeners to.
      * @param bottomSheet The bottom sheet that this class will be controlling.
      */
     public BottomSheetController(final Activity activity, final TabModelSelector tabModelSelector,
-            final LayoutManager layoutManager, final FadingBackgroundView fadingBackgroundView,
+            final LayoutManager layoutManager, final ScrimView scrim,
             ContextualSearchManager contextualSearchManager, BottomSheet bottomSheet) {
         mBottomSheet = bottomSheet;
         mLayoutManager = layoutManager;
@@ -160,36 +160,36 @@ public class BottomSheetController implements ApplicationStatus.ActivityStateLis
             }
         });
 
-        FadingViewObserver scrimObserver = new FadingViewObserver() {
+        ScrimObserver scrimObserver = new ScrimObserver() {
             @Override
-            public void onFadingViewClick() {
+            public void onScrimClick() {
                 if (!mBottomSheet.isSheetOpen()) return;
                 mBottomSheet.setSheetState(
                         BottomSheet.SHEET_STATE_PEEK, true, StateChangeReason.TAP_SCRIM);
             }
 
             @Override
-            public void onFadingViewVisibilityChanged(boolean visible) {}
+            public void onScrimVisibilityChanged(boolean visible) {}
         };
         mScrimParams = new ScrimParams(mBottomSheet, false, true, 0, scrimObserver);
 
         mBottomSheet.addObserver(new EmptyBottomSheetObserver() {
             @Override
             public void onSheetOpened(@StateChangeReason int reason) {
-                fadingBackgroundView.showFadingOverlay(mScrimParams);
-                fadingBackgroundView.setViewAlpha(0);
+                scrim.showScrim(mScrimParams);
+                scrim.setViewAlpha(0);
             }
 
             @Override
             public void onSheetClosed(@StateChangeReason int reason) {
-                fadingBackgroundView.hideFadingOverlay(false);
+                scrim.hideScrim(false);
             }
 
             @Override
             public void onTransitionPeekToHalf(float transitionFraction) {
                 // TODO(mdjones): This event should not occur after the bottom sheet is closed.
-                if (fadingBackgroundView.getVisibility() == View.VISIBLE) {
-                    fadingBackgroundView.setViewAlpha(transitionFraction);
+                if (scrim.getVisibility() == View.VISIBLE) {
+                    scrim.setViewAlpha(transitionFraction);
                 }
             }
 

chrome/android/java_sources.gni

@@ -1498,7 +1498,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/widget/DateDividedAdapter.java",
   "java/src/org/chromium/chrome/browser/widget/DualControlLayout.java",
   "java/src/org/chromium/chrome/browser/widget/EmptyAlertEditText.java",
-  "java/src/org/chromium/chrome/browser/widget/FadingBackgroundView.java",
   "java/src/org/chromium/chrome/browser/widget/FadingEdgeScrollView.java",
   "java/src/org/chromium/chrome/browser/widget/FadingShadow.java",
   "java/src/org/chromium/chrome/browser/widget/FadingShadowView.java",
@@ -1518,6 +1517,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/widget/RadioButtonLayout.java",
   "java/src/org/chromium/chrome/browser/widget/RadioButtonWithDescription.java",
   "java/src/org/chromium/chrome/browser/widget/RoundedIconGenerator.java",
+  "java/src/org/chromium/chrome/browser/widget/ScrimView.java",
   "java/src/org/chromium/chrome/browser/widget/TextViewWithCompoundDrawables.java",
   "java/src/org/chromium/chrome/browser/widget/ThumbnailDiskStorage.java",
   "java/src/org/chromium/chrome/browser/widget/ThumbnailGenerator.java",

chrome/android/javatests/src/org/chromium/chrome/browser/widget/ScrimTest.java

@@ -28,8 +28,8 @@ import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.ChromeTabbedActivity;
 import org.chromium.chrome.browser.omnibox.UrlBar;
 import org.chromium.chrome.browser.util.MathUtils;
-import org.chromium.chrome.browser.widget.FadingBackgroundView.FadingViewObserver;
-import org.chromium.chrome.browser.widget.FadingBackgroundView.ScrimParams;
+import org.chromium.chrome.browser.widget.ScrimView.ScrimObserver;
+import org.chromium.chrome.browser.widget.ScrimView.ScrimParams;
 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet;
 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheetController;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
@@ -52,7 +52,7 @@ public class ScrimTest {
 
     private BottomSheet mBottomSheet;
     private BottomSheetController mSheetController;
-    private FadingBackgroundView mScrim;
+    private ScrimView mScrim;
 
     @Before
     public void setUp() throws Exception {
@@ -67,7 +67,7 @@ public class ScrimTest {
                                    .findViewById(org.chromium.chrome.R.id.bottom_sheet);
             mBottomSheet.init(coordinator, activity);
 
-            mScrim = activity.getFadingBackgroundView();
+            mScrim = activity.getScrim();
 
             mSheetController = new BottomSheetController(activity, activity.getTabModelSelector(),
                     activity.getCompositorViewHolder().getLayoutManager(), mScrim,
@@ -80,12 +80,12 @@ public class ScrimTest {
     @Feature({"Scrim"})
     public void testScrimVisibility() throws InterruptedException, TimeoutException {
         CallbackHelper visibilityHelper = new CallbackHelper();
-        FadingViewObserver observer = new FadingViewObserver() {
+        ScrimObserver observer = new ScrimObserver() {
             @Override
-            public void onFadingViewClick() {}
+            public void onScrimClick() {}
 
             @Override
-            public void onFadingViewVisibilityChanged(boolean visible) {
+            public void onScrimVisibilityChanged(boolean visible) {
                 visibilityHelper.notifyCalled();
             }
         };
@@ -96,7 +96,7 @@ public class ScrimTest {
 
         int callCount = visibilityHelper.getCallCount();
         ThreadUtils.runOnUiThreadBlocking(() -> {
-            mScrim.showFadingOverlay(params);
+            mScrim.showScrim(params);
             // Skip the animation and set the scrim opacity to 50%.
             mScrim.setViewAlpha(0.5f);
         });
@@ -104,7 +104,7 @@ public class ScrimTest {
         assertScrimVisibility(true);
 
         callCount = visibilityHelper.getCallCount();
-        ThreadUtils.runOnUiThreadBlocking(() -> mScrim.hideFadingOverlay(false));
+        ThreadUtils.runOnUiThreadBlocking(() -> mScrim.hideScrim(false));
         visibilityHelper.waitForCallback(callCount, 1);
         assertScrimVisibility(false);
     }

chrome/android/javatests/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheetControllerTest.java

@@ -28,7 +28,7 @@ import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.EmptyTabModelObserver;
 import org.chromium.chrome.browser.tabmodel.TabModel;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabSelectionType;
-import org.chromium.chrome.browser.widget.FadingBackgroundView;
+import org.chromium.chrome.browser.widget.ScrimView;
 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet.BottomSheetContent;
 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet.ContentPriority;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
@@ -69,8 +69,7 @@ public class BottomSheetControllerTest {
                                    .findViewById(org.chromium.chrome.R.id.bottom_sheet);
             mBottomSheet.init(coordinator, activity);
 
-            FadingBackgroundView scrim =
-                    new FadingBackgroundView(mActivityTestRule.getActivity(), null, coordinator);
+            ScrimView scrim = new ScrimView(mActivityTestRule.getActivity(), null, coordinator);
 
             mSheetController = new BottomSheetController(activity, activity.getTabModelSelector(),
                     activity.getCompositorViewHolder().getLayoutManager(), scrim,