corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 721741 - Add support for Flash on Android 4.0+ r=blassey

Browse Source
This commit is contained in:
James Willcox
2012-01-31 09:40:58 -05:00
parent 43516b489f
commit d28ecb7432
34 changed files with 1640 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mobile/android/base/ui/PanZoomController.java
View File

@@ -293,6 +293,7 @@ public class PanZoomController
return false;
}
cancelTouch();
GeckoApp.mAppContext.hidePlugins(false /* don't hide layers */);
// fall through
case PANNING_HOLD_LOCKED:
GeckoApp.mAppContext.mAutoCompletePopup.hide();
@@ -474,6 +475,8 @@ public class PanZoomController
stopAnimationTimer();
}
GeckoApp.mAppContext.hidePlugins(false /* don't hide layers */);
mAnimationTimer = new Timer("Animation Timer");
mAnimationRunnable = runnable;
mAnimationTimer.scheduleAtFixedRate(new TimerTask() {
@@ -492,6 +495,8 @@ public class PanZoomController
mAnimationRunnable.terminate();
mAnimationRunnable = null;
}
GeckoApp.mAppContext.showPlugins();
}
private float getVelocity() {
@@ -581,7 +586,6 @@ public class PanZoomController
finishBounce();
finishAnimation();
mState = PanZoomState.NOTHING;
GeckoApp.mAppContext.showPluginViews();
}
/* Performs one frame of a bounce animation. */
@@ -661,6 +665,7 @@ public class PanZoomController
stopAnimationTimer();
// Force a viewport synchronisation
GeckoApp.mAppContext.showPlugins();
mController.setForceRedraw();
mController.notifyLayerClientOfGeometryChange();
}
@@ -741,7 +746,7 @@ public class PanZoomController
mState = PanZoomState.PINCHING;
mLastZoomFocus = new PointF(detector.getFocusX(), detector.getFocusY());
GeckoApp.mAppContext.hidePluginViews();
GeckoApp.mAppContext.hidePlugins(false /* don't hide layers, only views */);
GeckoApp.mAppContext.mAutoCompletePopup.hide();
cancelTouch();
@@ -806,9 +811,9 @@ public class PanZoomController
startTouch(detector.getFocusX(), detector.getFocusY(), detector.getEventTime());
// Force a viewport synchronisation
GeckoApp.mAppContext.showPlugins();
mController.setForceRedraw();
mController.notifyLayerClientOfGeometryChange();
GeckoApp.mAppContext.showPluginViews();
}
public boolean getRedrawHint() {
@@ -862,7 +867,6 @@ public class PanZoomController
}
private boolean animatedZoomTo(RectF zoomToRect) {
GeckoApp.mAppContext.hidePluginViews();
GeckoApp.mAppContext.mAutoCompletePopup.hide();
mState = PanZoomState.ANIMATED_ZOOM;