From 2700fc4515dc50707d4603486008abdb0edabe7c Mon Sep 17 00:00:00 2001 From: jandegr Date: Sat, 8 Aug 2015 08:22:32 +0200 Subject: Android: simplify onDraw() --- .../src/org/navitproject/navit/NavitGraphics.java | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/navit/android/src/org/navitproject/navit/NavitGraphics.java b/navit/android/src/org/navitproject/navit/NavitGraphics.java index fc4944240..2b45b2737 100644 --- a/navit/android/src/org/navitproject/navit/NavitGraphics.java +++ b/navit/android/src/org/navitproject/navit/NavitGraphics.java @@ -161,24 +161,16 @@ public class NavitGraphics canvas.drawBitmap(draw_bitmap, pos_x, pos_y, null); if (overlay_disabled == 0) { - //Log.e("NavitGraphics", "view -> onDraw 1"); // assume we ARE in map view mode! in_map = true; - - Object overlays_array[]; - overlays_array = overlays.toArray(); - for (Object overlay : overlays_array) + for (NavitGraphics overlay : overlays) { - //Log.e("NavitGraphics","view -> onDraw 2"); - - NavitGraphics overlay_graphics = (NavitGraphics) overlay; - if (overlay_graphics.overlay_disabled == 0) + if (overlay.overlay_disabled == 0) { - //Log.e("NavitGraphics","view -> onDraw 3"); - Rect r=overlay_graphics.get_rect(); - canvas.drawBitmap(overlay_graphics.draw_bitmap, r.left, r.top, null); + Rect r=overlay.get_rect(); + canvas.drawBitmap(overlay.draw_bitmap, r.left, r.top, null); } - } + } } else { @@ -196,7 +188,7 @@ public class NavitGraphics } } } - + @Override protected void onSizeChanged(int w, int h, int oldw, int oldh) { -- cgit v1.2.1