diff options
| author | Ben Murdoch <benm@google.com> | 2014-11-13 00:09:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-13 00:09:56 +0000 |
| commit | 67ded3db54041dac753358d5da7f6fada2865107 (patch) | |
| tree | e7bcf19af648b5aa4faed1a9c13ae99928a24c06 | |
| parent | ef4037479e29143436d95f956f0f0be90459a420 (diff) | |
| parent | f66cc3b6f091903a97b577e413da0c2acd80d3b7 (diff) | |
| download | chromium_org-67ded3db54041dac753358d5da7f6fada2865107.tar.gz | |
Merge "Cherry pick [Android] Support unfocusable container views." into m39
| -rw-r--r-- | content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java index dc18f6e950..001238487c 100644 --- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java +++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java @@ -2333,7 +2333,10 @@ public class ContentViewCore * @see View#hasFocus() */ @CalledByNative - public boolean hasFocus() { + private boolean hasFocus() { + // If the container view is not focusable, we consider it always focused from + // Chromium's point of view. + if (!mContainerView.isFocusable()) return true; return mContainerView.hasFocus(); } |