| Index: chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java b/chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java
|
| index 58902cb15d127a7d1fe3b0cd4dab19e187007069..36c00f1ace85940fdb8f9db56d4abf4810ff62e7 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java
|
| @@ -32,6 +32,7 @@ import org.chromium.base.VisibleForTesting;
|
| import org.chromium.chrome.R;
|
| import org.chromium.chrome.browser.NativePageHost;
|
| import org.chromium.chrome.browser.TabLoadStatus;
|
| +import org.chromium.chrome.browser.firstrun.FirstRunStatus;
|
| import org.chromium.chrome.browser.fullscreen.ChromeFullscreenManager;
|
| import org.chromium.chrome.browser.ntp.NativePageFactory;
|
| import org.chromium.chrome.browser.ntp.NewTabPage;
|
| @@ -1107,7 +1108,9 @@ public class BottomSheet
|
| assert mHasRootLayoutOccurred && mTabModelSelector != null
|
| && mTabModelSelector.isTabStateInitialized();
|
|
|
| - if (mCurrentState != SHEET_STATE_PEEK) return;
|
| + // If FRE is not complete, the FRE screen is likely covering ChromeTabbedActivity so the
|
| + // help bubble should not be shown. Also skip showing if the bottom sheet is already open.
|
| + if (!FirstRunStatus.getFirstRunFlowComplete() || mCurrentState != SHEET_STATE_PEEK) return;
|
|
|
| SharedPreferences preferences = ContextUtils.getAppSharedPreferences();
|
| if (preferences.getBoolean(BOTTOM_SHEET_HELP_BUBBLE_SHOWN, false)) return;
|
|
|