refactoring-cleanup

2 files changed, 17 insertions, 13 deletions

diff --git a/navit/android/src/org/navitproject/navit/Navit.java b/navit/android/src/org/navitproject/navit/Navit.java
index b9d650c40..a6e349859 100644
--- a/navit/android/src/org/navitproject/navit/Navit.java
+++ b/navit/android/src/org/navitproject/navit/Navit.java
@@ -861,7 +861,7 @@ public class Navit extends Activity {
     public native void navitDestroy();
 
     private String getLocalizedString(String text) {
-        return NavitGraphics.CallbackLocalizedString(text);
+        return NavitGraphics.callbackLocalizedString(text);
     }
 
 
diff --git a/navit/android/src/org/navitproject/navit/NavitGraphics.java b/navit/android/src/org/navitproject/navit/NavitGraphics.java
index d5c0cbed8..4ad386159 100644
--- a/navit/android/src/org/navitproject/navit/NavitGraphics.java
+++ b/navit/android/src/org/navitproject/navit/NavitGraphics.java
@@ -79,10 +79,12 @@ public class NavitGraphics {
 
     public void setBackgroundColor(int bgcolor) {
         this.bgcolor = bgcolor;
-        if (navigationTintView != null)
+        if (navigationTintView != null) {
             navigationTintView.setBackgroundColor(bgcolor);
-        if (statusTintView != null)
+        }
+        if (statusTintView != null) {
             statusTintView.setBackgroundColor(bgcolor);
+        }
     }
 
     private void SetCamera(int use_camera) {
@@ -100,20 +102,20 @@ public class NavitGraphics {
         ret.top=pos_y;
         if (pos_wraparound != 0) {
             if (ret.left < 0) {
-                ret.left+=parent_graphics.bitmap_w;
+                ret.left += parent_graphics.bitmap_w;
             }
             if (ret.top < 0) {
-                ret.top+=parent_graphics.bitmap_h;
+                ret.top += parent_graphics.bitmap_h;
             }
         }
-        ret.right=ret.left+bitmap_w;
-        ret.bottom=ret.top+bitmap_h;
+        ret.right = ret.left+bitmap_w;
+        ret.bottom = ret.top+bitmap_h;
         if (pos_wraparound != 0) {
             if (bitmap_w < 0) {
-                ret.right=ret.left+bitmap_w+parent_graphics.bitmap_w;
+                ret.right = ret.left+bitmap_w+parent_graphics.bitmap_w;
             }
             if (bitmap_h < 0) {
-                ret.bottom=ret.top+bitmap_h+parent_graphics.bitmap_h;
+                ret.bottom = ret.top+bitmap_h+parent_graphics.bitmap_h;
             }
         }
         return ret;
@@ -147,7 +149,8 @@ public class NavitGraphics {
             super.onCreateContextMenu(menu);
 
             menu.setHeaderTitle(activity.getTstring(R.string.position_popup_title)+"..");
-            menu.add(1, 1, NONE, activity.getTstring(R.string.position_popup_drive_here)).setOnMenuItemClickListener(this);
+            menu.add(1, 1, NONE, activity.getTstring(R.string.position_popup_drive_here))
+                    .setOnMenuItemClickListener(this);
             menu.add(1, 2, NONE, activity.getTstring(R.string.cancel)).setOnMenuItemClickListener(this);
         }
 
@@ -173,7 +176,7 @@ public class NavitGraphics {
                 in_map = true;
                 for (NavitGraphics overlay : overlays) {
                     if (overlay.overlay_disabled == 0) {
-                        Rect r=overlay.get_rect();
+                        Rect r = overlay.get_rect();
                         canvas.drawBitmap(overlay.draw_bitmap, r.left, r.top, null);
                     }
                 }
@@ -950,6 +953,7 @@ public class NavitGraphics {
     /* These constants must be synchronized with enum draw_mode_num in graphics.h. */
     private static final int draw_mode_begin = 0;
     private static final int draw_mode_end = 1;
+    private static final int draw_mode_begin_clear = 2;
 
     protected void draw_mode(int mode) {
         if (mode == draw_mode_end) {
@@ -959,7 +963,7 @@ public class NavitGraphics {
                 parent_graphics.view.invalidate(get_rect());
             }
         }
-        if (mode == draw_mode_begin && parent_graphics != null) {
+        if (mode == draw_mode_begin_clear || (mode == draw_mode_begin && parent_graphics != null)) {
             draw_bitmap.eraseColor(0);
         }
 
@@ -991,5 +995,5 @@ public class NavitGraphics {
         draw_canvas.setBitmap(draw_bitmap);
     }
 
-    public static native String CallbackLocalizedString(String s);
+    public static native String callbackLocalizedString(String s);
 }