diff options
| -rw-r--r-- | android_webview/javatests/src/org/chromium/android_webview/test/ContentViewZoomTest.java | 9 | ||||
| -rw-r--r-- | content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java | 3 |
2 files changed, 5 insertions, 7 deletions
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewZoomTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewZoomTest.java index e0da4d3..5634393 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewZoomTest.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewZoomTest.java @@ -14,7 +14,6 @@ import android.view.ViewConfiguration; import org.chromium.android_webview.AwContents; import org.chromium.android_webview.AwSettings; import org.chromium.base.ThreadUtils; -import org.chromium.base.test.util.DisabledTest; import org.chromium.base.test.util.Feature; import org.chromium.content.browser.ContentSettings; import org.chromium.content.browser.ContentViewCore; @@ -304,12 +303,8 @@ public class ContentViewZoomTest extends AwTestBase { assertEquals(View.GONE, zoomControls.getVisibility()); } - /** - * @SmallTest - * @Feature({"AndroidWebView"}) - * BUG 153523 - */ - @DisabledTest + @SmallTest + @Feature({"AndroidWebView"}) public void testZoomControlsOnOrientationChange() throws Throwable { AwSettings webSettings = getAwSettingsOnUiThread(mAwContents); webSettings.setUseWideViewPort(true); 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 9814ca3..d29f9daa 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 @@ -1324,6 +1324,9 @@ public class ContentViewCore implements MotionEventDelegate, NavigationClient { } setAccessibilityState(false); hidePopupDialog(); + if (mContentSettings != null && mContentSettings.supportZoom()) { + mZoomManager.dismissZoomPicker(); + } } /** |