From c27d9b5341b29c1b58c882f0a04b4c519d8a9853 Mon Sep 17 00:00:00 2001 From: Daisuke Miyakawa Date: Mon, 25 May 2009 16:57:15 +0900 Subject: [PATCH 1/2] Manual merge from cupcake_dcm. internal CL#148693. Two donottranslate.xml-s are already submitted. --- core/java/android/webkit/WebSettings.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java index 105eacdca7544..dcba94348a990 100644 --- a/core/java/android/webkit/WebSettings.java +++ b/core/java/android/webkit/WebSettings.java @@ -123,7 +123,7 @@ public class WebSettings { private String mSerifFontFamily = "serif"; private String mCursiveFontFamily = "cursive"; private String mFantasyFontFamily = "fantasy"; - private String mDefaultTextEncoding = "Latin-1"; + private String mDefaultTextEncoding; private String mUserAgent; private boolean mUseDefaultUserAgent; private String mAcceptLanguage; @@ -240,6 +240,8 @@ public class WebSettings { WebSettings(Context context) { mEventHandler = new EventHandler(); mContext = context; + mDefaultTextEncoding = context.getString(com.android.internal. + R.string.default_text_encoding); if (sLockForLocaleSettings == null) { sLockForLocaleSettings = new Object(); From ff686ce11e952a9001b1384d8e7d82127b0529a2 Mon Sep 17 00:00:00 2001 From: Romain Guy Date: Mon, 25 May 2009 01:33:00 -0700 Subject: [PATCH 2/2] Change when gestures listeners are fired. --- .../android/gesture/GestureOverlayView.java | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/core/java/android/gesture/GestureOverlayView.java b/core/java/android/gesture/GestureOverlayView.java index 012c01fb3d92e..3476e4d6bac61 100755 --- a/core/java/android/gesture/GestureOverlayView.java +++ b/core/java/android/gesture/GestureOverlayView.java @@ -434,13 +434,6 @@ public class GestureOverlayView extends FrameLayout { private void touchStart(MotionEvent event) { mIsListeningForGestures = true; - // pass the event to handlers - final ArrayList listeners = mOnGestureListeners; - final int count = listeners.size(); - for (int i = 0; i < count; i++) { - listeners.get(i).onGestureStarted(this, event); - } - float x = event.getX(); float y = event.getY(); @@ -480,6 +473,13 @@ public class GestureOverlayView extends FrameLayout { mCurveEndX = x; mCurveEndY = y; + + // pass the event to handlers + final ArrayList listeners = mOnGestureListeners; + final int count = listeners.size(); + for (int i = 0; i < count; i++) { + listeners.get(i).onGestureStarted(this, event); + } } private Rect touchMove(MotionEvent event) { @@ -521,13 +521,6 @@ public class GestureOverlayView extends FrameLayout { mStrokeBuffer.add(new GesturePoint(x, y, event.getEventTime())); - // pass the event to handlers - final ArrayList listeners = mOnGestureListeners; - final int count = listeners.size(); - for (int i = 0; i < count; i++) { - listeners.get(i).onGesture(this, event); - } - if (mHandleGestureActions && !mIsGesturing) { mTotalLength += (float) Math.sqrt(dx * dx + dy * dy); @@ -549,6 +542,13 @@ public class GestureOverlayView extends FrameLayout { } } + // pass the event to handlers + final ArrayList listeners = mOnGestureListeners; + final int count = listeners.size(); + for (int i = 0; i < count; i++) { + listeners.get(i).onGesture(this, event); + } + return areaToRefresh; } @@ -557,6 +557,7 @@ public class GestureOverlayView extends FrameLayout { // add the stroke to the current gesture mCurrentGesture.addStroke(new GestureStroke(mStrokeBuffer)); + mStrokeBuffer.clear(); if (!cancel) { // pass the event to handlers @@ -581,7 +582,6 @@ public class GestureOverlayView extends FrameLayout { } mIsGesturing = false; - mStrokeBuffer.clear(); } private class FadeOutRunnable implements Runnable {