| Index: chrome/android/java/src/org/chromium/chrome/browser/snackbar/SnackbarView.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/snackbar/SnackbarView.java b/chrome/android/java/src/org/chromium/chrome/browser/snackbar/SnackbarView.java
|
| index 9858e766f425f1bc98e3bd6bfe52b163d6f90662..eb0cd7362ee17a460bd9cb8c76f8860d9a0a2c3f 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/snackbar/SnackbarView.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/snackbar/SnackbarView.java
|
| @@ -13,14 +13,15 @@ import android.graphics.Bitmap;
|
| import android.graphics.Rect;
|
| import android.graphics.drawable.GradientDrawable;
|
| import android.support.annotation.Nullable;
|
| +import android.view.Gravity;
|
| import android.view.LayoutInflater;
|
| import android.view.SurfaceView;
|
| import android.view.View;
|
| import android.view.View.OnClickListener;
|
| import android.view.View.OnLayoutChangeListener;
|
| import android.view.ViewGroup;
|
| -import android.view.ViewGroup.MarginLayoutParams;
|
| import android.view.animation.DecelerateInterpolator;
|
| +import android.widget.FrameLayout;
|
| import android.widget.ImageView;
|
| import android.widget.TextView;
|
|
|
| @@ -144,16 +145,15 @@ class SnackbarView {
|
|
|
| int keyboardHeight = mParent.getHeight() - mCurrentVisibleRect.bottom
|
| + mCurrentVisibleRect.top;
|
| - MarginLayoutParams lp = getLayoutParams();
|
| + FrameLayout.LayoutParams lp = getLayoutParams();
|
| lp.bottomMargin = keyboardHeight;
|
| if (mIsTablet) {
|
| int margin = mParent.getResources()
|
| .getDimensionPixelSize(R.dimen.snackbar_margin_tablet);
|
| - ApiCompatibilityUtils.setMarginStart(lp, margin);
|
| - lp.bottomMargin += margin;
|
| int width = mParent.getResources()
|
| .getDimensionPixelSize(R.dimen.snackbar_width_tablet);
|
| lp.width = Math.min(width, mParent.getWidth() - 2 * margin);
|
| + lp.gravity = Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM;
|
| }
|
| mView.setLayoutParams(lp);
|
| }
|
| @@ -267,8 +267,8 @@ class SnackbarView {
|
| }
|
| }
|
|
|
| - private MarginLayoutParams getLayoutParams() {
|
| - return (MarginLayoutParams) mView.getLayoutParams();
|
| + private FrameLayout.LayoutParams getLayoutParams() {
|
| + return (FrameLayout.LayoutParams) mView.getLayoutParams();
|
| }
|
|
|
| private void setViewText(TextView view, CharSequence text, boolean animate) {
|
|
|