Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3218)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/stack/Stack.java

Issue 2761273004: [Home] Improve exit tab switcher animation (Closed)
Patch Set: rebase Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/stack/Stack.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/stack/Stack.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/stack/Stack.java
index e72367c356ab9f290cfd94e1c04d2932e83da94d..b10b91572fe7326b6baede1e9a8cded7e35ae199 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/stack/Stack.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/stack/Stack.java
@@ -1956,7 +1956,7 @@ public class Stack {
if (tab.getId() == tabId) {
tab.setDiscardAmount(getDiscardRange());
tab.setDying(false);
- tab.getLayoutTab().setMaxContentHeight(mLayout.getHeightMinusBrowserControls());
+ tab.getLayoutTab().setMaxContentHeight(getMaxTabHeight());
}
}
@@ -2269,6 +2269,16 @@ public class Stack {
}
/**
+ * @return The maximum height of a layout tab in the tab switcher.
+ */
+ public float getMaxTabHeight() {
+ if (FeatureUtilities.isChromeHomeEnabled() && mCurrentMode == Orientation.PORTRAIT) {
+ return mLayout.getHeight();
+ }
+ return mLayout.getHeightMinusBrowserControls();
+ }
+
+ /**
* Computes the scale of the tab based on its discard status.
*
* @param amount The discard amount.
@@ -2302,19 +2312,18 @@ public class Stack {
mDiscardDirection = getDefaultDiscardDirection();
setWarpState(true, false);
final float opaqueTopPadding = mBorderTopPadding - mBorderTransparentTop;
- mAnimationFactory = StackAnimation.createAnimationFactory(mLayout.getWidth(),
+ mAnimationFactory = StackAnimation.createAnimationFactory(this, mLayout.getWidth(),
mLayout.getHeight(), mLayout.getHeightMinusBrowserControls(), mBorderTopPadding,
opaqueTopPadding, mBorderLeftPadding, mCurrentMode);
float dpToPx = mLayout.getContext().getResources().getDisplayMetrics().density;
mViewAnimationFactory = new StackViewAnimation(dpToPx, mLayout.getWidth());
if (mStackTabs == null) return;
float width = mLayout.getWidth();
- float height = mLayout.getHeightMinusBrowserControls();
for (int i = 0; i < mStackTabs.length; i++) {
LayoutTab tab = mStackTabs[i].getLayoutTab();
if (tab == null) continue;
tab.setMaxContentWidth(width);
- tab.setMaxContentHeight(height);
+ tab.setMaxContentHeight(getMaxTabHeight());
}
}

Powered by Google App Engine
This is Rietveld 408576698