Bug 1042383 - Part 2: use optimizable build-time flags for SDK-dependent code. r=mfinkle

This commit is contained in:
Richard Newman
2014-07-30 08:19:35 -07:00
parent 49a7a48fff
commit 5042e5ec9c
47 changed files with 355 additions and 357 deletions

View File

@@ -5,23 +5,22 @@
package org.mozilla.gecko.gfx;
import org.json.JSONObject;
import org.mozilla.gecko.AppConstants.Versions;
import org.mozilla.gecko.EventDispatcher;
import org.mozilla.gecko.GeckoAppShell;
import org.mozilla.gecko.GeckoEvent;
import org.mozilla.gecko.PrefsHelper;
import org.mozilla.gecko.Tab;
import org.mozilla.gecko.Tabs;
import org.mozilla.gecko.ZoomConstraints;
import org.mozilla.gecko.EventDispatcher;
import org.mozilla.gecko.util.FloatUtils;
import org.mozilla.gecko.util.GamepadUtils;
import org.mozilla.gecko.util.GeckoEventListener;
import org.mozilla.gecko.util.ThreadUtils;
import org.json.JSONObject;
import android.graphics.PointF;
import android.graphics.RectF;
import android.os.Build;
import android.util.FloatMath;
import android.util.Log;
import android.view.GestureDetector;
@@ -294,7 +293,7 @@ class JavaPanZoomController
/** This function MUST be called on the UI thread */
@Override
public boolean onKeyEvent(KeyEvent event) {
if (Build.VERSION.SDK_INT <= 11) {
if (Versions.preHCMR1) {
return false;
}
@@ -314,7 +313,7 @@ class JavaPanZoomController
/** This function MUST be called on the UI thread */
@Override
public boolean onMotionEvent(MotionEvent event) {
if (Build.VERSION.SDK_INT <= 11) {
if (Versions.preHCMR1) {
return false;
}