Index: chrome/android/java/src/org/chromium/chrome/browser/JavascriptAppModalDialog.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/JavascriptAppModalDialog.java b/chrome/android/java/src/org/chromium/chrome/browser/JavascriptAppModalDialog.java |
index 97a68d330ee3a1404db8d99c71f9504d6c8d4117..d93ea96758fd19f9c19edb70c855beceb257d116 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/JavascriptAppModalDialog.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/JavascriptAppModalDialog.java |
@@ -142,6 +142,21 @@ public class JavascriptAppModalDialog implements DialogInterface.OnClickListener |
layout.findViewById(R.id.js_modal_dialog_scroll_view).setVisibility(View.GONE); |
} else { |
((TextView) layout.findViewById(R.id.js_modal_dialog_message)).setText(mMessage); |
+ |
+ layout.findViewById(R.id.js_modal_dialog_message) |
+ .addOnLayoutChangeListener(new View.OnLayoutChangeListener() { |
+ @Override |
+ public void onLayoutChange(View v, int left, int top, int right, int bottom, |
+ int oldLeft, int oldTop, int oldRight, int oldBottom) { |
+ final View scrollView = |
+ layout.findViewById(R.id.js_modal_dialog_scroll_view); |
+ int messageHeight = bottom - top + scrollView.getPaddingTop() |
+ + scrollView.getPaddingBottom(); |
+ boolean isScrollable = scrollView.getHeight() < messageHeight; |
+ |
+ scrollView.setFocusable(isScrollable); |
+ } |
+ }); |
} |
} |