| Index: chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarLayout.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarLayout.java
|
| index 312102d0c74ba6bdaa6dc9db44156bf6d2aa8107..3f149cd160749181aefefd63c9cc060c13c02f9b 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarLayout.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarLayout.java
|
| @@ -9,12 +9,14 @@ import android.content.res.Resources;
|
| import android.content.res.TypedArray;
|
| import android.graphics.Bitmap;
|
| import android.graphics.drawable.Drawable;
|
| +import android.os.Build;
|
| import android.support.annotation.Nullable;
|
| import android.text.SpannableString;
|
| import android.text.SpannableStringBuilder;
|
| import android.text.Spanned;
|
| import android.text.TextUtils;
|
| import android.util.TypedValue;
|
| +import android.view.PointerIcon;
|
| import android.view.View;
|
| import android.view.ViewGroup;
|
| import android.widget.Button;
|
| @@ -244,7 +246,11 @@ public final class InfoBarLayout extends ViewGroup implements View.OnClickListen
|
| R.dimen.infobar_margin_between_stacked_buttons));
|
|
|
| mButtonRowLayout.addView(primaryButton);
|
| - if (secondaryView != null) mButtonRowLayout.addView(secondaryView);
|
| + setPointerIconAsHand(primaryButton);
|
| + if (secondaryView != null) {
|
| + mButtonRowLayout.addView(secondaryView);
|
| + setPointerIconAsHand(secondaryView);
|
| + }
|
| }
|
|
|
| /**
|
| @@ -550,6 +556,15 @@ public final class InfoBarLayout extends ViewGroup implements View.OnClickListen
|
| closeButton.setContentDescription(context.getString(R.string.infobar_close));
|
| closeButton.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
|
|
|
| + setPointerIconAsHand(closeButton);
|
| +
|
| return closeButton;
|
| }
|
| +
|
| + private static void setPointerIconAsHand(View view) {
|
| + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
|
| + PointerIcon icon = PointerIcon.getSystemIcon(view.getContext(), PointerIcon.TYPE_HAND);
|
| + view.setPointerIcon(icon);
|
| + }
|
| + }
|
| }
|
|
|