Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java |
index 5d620f9e6cb8e1d6b52c4302d6b310feddc2fa51..ba4e7ff96dc11d2f9d84266c822ce35fa5059ce6 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java |
@@ -589,7 +589,9 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode |
public void onStartWithNative() { |
super.onStartWithNative(); |
// If we don't have a current tab, show the overview mode. |
- if (getActivityTab() == null) mLayoutManager.showOverview(false); |
+ if (getActivityTab() == null && !mLayoutManager.overviewVisible()) { |
+ mLayoutManager.showOverview(false); |
+ } |
resetSavedInstanceState(); |
} |
@@ -652,6 +654,10 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode |
mLayoutManager = new LayoutManagerChromeTablet(compositorViewHolder); |
} else { |
mLayoutManager = new LayoutManagerChromePhone(compositorViewHolder); |
+ if (getBottomSheet() != null) { |
+ ((LayoutManagerChromePhone) mLayoutManager) |
+ .setForegroundTabAnimationDisabled(true); |
+ } |
} |
mLayoutManager.setEnableAnimations(DeviceClassManager.enableAnimations()); |
mLayoutManager.addOverviewModeObserver(this); |