mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-17 07:15:46 +00:00
Bug 777351 - Move the getDrawable functions from LayerController to LayerView. r=sriram
This commit is contained in:
parent
9d15556359
commit
298dce95d2
@ -11,9 +11,6 @@ import org.mozilla.gecko.ui.PanZoomTarget;
|
||||
import org.mozilla.gecko.ui.SimpleScaleGestureDetector;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.res.Resources;
|
||||
import android.graphics.Bitmap;
|
||||
import android.graphics.BitmapFactory;
|
||||
import android.graphics.Color;
|
||||
import android.graphics.PointF;
|
||||
import android.graphics.RectF;
|
||||
@ -104,9 +101,6 @@ public class LayerController implements PanZoomTarget {
|
||||
return mViewportMetrics.getSize();
|
||||
}
|
||||
|
||||
public Bitmap getBackgroundPattern() { return getDrawable("tabs_tray_selected_bg"); }
|
||||
public Bitmap getShadowPattern() { return getDrawable("shadow"); }
|
||||
|
||||
public PanZoomController getPanZoomController() { return mPanZoomController; }
|
||||
public GestureDetector.OnGestureListener getGestureListener() { return mPanZoomController; }
|
||||
public SimpleScaleGestureDetector.SimpleScaleGestureListener getScaleGestureListener() {
|
||||
@ -114,14 +108,6 @@ public class LayerController implements PanZoomTarget {
|
||||
}
|
||||
public GestureDetector.OnDoubleTapListener getDoubleTapListener() { return mPanZoomController; }
|
||||
|
||||
private Bitmap getDrawable(String name) {
|
||||
Resources resources = mContext.getResources();
|
||||
int resourceID = resources.getIdentifier(name, "drawable", mContext.getPackageName());
|
||||
BitmapFactory.Options options = new BitmapFactory.Options();
|
||||
options.inScaled = false;
|
||||
return BitmapFactory.decodeResource(mContext.getResources(), resourceID, options);
|
||||
}
|
||||
|
||||
/**
|
||||
* The view calls this function to indicate that the viewport changed size. It must hold the
|
||||
* monitor while calling it.
|
||||
|
@ -145,14 +145,12 @@ public class LayerRenderer {
|
||||
public LayerRenderer(LayerView view) {
|
||||
mView = view;
|
||||
|
||||
LayerController controller = view.getController();
|
||||
|
||||
CairoImage backgroundImage = new BufferedCairoImage(controller.getBackgroundPattern());
|
||||
CairoImage backgroundImage = new BufferedCairoImage(view.getBackgroundPattern());
|
||||
mBackgroundLayer = new SingleTileLayer(true, backgroundImage);
|
||||
|
||||
mCheckerboardLayer = ScreenshotLayer.create();
|
||||
|
||||
CairoImage shadowImage = new BufferedCairoImage(controller.getShadowPattern());
|
||||
CairoImage shadowImage = new BufferedCairoImage(view.getShadowPattern());
|
||||
mShadowLayer = new NinePatchTileLayer(shadowImage);
|
||||
|
||||
mHorizScrollLayer = ScrollbarLayer.create(this, false);
|
||||
|
@ -6,8 +6,11 @@
|
||||
package org.mozilla.gecko.gfx;
|
||||
|
||||
import org.mozilla.gecko.GeckoApp;
|
||||
import org.mozilla.gecko.R;
|
||||
|
||||
import android.content.Context;
|
||||
import android.graphics.Bitmap;
|
||||
import android.graphics.BitmapFactory;
|
||||
import android.graphics.PixelFormat;
|
||||
import android.graphics.SurfaceTexture;
|
||||
import android.os.Build;
|
||||
@ -237,6 +240,20 @@ public class LayerView extends FrameLayout {
|
||||
return mGLController;
|
||||
}
|
||||
|
||||
private Bitmap getDrawable(int resId) {
|
||||
BitmapFactory.Options options = new BitmapFactory.Options();
|
||||
options.inScaled = false;
|
||||
return BitmapFactory.decodeResource(getContext().getResources(), resId, options);
|
||||
}
|
||||
|
||||
Bitmap getBackgroundPattern() {
|
||||
return getDrawable(R.drawable.tabs_tray_selected_bg);
|
||||
}
|
||||
|
||||
Bitmap getShadowPattern() {
|
||||
return getDrawable(R.drawable.shadow);
|
||||
}
|
||||
|
||||
private void onSizeChanged(int width, int height) {
|
||||
mGLController.surfaceChanged(width, height);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user