summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2014-12-17 18:53:40 +0900
committerTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2014-12-17 19:03:22 +0900
commitbd219e3cba549694f2c190916626ae9e65f06c81 (patch)
tree0324bd70103172a1a62106677e6d288f41594b34 /android
parent3df95150c1ab65b5d2dc1ed2bd2e2010e6132d32 (diff)
android: tweak low-res tiles
Change-Id: I2806f35ee112b9ea7ccf323e01372f7e2f68ffa2
Diffstat (limited to 'android')
-rw-r--r--android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java4
-rw-r--r--android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/FixedZoomTileLayer.java4
2 files changed, 3 insertions, 5 deletions
diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java
index cb924e355186..e6799b68919a 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java
+++ b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java
@@ -135,6 +135,7 @@ public abstract class ComposedTileLayer extends Layer {
currentViewport = newCurrentViewPort;
currentZoom = newZoom;
+ clearMarkedTiles();
addNewTiles(viewportMetrics);
markTiles(viewportMetrics);
}
@@ -190,10 +191,8 @@ public abstract class ComposedTileLayer extends Layer {
RectF tileRect = tile.id.getRect();
if (!RectF.intersects(currentViewport, tileRect)) {
tile.markForRemoval();
- Log.i(LOGTAG, "Mark for remove - " + currentViewport + " " + tileRect);
}
} else {
- Log.i(LOGTAG, "Mark for remove - " + tile.id.zoom + " " + zoom);
tile.markForRemoval();
}
}
@@ -205,7 +204,6 @@ public abstract class ComposedTileLayer extends Layer {
}
public void addTile(SubTile tile) {
- clearMarkedTiles();
tile.beginTransaction();
tiles.add(tile);
}
diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/FixedZoomTileLayer.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/FixedZoomTileLayer.java
index 52a26f60fd01..2db6a1d06367 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/FixedZoomTileLayer.java
+++ b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/FixedZoomTileLayer.java
@@ -12,7 +12,7 @@ public class FixedZoomTileLayer extends ComposedTileLayer {
@Override
protected float getZoom(ImmutableViewportMetrics viewportMetrics) {
- return 1.0f / 32.0f;
+ return 1.0f / 16.0f;
}
@Override
@@ -21,6 +21,6 @@ public class FixedZoomTileLayer extends ComposedTileLayer {
}
private IntSize getInflateFactor() {
- return tileSize.scale(3);
+ return new IntSize(tileSize.width, tileSize.height*6);
}
}