Commit 8b61a106 authored by Christian Dullweber's avatar Christian Dullweber Committed by Commit Bot

Revert "Animate PageInfo height changes"

This reverts commit cdf050f6.

Reason for revert: The transition doesn't yet look right and is causing some crashes (crbug.com/1147794)

Original change's description:
> Animate PageInfo height changes
>
> Create a transition to animate changes in height when switching between
> PageInfo subpages.
>
> Video: https://crbug.com/1077766#c92
> Bug: 1077766
> Change-Id: I5fb7392db017951e80cce162d11e17240b3eacd0
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2517454
> Commit-Queue: Christian Dullweber <dullweber@chromium.org>
> Reviewed-by: Ehimare Okoyomon <eokoyomon@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#825285}

TBR=dullweber@chromium.org,eokoyomon@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 1077766, 1147794
Change-Id: Ie5b554f3ff3bcc6a728cda79a4ca1728e2bc9b52
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2531784Reviewed-by: default avatarChristian Dullweber <dullweber@chromium.org>
Commit-Queue: Christian Dullweber <dullweber@chromium.org>
Cr-Commit-Position: refs/heads/master@{#826265}
parent 718004ca
...@@ -42,7 +42,6 @@ public class PageInfoContainer extends FrameLayout { ...@@ -42,7 +42,6 @@ public class PageInfoContainer extends FrameLayout {
public Runnable urlTitleClickCallback; public Runnable urlTitleClickCallback;
public Runnable urlTitleLongClickCallback; public Runnable urlTitleLongClickCallback;
public Runnable backButtonClickCallback; public Runnable backButtonClickCallback;
public Runnable beginHeightChangeAnimationCallback;
} }
private PageInfoView.ElidedUrlTextView mExpandedUrlTitle; private PageInfoView.ElidedUrlTextView mExpandedUrlTitle;
private TextView mTruncatedUrlTitle; private TextView mTruncatedUrlTitle;
...@@ -55,8 +54,6 @@ public class PageInfoContainer extends FrameLayout { ...@@ -55,8 +54,6 @@ public class PageInfoContainer extends FrameLayout {
private final View mSubpageHeader; private final View mSubpageHeader;
private final TextView mSubpageTitle; private final TextView mSubpageTitle;
private Runnable mBeginHeightChangeAnimationCallback;
public PageInfoContainer(Context context) { public PageInfoContainer(Context context) {
super(context); super(context);
LayoutInflater.from(context).inflate(R.layout.page_info_container, this, true); LayoutInflater.from(context).inflate(R.layout.page_info_container, this, true);
...@@ -91,8 +88,6 @@ public class PageInfoContainer extends FrameLayout { ...@@ -91,8 +88,6 @@ public class PageInfoContainer extends FrameLayout {
ChromeImageButton backButton = findViewById(R.id.subpage_back_button); ChromeImageButton backButton = findViewById(R.id.subpage_back_button);
backButton.setOnClickListener(v -> params.backButtonClickCallback.run()); backButton.setOnClickListener(v -> params.backButtonClickCallback.run());
mBeginHeightChangeAnimationCallback = params.beginHeightChangeAnimationCallback;
} }
private void initializeUrlView(View view, Params params) { private void initializeUrlView(View view, Params params) {
...@@ -126,16 +121,13 @@ public class PageInfoContainer extends FrameLayout { ...@@ -126,16 +121,13 @@ public class PageInfoContainer extends FrameLayout {
replaceContentView(view, subPageTitle); replaceContentView(view, subPageTitle);
return; return;
} }
// Create "fade-through" animation. // Create "fade-through" animation.
// TODO(crbug.com/1077766): Animate height change and set correct interpolator.
mWrapper.animate() mWrapper.animate()
.setDuration(sOutDuration) .setDuration(sOutDuration)
.alpha(0) .alpha(0)
.setInterpolator(new AccelerateInterpolator()) .setInterpolator(new AccelerateInterpolator())
.withEndAction(() -> { .withEndAction(() -> {
if (mBeginHeightChangeAnimationCallback != null) {
mBeginHeightChangeAnimationCallback.run();
}
replaceContentView(view, subPageTitle); replaceContentView(view, subPageTitle);
mWrapper.setScaleX(sScale); mWrapper.setScaleX(sScale);
mWrapper.setScaleY(sScale); mWrapper.setScaleY(sScale);
......
...@@ -265,8 +265,6 @@ public class PageInfoController implements PageInfoMainController, ModalDialogPr ...@@ -265,8 +265,6 @@ public class PageInfoController implements PageInfoMainController, ModalDialogPr
containerParams.urlTitleShown = viewParams.urlTitleShown; containerParams.urlTitleShown = viewParams.urlTitleShown;
containerParams.previewUIShown = viewParams.previewUIShown; containerParams.previewUIShown = viewParams.previewUIShown;
containerParams.previewUIIcon = mDelegate.getPreviewUiIcon(); containerParams.previewUIIcon = mDelegate.getPreviewUiIcon();
containerParams.beginHeightChangeAnimationCallback =
() -> mDialog.beginHeightChangeTransition();
mContainer.setParams(containerParams); mContainer.setParams(containerParams);
mDelegate.getFavicon(mFullUrl, favicon -> { mDelegate.getFavicon(mFullUrl, favicon -> {
if (favicon != null) { if (favicon != null) {
......
...@@ -13,15 +13,10 @@ import android.content.Context; ...@@ -13,15 +13,10 @@ import android.content.Context;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.transition.ChangeBounds;
import android.transition.Transition;
import android.transition.TransitionManager;
import android.transition.TransitionSet;
import android.view.Gravity; import android.view.Gravity;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.Window; import android.view.Window;
import android.view.animation.DecelerateInterpolator;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
...@@ -270,34 +265,4 @@ public class PageInfoDialog { ...@@ -270,34 +265,4 @@ public class PageInfoDialog {
mCurrentAnimation = allAnimations; mCurrentAnimation = allAnimations;
return allAnimations; return allAnimations;
} }
public void beginHeightChangeTransition() {
// Set minimum height for scrollView parent to avoid scrollView getting clipped.
((ViewGroup) mScrollView.getParent()).setMinimumHeight(mScrollView.getHeight());
Transition transition = new ChangeBounds()
.setDuration(PageInfoContainer.sInDuration)
.addTarget(mScrollView)
.setInterpolator(new DecelerateInterpolator());
TransitionManager.beginDelayedTransition(mScrollView,
new TransitionSet()
.addTransition(transition)
.addListener(new Transition.TransitionListener() {
@Override
public void onTransitionStart(Transition transition) {}
@Override
public void onTransitionEnd(Transition transition) {
((ViewGroup) mScrollView.getParent()).setMinimumHeight(0);
}
@Override
public void onTransitionCancel(Transition transition) {}
@Override
public void onTransitionPause(Transition transition) {}
@Override
public void onTransitionResume(Transition transition) {}
}));
}
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment