summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Shimeng (Simon) Wang <swang@google.com> 2010-09-10 09:39:34 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2010-09-10 09:39:34 -0700
commit610d92f4c9d4552365581b02f3fa7a2f7d388f13 (patch)
tree2dce070cce48bbce1706e5fd2ca93fcbf554f727
parent94b19d37066a7739991bc73381f9296abad69265 (diff)
parent6c09ef01da0721ee9c49d96bd0c260bb9d9b4f15 (diff)
Merge "Use the default scale for text input."
-rw-r--r--core/java/android/webkit/WebView.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index b83edc77d064..6d0e61931a7b 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -3674,10 +3674,10 @@ public class WebView extends AbsoluteLayout
getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
// bring it back to the reading level scale so that user can enter text
- boolean zoom = mZoomManager.getScale() < mZoomManager.getReadingLevelScale();
+ boolean zoom = mZoomManager.getScale() < mZoomManager.getDefaultScale();
if (zoom) {
mZoomManager.setZoomCenter(mLastTouchX, mLastTouchY);
- mZoomManager.setZoomScale(mZoomManager.getReadingLevelScale(), false);
+ mZoomManager.setZoomScale(mZoomManager.getDefaultScale(), false);
}
if (isTextView) {
rebuildWebTextView();