summaryrefslogtreecommitdiff
path: root/navit/android/src/org/navitproject/navit/NavitGraphics.java
diff options
context:
space:
mode:
Diffstat (limited to 'navit/android/src/org/navitproject/navit/NavitGraphics.java')
-rw-r--r--navit/android/src/org/navitproject/navit/NavitGraphics.java1183
1 files changed, 548 insertions, 635 deletions
diff --git a/navit/android/src/org/navitproject/navit/NavitGraphics.java b/navit/android/src/org/navitproject/navit/NavitGraphics.java
index 4e7929f88..67fe2615e 100644
--- a/navit/android/src/org/navitproject/navit/NavitGraphics.java
+++ b/navit/android/src/org/navitproject/navit/NavitGraphics.java
@@ -1,4 +1,4 @@
-/**
+/*
* Navit, a modular navigation system.
* Copyright (C) 2005-2008 Navit Team
*
@@ -19,10 +19,15 @@
package org.navitproject.navit;
+import static org.navitproject.navit.NavitAppConfig.getTstring;
+
import android.annotation.SuppressLint;
import android.annotation.TargetApi;
import android.app.Activity;
import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.graphics.Bitmap;
@@ -32,9 +37,11 @@ import android.graphics.Paint;
import android.graphics.Path;
import android.graphics.PointF;
import android.graphics.Rect;
+import android.net.Uri;
import android.os.Build;
import android.os.Handler;
import android.os.Message;
+import android.support.annotation.RequiresApi;
import android.support.v4.view.ViewConfigurationCompat;
import android.util.Log;
import android.view.ContextMenu;
@@ -46,200 +53,223 @@ import android.view.View;
import android.view.ViewConfiguration;
import android.view.ViewGroup.LayoutParams;
import android.view.WindowInsets;
+import android.view.WindowManager;
import android.view.inputmethod.InputMethodManager;
import android.widget.FrameLayout;
import android.widget.RelativeLayout;
-import java.io.File;
-import java.lang.reflect.Method;
+
import java.util.ArrayList;
+import java.util.List;
-public class NavitGraphics {
+class NavitGraphics {
private static final String TAG = "NavitGraphics";
- private final NavitGraphics parent_graphics;
- private final ArrayList<NavitGraphics> overlays = new ArrayList<NavitGraphics>();
- private int bitmap_w;
- private int bitmap_h;
- private int pos_x;
- private int pos_y;
- private int pos_wraparound;
- private int overlay_disabled;
- private int bgcolor;
- private float trackball_x;
- private float trackball_y;
- private int padding_left = 0;
- private int padding_right = 0;
- private int padding_top = 0;
- private int padding_bottom = 0;
- private View view;
- private SystemBarTintView leftTintView;
- private SystemBarTintView rightTintView;
- private SystemBarTintView topTintView;
- private SystemBarTintView bottomTintView;
- private FrameLayout frameLayout;
- private RelativeLayout relativelayout;
- private NavitCamera camera = null;
- private Navit activity;
- private static Boolean in_map = false;
- // for menu key
- private static final long time_for_long_press = 300L;
-
-
- private Handler timer_handler = new Handler();
-
- public void setBackgroundColor(int bgcolor) {
- this.bgcolor = bgcolor;
- if (leftTintView != null) {
- leftTintView.setBackgroundColor(bgcolor);
+ private static final long TIME_FOR_LONG_PRESS = 300L;
+ private final NavitGraphics mParentGraphics;
+ private final ArrayList<NavitGraphics> mOverlays = new ArrayList<>();
+ private int mBitmapWidth;
+ private int mBitmapHeight;
+ private int mPosX;
+ private int mPosY;
+ private int mPosWraparound;
+ private int mOverlayDisabled;
+ private int mBgColor;
+ private float mTrackballX;
+ private float mTrackballY;
+ private int mPaddingLeft;
+ private int mPaddingRight;
+ private int mPaddingTop;
+ private int mPaddingBottom;
+ private View mView;
+ static final Handler sCallbackHandler = new CallBackHandler();
+ private SystemBarTintView mLeftTintView;
+ private SystemBarTintView mRightTintView;
+ private SystemBarTintView mTopTintView;
+ private SystemBarTintView mBottomTintView;
+ private FrameLayout mFrameLayout;
+ private RelativeLayout mRelativeLayout;
+ private NavitCamera mCamera;
+ private Navit mActivity;
+ private static boolean sInMap;
+ private boolean mTinting;
+
+
+ void setBackgroundColor(int bgcolor) {
+ this.mBgColor = bgcolor;
+ if (mLeftTintView != null) {
+ mLeftTintView.setBackgroundColor(bgcolor);
}
- if (rightTintView != null) {
- rightTintView.setBackgroundColor(bgcolor);
+ if (mRightTintView != null) {
+ mRightTintView.setBackgroundColor(bgcolor);
}
- if (topTintView != null) {
- topTintView.setBackgroundColor(bgcolor);
+ if (mTopTintView != null) {
+ mTopTintView.setBackgroundColor(bgcolor);
}
- if (bottomTintView != null) {
- bottomTintView.setBackgroundColor(bgcolor);
+ if (mBottomTintView != null) {
+ mBottomTintView.setBackgroundColor(bgcolor);
}
}
- private void SetCamera(int use_camera) {
- if (use_camera != 0 && camera == null) {
- // activity.requestWindowFeature(Window.FEATURE_NO_TITLE);
+ private void setCamera(int useCamera) {
+ if (useCamera != 0 && mCamera == null) {
+ // mActivity.requestWindowFeature(Window.FEATURE_NO_TITLE);
addCamera();
addCameraView();
}
}
/**
- * @brief Adds a camera.
+ * Adds a camera.
*
- * This method does not create the view for the camera. This must be done separately by calling
- * {@link #addCameraView()}.
+ * <p>This method does not create the view for the camera. This must be done separately by calling
+ * {@link #addCameraView()}.</p>
*/
private void addCamera() {
- camera = new NavitCamera(activity);
+ mCamera = new NavitCamera(mActivity);
}
- /**
- * @brief Adds a view for the camera.
- *
- * If {@link #camera} is null, this method is a no-op.
- */
private void addCameraView() {
- if (camera != null) {
- relativelayout.addView(camera);
- relativelayout.bringChildToFront(view);
+ if (mCamera != null) {
+ mRelativeLayout.addView(mCamera);
+ mRelativeLayout.bringChildToFront(mView);
}
}
private Rect get_rect() {
Rect ret = new Rect();
- ret.left = pos_x;
- ret.top = pos_y;
- if (pos_wraparound != 0) {
+ ret.left = mPosX;
+ ret.top = mPosY;
+ if (mPosWraparound != 0) {
if (ret.left < 0) {
- ret.left += parent_graphics.bitmap_w;
+ ret.left += mParentGraphics.mBitmapWidth;
}
if (ret.top < 0) {
- ret.top += parent_graphics.bitmap_h;
+ ret.top += mParentGraphics.mBitmapHeight;
}
}
- 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 + mBitmapWidth;
+ ret.bottom = ret.top + mBitmapHeight;
+ if (mPosWraparound != 0) {
+ if (mBitmapWidth < 0) {
+ ret.right = ret.left + mBitmapWidth + mParentGraphics.mBitmapWidth;
}
- if (bitmap_h < 0) {
- ret.bottom = ret.top + bitmap_h + parent_graphics.bitmap_h;
+ if (mBitmapHeight < 0) {
+ ret.bottom = ret.top + mBitmapHeight + mParentGraphics.mBitmapHeight;
}
}
return ret;
}
private class NavitView extends View implements Runnable, MenuItem.OnMenuItemClickListener {
- int touch_mode = NONE;
- float oldDist = 0;
+ int mTouchMode = NONE;
+ float mOldDist = 0;
static final int NONE = 0;
static final int DRAG = 1;
static final int ZOOM = 2;
static final int PRESSED = 3;
- Method eventGetX = null;
- Method eventGetY = null;
+ PointF mPressedPosition = null;
- PointF mPressedPosition = null;
-
- public NavitView(Context context) {
+ NavitView(Context context) {
super(context);
- try {
- eventGetX = android.view.MotionEvent.class.getMethod("getX", int.class);
- eventGetY = android.view.MotionEvent.class.getMethod("getY", int.class);
- } catch (Exception e) {
- Log.e(TAG, "Multitouch zoom not supported");
+ }
+
+ public void onWindowFocusChanged(boolean hasWindowFocus) {
+ Log.v(TAG,"onWindowFocusChanged = " + hasWindowFocus);
+ // beter aanroepen in Navit of appconfig ?
+ if (Navit.sShowSoftKeyboardShowing && hasWindowFocus) {
+ InputMethodManager imm = (InputMethodManager) mActivity
+ .getSystemService(Context.INPUT_METHOD_SERVICE);
+ imm.showSoftInput(this,InputMethodManager.SHOW_FORCED);
+ }
+ if (Navit.sShowSoftKeyboardShowing && !hasWindowFocus) {
+ InputMethodManager imm = (InputMethodManager) mActivity
+ .getSystemService(Context.INPUT_METHOD_SERVICE);
+ imm.hideSoftInputFromWindow(this.getWindowToken(), 0);
}
}
- @Override
- @TargetApi(20)
- public WindowInsets onApplyWindowInsets (WindowInsets insets) {
- /*
- * We're skipping the top inset here because it appears to have a bug on most Android versions tested,
- * causing it to report between 24 and 64 dip more than what is actually occupied by the system UI.
- * The top inset is retrieved in handleResize(), with logic depending on the platform version.
- */
- if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT_WATCH) {
- padding_left = insets.getSystemWindowInsetLeft();
- padding_right = insets.getSystemWindowInsetRight();
- padding_bottom = insets.getSystemWindowInsetBottom();
+
+ @TargetApi(21)
+ public WindowInsets onApplyWindowInsets(WindowInsets insets) {
+ Log.d(TAG,"onApplyWindowInsets");
+ if (mTinting) {
+ mPaddingLeft = insets.getSystemWindowInsetLeft();
+ mPaddingRight = insets.getSystemWindowInsetRight();
+ mPaddingBottom = insets.getSystemWindowInsetBottom();
+ mPaddingTop = insets.getSystemWindowInsetTop();
+ Log.v(TAG, String.format("Padding -1a- left=%d top=%d right=%d bottom=%d",
+ mPaddingLeft, mPaddingTop, mPaddingRight, mPaddingBottom));
+ int width = this.getWidth();
+ int height = this.getHeight();
+ if (width > 0 && height > 0) {
+ adjustSystemBarsTintingViews();
+ sizeChangedCallback(mSizeChangedCallbackID, width, height);
+ }
}
- return super.onApplyWindowInsets(insets);
+ return insets;
}
+ private static final int MENU_DRIVE_HERE = 1;
+ private static final int MENU_VIEW = 2;
+ private static final int MENU_CANCEL = 3;
+
@Override
protected void onCreateContextMenu(ContextMenu menu) {
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))
+ String clickCoord = getCoordForPoint((int)mPressedPosition.x, (int)mPressedPosition.y, false);
+ menu.setHeaderTitle(NavitAppConfig.getTstring(R.string.position_popup_title) + " " + clickCoord);
+ menu.add(1, MENU_DRIVE_HERE, NONE, NavitAppConfig.getTstring(R.string.position_popup_drive_here))
.setOnMenuItemClickListener(this);
- menu.add(1, 2, NONE, activity.getTstring(R.string.cancel)).setOnMenuItemClickListener(this);
+ Uri intentUri = Uri.parse("geo:" + getCoordForPoint((int)mPressedPosition.x,
+ (int)mPressedPosition.y, true));
+ Intent mContextMenuMapViewIntent = new Intent(Intent.ACTION_VIEW, intentUri);
+
+ PackageManager packageManager = this.getContext().getPackageManager();
+ List<ResolveInfo> activities = packageManager.queryIntentActivities(mContextMenuMapViewIntent,
+ PackageManager.MATCH_DEFAULT_ONLY);
+ boolean isIntentSafe = (activities.size() > 0); // at least one candidate receiver
+ if (isIntentSafe) { // add view with external app option
+ menu.add(1, MENU_VIEW, NONE, NavitAppConfig.getTstring(R.string.position_popup_view))
+ .setOnMenuItemClickListener(this);
+ } else {
+ Log.w(TAG, "No application available to handle ACTION_VIEW intent, option not displayed");
+ }
+ menu.add(1, MENU_CANCEL, NONE, getTstring(R.string.cancel)).setOnMenuItemClickListener(this);
}
@Override
public boolean onMenuItemClick(MenuItem item) {
- switch (item.getItemId()) {
- case 1:
- Message msg = Message.obtain(callback_handler, msg_type.CLB_SET_DISPLAY_DESTINATION.ordinal(),
- (int)mPressedPosition.x, (int)mPressedPosition.y);
- msg.sendToTarget();
- break;
+ int itemId = item.getItemId();
+ if (itemId == MENU_DRIVE_HERE) {
+ Message msg = Message.obtain(sCallbackHandler, MsgType.CLB_SET_DISPLAY_DESTINATION.ordinal(),
+ (int) mPressedPosition.x, (int) mPressedPosition.y);
+ msg.sendToTarget();
+ } else if (itemId == MENU_VIEW) {
+ Uri intentUri = Uri.parse("geo:" + getCoordForPoint((int) mPressedPosition.x,
+ (int) mPressedPosition.y, true));
+ Intent mContextMenuMapViewIntent = new Intent(Intent.ACTION_VIEW, intentUri);
+ if (mContextMenuMapViewIntent.resolveActivity(this.getContext().getPackageManager()) != null) {
+ this.getContext().startActivity(mContextMenuMapViewIntent);
+ } else {
+ Log.w(TAG, "ACTION_VIEW intent is not handled by any application, discarding...");
+ }
}
- return false;
+ return true;
}
@Override
protected void onDraw(Canvas canvas) {
super.onDraw(canvas);
- canvas.drawBitmap(draw_bitmap, pos_x, pos_y, null);
- if (overlay_disabled == 0) {
+ canvas.drawBitmap(mDrawBitmap, mPosX, mPosY, null);
+ if (mOverlayDisabled == 0) {
// assume we ARE in map view mode!
- in_map = true;
- for (NavitGraphics overlay : overlays) {
- if (overlay.overlay_disabled == 0) {
+ sInMap = true;
+ for (NavitGraphics overlay : mOverlays) {
+ if (overlay.mOverlayDisabled == 0) {
Rect r = overlay.get_rect();
- canvas.drawBitmap(overlay.draw_bitmap, r.left, r.top, null);
- }
- }
- } else {
- if (Navit.show_soft_keyboard) {
- if (Navit.mgr != null) {
- Navit.mgr.showSoftInput(this, InputMethodManager.SHOW_IMPLICIT);
- Navit.show_soft_keyboard_now_showing = true;
- // clear the variable now, keyboard will stay on screen until backbutton pressed
- Navit.show_soft_keyboard = false;
+ canvas.drawBitmap(overlay.mDrawBitmap, r.left, r.top, null);
}
}
}
@@ -248,33 +278,23 @@ public class NavitGraphics {
@Override
protected void onSizeChanged(int w, int h, int oldw, int oldh) {
Log.d(TAG, "onSizeChanged pixels x=" + w + " pixels y=" + h);
- Log.d(TAG, "onSizeChanged density=" + Navit.metrics.density);
- Log.d(TAG, "onSizeChanged scaledDensity=" + Navit.metrics.scaledDensity);
+ Log.v(TAG, "onSizeChanged density=" + Navit.sMetrics.density);
+ Log.v(TAG, "onSizeChanged scaledDensity=" + Navit.sMetrics.scaledDensity);
super.onSizeChanged(w, h, oldw, oldh);
+ mDrawBitmap = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888);
+ mDrawCanvas = new Canvas(mDrawBitmap);
+ mBitmapWidth = w;
+ mBitmapHeight = h;
handleResize(w, h);
+ sizeChangedCallback(mSizeChangedCallbackID, w, h);
}
- void do_longpress_action() {
- Log.d(TAG, "do_longpress_action enter");
-
- activity.openContextMenu(this);
+ void doLongpressAction() {
+ Log.d(TAG, "doLongpressAction enter");
+ mActivity.openContextMenu(this);
}
- private int getActionField(String fieldname, Object obj) {
- int ret_value = -999;
- try {
- java.lang.reflect.Field field = android.view.MotionEvent.class.getField(fieldname);
- try {
- ret_value = field.getInt(obj);
- } catch (Exception e) {
- e.printStackTrace();
- }
- } catch (NoSuchFieldException ex) {
- ex.printStackTrace();
- }
- return ret_value;
- }
@SuppressLint("ClickableViewAccessibility")
@Override
@@ -282,220 +302,153 @@ public class NavitGraphics {
super.onTouchEvent(event);
int x = (int) event.getX();
int y = (int) event.getY();
-
- int _ACTION_POINTER_UP_ = getActionField("ACTION_POINTER_UP", event);
- int _ACTION_POINTER_DOWN_ = getActionField("ACTION_POINTER_DOWN", event);
- int _ACTION_MASK_ = getActionField("ACTION_MASK", event);
-
- int switch_value = event.getAction();
- if (_ACTION_MASK_ != -999) {
- switch_value = (event.getAction() & _ACTION_MASK_);
- }
-
- if (switch_value == MotionEvent.ACTION_DOWN) {
- touch_mode = PRESSED;
- if (!in_map) {
- ButtonCallback(ButtonCallbackID, 1, 1, x, y); // down
+ int switchValue = (event.getActionMasked());
+ Log.d(TAG, "ACTION_ value = " + switchValue);
+
+ if (switchValue == MotionEvent.ACTION_DOWN) {
+ mTouchMode = PRESSED;
+ Log.d(TAG, "ACTION_DOWN mode PRESSED");
+ if (!sInMap) {
+ buttonCallback(mButtonCallbackID, 1, 1, x, y); // down
}
mPressedPosition = new PointF(x, y);
- postDelayed(this, time_for_long_press);
- } else if ((switch_value == MotionEvent.ACTION_UP) || (switch_value == _ACTION_POINTER_UP_)) {
- Log.d(TAG, "ACTION_UP");
+ postDelayed(this, TIME_FOR_LONG_PRESS);
- switch (touch_mode) {
+ } else if (switchValue == MotionEvent.ACTION_POINTER_DOWN) {
+ mOldDist = spacing(event);
+ if (mOldDist > 2f) {
+ mTouchMode = ZOOM;
+ Log.d(TAG, "ACTION_DOWN mode ZOOM started");
+ }
+ } else if (switchValue == MotionEvent.ACTION_UP) {
+ Log.d(TAG, "ACTION_UP");
+ switch (mTouchMode) {
case DRAG:
Log.d(TAG, "onTouch move");
-
- MotionCallback(MotionCallbackID, x, y);
- ButtonCallback(ButtonCallbackID, 0, 1, x, y); // up
-
- break;
- case ZOOM:
- float newDist = spacing(getFloatValue(event, 0), getFloatValue(event, 1));
- float scale = 0;
- if (newDist > 10f) {
- scale = newDist / oldDist;
- }
-
- if (scale > 1.3) {
- // zoom in
- CallbackMessageChannel(1, null);
- } else if (scale < 0.8) {
- // zoom out
- CallbackMessageChannel(2, null);
- }
+ motionCallback(mMotionCallbackID, x, y);
+ buttonCallback(mButtonCallbackID, 0, 1, x, y); // up
break;
case PRESSED:
- if (in_map) {
- ButtonCallback(ButtonCallbackID, 1, 1, x, y); // down
+ if (sInMap) {
+ buttonCallback(mButtonCallbackID, 1, 1, x, y); // down
}
- ButtonCallback(ButtonCallbackID, 0, 1, x, y); // up
-
+ buttonCallback(mButtonCallbackID, 0, 1, x, y); // up
break;
+ default:
+ Log.i(TAG, "Unexpected touchmode: " + mTouchMode);
}
- touch_mode = NONE;
- } else if (switch_value == MotionEvent.ACTION_MOVE) {
- switch (touch_mode) {
+ mTouchMode = NONE;
+ } else if (switchValue == MotionEvent.ACTION_MOVE) {
+ switch (mTouchMode) {
case DRAG:
- MotionCallback(MotionCallbackID, x, y);
+ motionCallback(mMotionCallbackID, x, y);
break;
case ZOOM:
- float newDist = spacing(getFloatValue(event, 0), getFloatValue(event, 1));
- float scale = newDist / oldDist;
- Log.d(TAG, "New scale = " + scale);
- if (scale > 1.2) {
- // zoom in
- CallbackMessageChannel(1, "");
- oldDist = newDist;
- } else if (scale < 0.8) {
- oldDist = newDist;
- // zoom out
- CallbackMessageChannel(2, "");
- }
+ doZoom(event);
break;
case PRESSED:
Log.d(TAG, "Start drag mode");
if (spacing(mPressedPosition, new PointF(event.getX(), event.getY())) > 20f) {
- ButtonCallback(ButtonCallbackID, 1, 1, x, y); // down
- touch_mode = DRAG;
+ buttonCallback(mButtonCallbackID, 1, 1, x, y); // down
+ mTouchMode = DRAG;
}
break;
- }
- } else if (switch_value == _ACTION_POINTER_DOWN_) {
- oldDist = spacing(getFloatValue(event, 0), getFloatValue(event, 1));
- if (oldDist > 2f) {
- touch_mode = ZOOM;
+ default:
+ Log.i(TAG, "Unexpected touchmode: " + mTouchMode);
}
}
return true;
}
+ private void doZoom(MotionEvent event) {
+ if (event.findPointerIndex(0) == -1 || event.findPointerIndex(1) == -1) {
+ Log.e(TAG,"missing pointer");
+ return;
+ }
+ float newDist = spacing(event);
+ float scale;
+ if (event.getActionMasked() == MotionEvent.ACTION_MOVE) {
+ scale = newDist / mOldDist;
+ Log.v(TAG, "New scale = " + scale);
+ if (scale > 1.2) {
+ // zoom in
+ callbackMessageChannel(1, "");
+ mOldDist = newDist;
+ } else if (scale < 0.8) {
+ mOldDist = newDist;
+ // zoom out
+ callbackMessageChannel(2, "");
+ }
+ }
+ }
+
+ private float spacing(MotionEvent event) {
+ float x = event.getX(0) - event.getX(1);
+ float y = event.getY(0) - event.getY(1);
+ return (float) Math.sqrt(x * x + y * y);
+ }
+
private float spacing(PointF a, PointF b) {
float x = a.x - b.x;
float y = a.y - b.y;
return (float)Math.sqrt(x * x + y * y);
}
- private PointF getFloatValue(Object instance, Object argument) {
- PointF pos = new PointF(0,0);
-
- if (eventGetX != null && eventGetY != null) {
- try {
- Float x = (java.lang.Float) eventGetX.invoke(instance, argument);
- Float y = (java.lang.Float) eventGetY.invoke(instance, argument);
- pos.set(x, y);
-
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- return pos;
- }
-
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
- int i;
- String s = null;
- long interval_for_long_press = 200L;
- i = event.getUnicodeChar();
- if (i == 0) {
- switch (keyCode) {
- case KeyEvent.KEYCODE_DEL:
- s = String.valueOf((char) 8);
- break;
- case KeyEvent.KEYCODE_MENU:
- if (!in_map) {
- // if last menukeypress is less than 0.2 seconds away then count longpress
- if ((System.currentTimeMillis() - Navit.last_pressed_menu_key) < interval_for_long_press) {
- Navit.time_pressed_menu_key = Navit.time_pressed_menu_key
- + (System.currentTimeMillis() - Navit.last_pressed_menu_key);
- // on long press let softkeyboard popup
- if (Navit.time_pressed_menu_key > time_for_long_press) {
- Navit.show_soft_keyboard = true;
- Navit.time_pressed_menu_key = 0L;
- // need to draw to get the keyboard showing
- this.postInvalidate();
- }
- } else {
- Navit.time_pressed_menu_key = 0L;
- }
- Navit.last_pressed_menu_key = System.currentTimeMillis();
- // if in menu view:
- // use as OK (Enter) key
- // dont use menu key here (use it in onKeyUp)
- return true;
- } else {
- // if on map view:
- // volume UP
- //s = java.lang.String.valueOf((char) 1);
- return true;
- }
- case KeyEvent.KEYCODE_SEARCH:
- /* Handle event in Main Activity if map is shown */
- if (in_map) {
- return false;
- }
-
- s = String.valueOf((char) 19);
- break;
- case KeyEvent.KEYCODE_BACK:
- s = String.valueOf((char) 27);
- break;
- case KeyEvent.KEYCODE_CALL:
- s = String.valueOf((char) 3);
- break;
- case KeyEvent.KEYCODE_VOLUME_UP:
- if (!in_map) {
- // if in menu view:
- // use as UP key
- s = String.valueOf((char) 16);
- } else {
- // if on map view:
- // volume UP
- //s = java.lang.String.valueOf((char) 21);
- return false;
- }
- break;
- case KeyEvent.KEYCODE_VOLUME_DOWN:
- if (!in_map) {
- // if in menu view:
- // use as DOWN key
- s = String.valueOf((char) 14);
- } else {
- // if on map view:
- // volume DOWN
- //s = java.lang.String.valueOf((char) 4);
- return false;
- }
- break;
- case KeyEvent.KEYCODE_DPAD_CENTER:
- s = String.valueOf((char) 13);
- break;
- case KeyEvent.KEYCODE_DPAD_DOWN:
- s = String.valueOf((char) 14);
- break;
- case KeyEvent.KEYCODE_DPAD_LEFT:
- s = String.valueOf((char) 2);
- break;
- case KeyEvent.KEYCODE_DPAD_RIGHT:
- s = String.valueOf((char) 6);
- break;
- case KeyEvent.KEYCODE_DPAD_UP:
- s = String.valueOf((char) 16);
- break;
- }
- } else if (i == 10) {
- s = java.lang.String.valueOf((char) 13);
+ Log.d(TAG,"onkeydown = " + keyCode);
+ String keyStr = null;
+ switch (keyCode) {
+ case KeyEvent.KEYCODE_ENTER:
+ case KeyEvent.KEYCODE_DPAD_CENTER:
+ keyStr = String.valueOf((char) 13);
+ break;
+ case KeyEvent.KEYCODE_DEL:
+ keyStr = String.valueOf((char) 8);
+ break;
+ //case KeyEvent.KEYCODE_MENU:
+ // if (!sInMap) {
+ // this.postInvalidate();
+ // return true;
+ // }
+ // break;
+ case KeyEvent.KEYCODE_SEARCH:
+ /* Handle event in Main Activity if map is shown */
+ if (!sInMap) {
+ keyStr = String.valueOf((char) 19);
+ }
+ break;
+ case KeyEvent.KEYCODE_BACK:
+ keyStr = String.valueOf((char) 27);
+ break;
+ case KeyEvent.KEYCODE_CALL:
+ keyStr = String.valueOf((char) 3);
+ break;
+ case KeyEvent.KEYCODE_DPAD_DOWN:
+ keyStr = String.valueOf((char) 14);
+ break;
+ case KeyEvent.KEYCODE_DPAD_LEFT:
+ keyStr = String.valueOf((char) 2);
+ break;
+ case KeyEvent.KEYCODE_DPAD_RIGHT:
+ keyStr = String.valueOf((char) 6);
+ break;
+ case KeyEvent.KEYCODE_DPAD_UP:
+ keyStr = String.valueOf((char) 16);
+ break;
+ default:
+ Log.v(TAG, "keycode: " + keyCode);
}
-
- if (s != null) {
- KeypressCallback(KeypressCallbackID, s);
+ if (keyStr != null) {
+ keypressCallback(mKeypressCallbackID, keyStr);
+ return true;
}
- return true;
+ return false;
}
@Override
public boolean onKeyUp(int keyCode, KeyEvent event) {
+ Log.d(TAG,"onkeyUp = " + keyCode);
int i;
String s = null;
i = event.getUnicodeChar();
@@ -503,44 +456,39 @@ public class NavitGraphics {
if (i == 0) {
switch (keyCode) {
case KeyEvent.KEYCODE_VOLUME_UP:
- return (!in_map);
case KeyEvent.KEYCODE_VOLUME_DOWN:
- return (!in_map);
+ return (!sInMap);
case KeyEvent.KEYCODE_SEARCH:
/* Handle event in Main Activity if map is shown */
- if (in_map) {
+ if (sInMap) {
return false;
}
break;
case KeyEvent.KEYCODE_BACK:
- if (Navit.show_soft_keyboard_now_showing) {
- Navit.show_soft_keyboard_now_showing = false;
+ if (Navit.sShowSoftKeyboardShowing) {
+ Navit.sShowSoftKeyboardShowing = false;
}
//s = java.lang.String.valueOf((char) 27);
return true;
case KeyEvent.KEYCODE_MENU:
- if (!in_map) {
- if (Navit.show_soft_keyboard_now_showing) {
- // if soft keyboard showing on screen, dont use menu button as select key
- } else {
+ if (!sInMap) {
+ if (!Navit.sShowSoftKeyboardShowing) {
// if in menu view:
// use as OK (Enter) key
s = String.valueOf((char) 13);
- }
+ } // if soft keyboard showing on screen, dont use menu button as select key
} else {
- // if on map view:
- // volume UP
- //s = java.lang.String.valueOf((char) 1);
return false;
}
break;
+ default:
+ Log.v(TAG, "keycode: " + keyCode);
}
} else if (i != 10) {
s = java.lang.String.valueOf((char) i);
}
-
if (s != null) {
- KeypressCallback(KeypressCallbackID, s);
+ keypressCallback(mKeypressCallbackID, s);
}
return true;
}
@@ -550,7 +498,7 @@ public class NavitGraphics {
String s;
if (keyCode == KeyEvent.KEYCODE_UNKNOWN) {
s = event.getCharacters();
- KeypressCallback(KeypressCallbackID, s);
+ keypressCallback(mKeypressCallbackID, s);
return true;
}
return super.onKeyMultiple(keyCode, count, event);
@@ -563,422 +511,361 @@ public class NavitGraphics {
s = java.lang.String.valueOf((char) 13);
}
if (event.getAction() == android.view.MotionEvent.ACTION_MOVE) {
- trackball_x += event.getX();
- trackball_y += event.getY();
- if (trackball_x <= -1) {
+ mTrackballX += event.getX();
+ mTrackballY += event.getY();
+ if (mTrackballX <= -1) {
s = java.lang.String.valueOf((char) 2);
- trackball_x += 1;
+ mTrackballX += 1;
}
- if (trackball_x >= 1) {
+ if (mTrackballX >= 1) {
s = java.lang.String.valueOf((char) 6);
- trackball_x -= 1;
+ mTrackballX -= 1;
}
- if (trackball_y <= -1) {
+ if (mTrackballY <= -1) {
s = java.lang.String.valueOf((char) 16);
- trackball_y += 1;
+ mTrackballY += 1;
}
- if (trackball_y >= 1) {
+ if (mTrackballY >= 1) {
s = java.lang.String.valueOf((char) 14);
- trackball_y -= 1;
+ mTrackballY -= 1;
}
}
if (s != null) {
- KeypressCallback(KeypressCallbackID, s);
+ keypressCallback(mKeypressCallbackID, s);
}
return true;
}
public void run() {
- if (in_map && touch_mode == PRESSED) {
- do_longpress_action();
- touch_mode = NONE;
+ if (sInMap && mTouchMode == PRESSED) {
+ doLongpressAction();
+ mTouchMode = NONE;
}
}
-
}
private class SystemBarTintView extends View {
public SystemBarTintView(Context context) {
super(context);
- this.setBackgroundColor(bgcolor);
+ this.setBackgroundColor(mBgColor);
}
}
- public NavitGraphics(final Activity activity, NavitGraphics parent, int x, int y, int w, int h,
- int wraparound, int use_camera) {
+ NavitGraphics(final Activity navit, NavitGraphics parent, int x, int y, int w, int h,
+ int wraparound, int useCamera) {
if (parent == null) {
- if (use_camera != 0) {
+ if (useCamera != 0) {
addCamera();
}
- setActivity(activity);
+ setmActivity((Navit)navit);
} else {
- draw_bitmap = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888);
- bitmap_w = w;
- bitmap_h = h;
- pos_x = x;
- pos_y = y;
- pos_wraparound = wraparound;
- draw_canvas = new Canvas(draw_bitmap);
- parent.overlays.add(this);
+ mDrawBitmap = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888);
+ mBitmapWidth = w;
+ mBitmapHeight = h;
+ mPosX = x;
+ mPosY = y;
+ mPosWraparound = wraparound;
+ mDrawCanvas = new Canvas(mDrawBitmap);
+ parent.mOverlays.add(this);
}
- parent_graphics = parent;
+ mParentGraphics = parent;
}
/**
- * @brief Sets up the main activity.
- *
- * @param activity The main activity.
+ * Sets up the main view.
+ * @param navit The main activity.
*/
- protected void setActivity(final Activity activity) {
- if (Navit.graphics == null)
- Navit.graphics = this;
- this.activity = (Navit) activity;
- view = new NavitView(activity);
- view.setClickable(false);
- view.setFocusable(true);
- view.setFocusableInTouchMode(true);
- view.setKeepScreenOn(true);
- relativelayout = new RelativeLayout(activity);
+ private void setmActivity(final Navit navit) {
+ this.mActivity = navit;
+ mView = new NavitView(mActivity);
+ mView.setClickable(false);
+ mView.setFocusable(true);
+ mView.setFocusableInTouchMode(true);
+ mView.setKeepScreenOn(true);
+ mRelativeLayout = new RelativeLayout(mActivity);
addCameraView();
- relativelayout.addView(view);
-
+ mRelativeLayout.addView(mView);
/* The navigational and status bar tinting code is meaningful only on API19+ */
- if (Build.VERSION.SDK_INT >= 19) {
- frameLayout = new FrameLayout(activity);
- frameLayout.addView(relativelayout);
- leftTintView = new SystemBarTintView(activity);
- rightTintView = new SystemBarTintView(activity);
- topTintView = new SystemBarTintView(activity);
- bottomTintView = new SystemBarTintView(activity);
- frameLayout.addView(leftTintView);
- frameLayout.addView(rightTintView);
- frameLayout.addView(topTintView);
- frameLayout.addView(bottomTintView);
- activity.setContentView(frameLayout);
+ mTinting = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
+
+ if (mTinting) {
+ mFrameLayout = new FrameLayout(mActivity);
+ mFrameLayout.addView(mRelativeLayout);
+ mLeftTintView = new SystemBarTintView(mActivity);
+ mRightTintView = new SystemBarTintView(mActivity);
+ mTopTintView = new SystemBarTintView(mActivity);
+ mBottomTintView = new SystemBarTintView(mActivity);
+ mFrameLayout.addView(mLeftTintView);
+ mFrameLayout.addView(mRightTintView);
+ mFrameLayout.addView(mTopTintView);
+ mFrameLayout.addView(mBottomTintView);
+ mActivity.setContentView(mFrameLayout);
} else {
- activity.setContentView(relativelayout);
+ mActivity.setContentView(mRelativeLayout);
}
-
- view.requestFocus();
+ mView.requestFocus();
}
- public enum msg_type {
+ enum MsgType {
CLB_ZOOM_IN, CLB_ZOOM_OUT, CLB_REDRAW, CLB_MOVE, CLB_BUTTON_UP, CLB_BUTTON_DOWN, CLB_SET_DESTINATION,
CLB_SET_DISPLAY_DESTINATION, CLB_CALL_CMD, CLB_COUNTRY_CHOOSER, CLB_LOAD_MAP, CLB_UNLOAD_MAP, CLB_DELETE_MAP
}
- static private final msg_type[] msg_values = msg_type.values();
+ private static final MsgType[] msg_values = MsgType.values();
- public final Handler callback_handler = new Handler() {
+ private static class CallBackHandler extends Handler {
public void handleMessage(Message msg) {
switch (msg_values[msg.what]) {
case CLB_ZOOM_IN:
- CallbackMessageChannel(1, "");
+ callbackMessageChannel(1, "");
break;
case CLB_ZOOM_OUT:
- CallbackMessageChannel(2, "");
+ callbackMessageChannel(2, "");
break;
case CLB_MOVE:
- MotionCallback(MotionCallbackID, msg.getData().getInt("x"), msg.getData().getInt("y"));
+ //motionCallback(mMotionCallbackID, msg.getData().getInt("x"), msg.getData().getInt("y"));
break;
case CLB_SET_DESTINATION:
String lat = Float.toString(msg.getData().getFloat("lat"));
String lon = Float.toString(msg.getData().getFloat("lon"));
String q = msg.getData().getString(("q"));
- CallbackMessageChannel(3, lat + "#" + lon + "#" + q);
+ callbackMessageChannel(3, lat + "#" + lon + "#" + q);
break;
case CLB_SET_DISPLAY_DESTINATION:
int x = msg.arg1;
int y = msg.arg2;
- CallbackMessageChannel(4, "" + x + "#" + y);
+ callbackMessageChannel(4, "" + x + "#" + y);
break;
case CLB_CALL_CMD:
String cmd = msg.getData().getString(("cmd"));
- CallbackMessageChannel(5, cmd);
+ callbackMessageChannel(5, cmd);
break;
case CLB_BUTTON_UP:
- ButtonCallback(ButtonCallbackID, 0, 1, msg.getData().getInt("x"), msg.getData().getInt("y")); // up
+ //buttonCallback(mButtonCallbackID, 0, 1, msg.getData().getInt("x"), msg.getData().getInt("y"));
break;
case CLB_BUTTON_DOWN:
- // down
- ButtonCallback(ButtonCallbackID, 1, 1, msg.getData().getInt("x"), msg.getData().getInt("y"));
+ //buttonCallback(mButtonCallbackID, 1, 1, msg.getData().getInt("x"), msg.getData().getInt("y"));
break;
case CLB_COUNTRY_CHOOSER:
break;
case CLB_LOAD_MAP:
- CallbackMessageChannel(6, msg.getData().getString(("title")));
+ callbackMessageChannel(6, msg.getData().getString(("title")));
break;
case CLB_DELETE_MAP:
- File toDelete = new File(msg.getData().getString(("title")));
- toDelete.delete();
- //fallthrough
+ //unload map before deleting it !!!
+ callbackMessageChannel(7, msg.getData().getString(("title")));
+ //remove commentlines below after testing
+ //File toDelete = new File(msg.getData().getString(("title")));
+ //toDelete.delete();
+ NavitUtils.removeFileIfExists(msg.getData().getString(("title")));
+ break;
case CLB_UNLOAD_MAP:
- CallbackMessageChannel(7, msg.getData().getString(("title")));
+ callbackMessageChannel(7, msg.getData().getString(("title")));
break;
+ case CLB_REDRAW:
+ default:
+ Log.d(TAG, "Unhandled callback : " + msg_values[msg.what]);
}
}
- };
+ }
+
- public native void SizeChangedCallback(int id, int x, int y);
+ private native void sizeChangedCallback(long id, int x, int y);
- public native void PaddingChangedCallback(int id, int left, int right, int top, int bottom);
+ private native void paddingChangedCallback(long id, int left, int top, int right, int bottom);
- public native void KeypressCallback(int id, String s);
+ private native void keypressCallback(long id, String s);
- public native int CallbackMessageChannel(int i, String s);
+ private static native int callbackMessageChannel(int i, String s);
- public native void ButtonCallback(int id, int pressed, int button, int x, int y);
+ private native void buttonCallback(long id, int pressed, int button, int x, int y);
- public native void MotionCallback(int id, int x, int y);
+ private native void motionCallback(long id, int x, int y);
- public native String GetDefaultCountry(int id, String s);
+ private native String getCoordForPoint(int x, int y, boolean absolutCoord);
- public static native String[][] GetAllCountries();
+ static native String[][] getAllCountries();
- private Canvas draw_canvas;
- private Bitmap draw_bitmap;
- private int SizeChangedCallbackID;
- private int PaddingChangedCallbackID;
- private int ButtonCallbackID;
- private int MotionCallbackID;
- private int KeypressCallbackID;
+ private Canvas mDrawCanvas;
+ private Bitmap mDrawBitmap;
+ private long mSizeChangedCallbackID;
+ private long mPaddingChangedCallbackID;
+ private long mButtonCallbackID;
+ private long mMotionCallbackID;
+ private long mKeypressCallbackID;
/**
- * @brief Adjust views used to tint navigation and status bars.
+ * Adjust views used to tint navigation and status bars.
*
- * This method is called from handleResize.
+ * <p>This method is called from handleResize.
*
* It (re-)evaluates if and where the navigation bar is going to be shown, and calculates the
- * padding for objects which should not be obstructed.
+ * padding for objects which should not be obstructed.</p>
*
*/
private void adjustSystemBarsTintingViews() {
+
/* hide tint bars during update to prevent ugly effects */
- leftTintView.setVisibility(View.GONE);
- rightTintView.setVisibility(View.GONE);
- topTintView.setVisibility(View.GONE);
- bottomTintView.setVisibility(View.GONE);
+ mLeftTintView.setVisibility(View.GONE);
+ mRightTintView.setVisibility(View.GONE);
+ mTopTintView.setVisibility(View.GONE);
+ mBottomTintView.setVisibility(View.GONE);
- frameLayout.post(new Runnable() {
+ mFrameLayout.post(new Runnable() {
@Override
public void run() {
- FrameLayout.LayoutParams leftLayoutParams = new FrameLayout.LayoutParams(padding_left,
+ FrameLayout.LayoutParams leftLayoutParams = new FrameLayout.LayoutParams(mPaddingLeft,
LayoutParams.MATCH_PARENT, Gravity.BOTTOM | Gravity.LEFT);
- leftTintView.setLayoutParams(leftLayoutParams);
+ mLeftTintView.setLayoutParams(leftLayoutParams);
- FrameLayout.LayoutParams rightLayoutParams = new FrameLayout.LayoutParams(padding_right,
+ FrameLayout.LayoutParams rightLayoutParams = new FrameLayout.LayoutParams(mPaddingRight,
LayoutParams.MATCH_PARENT, Gravity.BOTTOM | Gravity.RIGHT);
- rightTintView.setLayoutParams(rightLayoutParams);
+ mRightTintView.setLayoutParams(rightLayoutParams);
FrameLayout.LayoutParams topLayoutParams = new FrameLayout.LayoutParams(LayoutParams.MATCH_PARENT,
- padding_top, Gravity.TOP);
+ mPaddingTop, Gravity.TOP);
/* Prevent horizontal and vertical tint views from overlapping */
- topLayoutParams.setMargins(padding_left, 0, padding_right, 0);
- topTintView.setLayoutParams(topLayoutParams);
+ topLayoutParams.setMargins(mPaddingLeft, 0, mPaddingRight, 0);
+ mTopTintView.setLayoutParams(topLayoutParams);
FrameLayout.LayoutParams bottomLayoutParams = new FrameLayout.LayoutParams(LayoutParams.MATCH_PARENT,
- padding_bottom, Gravity.BOTTOM);
+ mPaddingBottom, Gravity.BOTTOM);
/* Prevent horizontal and vertical tint views from overlapping */
- bottomLayoutParams.setMargins(padding_left, 0, padding_right, 0);
- bottomTintView.setLayoutParams(bottomLayoutParams);
+ bottomLayoutParams.setMargins(mPaddingLeft, 0, mPaddingRight, 0);
+ mBottomTintView.setLayoutParams(bottomLayoutParams);
/* show tint bars again */
- leftTintView.setVisibility(View.VISIBLE);
- rightTintView.setVisibility(View.VISIBLE);
- topTintView.setVisibility(View.VISIBLE);
- bottomTintView.setVisibility(View.VISIBLE);
+ mLeftTintView.setVisibility(View.VISIBLE);
+ mRightTintView.setVisibility(View.VISIBLE);
+ mTopTintView.setVisibility(View.VISIBLE);
+ mBottomTintView.setVisibility(View.VISIBLE);
}
});
- PaddingChangedCallback(PaddingChangedCallbackID, padding_left, padding_top, padding_right, padding_bottom);
+ paddingChangedCallback(mPaddingChangedCallbackID, mPaddingLeft, mPaddingTop, mPaddingRight, mPaddingBottom);
}
/**
- * @brief Handles resize events.
- *
- * This method is called whenever the main View is resized in any way. This is the case when its
- * {@code onSizeChanged()} event handler fires or when toggling Fullscreen mode.
+ * Handles resize events.
*
+ * <p>This method is called whenever the main View is resized in any way. This is the case when its
+ * {@code onSizeChanged()} event handler fires.</p>
*/
- @TargetApi(23)
- public void handleResize(int w, int h) {
- if (this.parent_graphics != null) {
- this.parent_graphics.handleResize(w, h);
- } else {
+ private void handleResize(int w, int h) {
+ if (this.mParentGraphics == null) {
Log.d(TAG, String.format("handleResize w=%d h=%d", w, h));
-
- if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
- /*
- * On API 23+ we can query window insets to determine the area which is obscured by the system bars.
- * This appears to have a bug, though, causing an inset to be reported for the navigation bar even
- * when it is not obstructing the window. Therefore, we are relying on the values previously obtained
- * by NavitView#onApplyWindowInsets(), though this is affected by a different bug. Luckily, the two
- * bugs appear to be complementary, allowing us to mix and match results.
- */
- if (view == null) {
- Log.w(TAG, "view is null, cannot update padding");
- } else {
- Log.d(TAG, String.format("view w=%d h=%d x=%.0f y=%.0f",
- view.getWidth(), view.getHeight(), view.getX(), view.getY()));
- if (view.getRootWindowInsets() == null)
- Log.w(TAG, "No root window insets, cannot update padding");
- else {
- Log.d(TAG, String.format("RootWindowInsets left=%d right=%d top=%d bottom=%d",
- view.getRootWindowInsets().getSystemWindowInsetLeft(),
- view.getRootWindowInsets().getSystemWindowInsetRight(),
- view.getRootWindowInsets().getSystemWindowInsetTop(),
- view.getRootWindowInsets().getSystemWindowInsetBottom()));
- padding_top = view.getRootWindowInsets().getSystemWindowInsetTop();
- }
+ if (mTinting) {
+ if (Build.VERSION.SDK_INT == Build.VERSION_CODES.KITKAT) {
+ resizePaddingKitkat();
}
- } else if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT_WATCH) {
- /*
- * API 20-22 do not support root window insets, forcing us to make an educated guess about the
- * navigation bar height:
- *
- * The size is a platform default and does not change with rotation, but we have to figure out if it
- * applies, i.e. if the status bar is visible.
- *
- * The status bar is always visible unless we are in fullscreen mode. (Fortunately, none of the
- * versions affected by this support split screen mode, which would have further complicated things.)
- */
- if (activity.isFullscreen)
- padding_top = 0;
- else {
- Resources resources = view.getResources();
- int shid = resources.getIdentifier("status_bar_height", "dimen", "android");
- padding_top = (shid > 0) ? resources.getDimensionPixelSize(shid) : 0;
- }
- } else if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
- /*
- * API 19 does not support window insets at all, forcing us to do even more guessing than on API 20-22:
- *
- * All system bar sizes are platform defaults and do not change with rotation, but we have
- * to figure out which ones apply.
- *
- * Status bar visibility is as on API 20-22.
- *
- * The navigation bar is shown on devices that report they have no physical menu button. This seems to
- * work even on devices that allow disabling the physical buttons (and use the navigation bar, in which
- * case they report no physical menu button is available; tested with a OnePlus One running CyanogenMod).
- *
- * If shown, the navigation bar may appear on the side or at the bottom. The logic to determine this is
- * taken from AOSP RenderSessionImpl.findNavigationBar()
- * platform/frameworks/base/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
- */
- Resources resources = view.getResources();
- int shid = resources.getIdentifier("status_bar_height", "dimen", "android");
- int adhid = resources.getIdentifier("action_bar_default_height", "dimen", "android");
- int nhid = resources.getIdentifier("navigation_bar_height", "dimen", "android");
- int nhlid = resources.getIdentifier("navigation_bar_height_landscape", "dimen", "android");
- int nwid = resources.getIdentifier("navigation_bar_width", "dimen", "android");
- int status_bar_height = (shid > 0) ? resources.getDimensionPixelSize(shid) : 0;
- int action_bar_default_height = (adhid > 0) ? resources.getDimensionPixelSize(adhid) : 0;
- int navigation_bar_height = (nhid > 0) ? resources.getDimensionPixelSize(nhid) : 0;
- int navigation_bar_height_landscape = (nhlid > 0) ? resources.getDimensionPixelSize(nhlid) : 0;
- int navigation_bar_width = (nwid > 0) ? resources.getDimensionPixelSize(nwid) : 0;
- Log.d(TAG, String.format(
- "status_bar_height=%d, action_bar_default_height=%d, navigation_bar_height=%d, "
- + "navigation_bar_height_landscape=%d, navigation_bar_width=%d",
- status_bar_height, action_bar_default_height, navigation_bar_height,
- navigation_bar_height_landscape, navigation_bar_width));
-
- if (activity == null) {
- Log.w(TAG, "Main Activity is not a Navit instance, cannot update padding");
- } else if (frameLayout != null) {
- /* frameLayout is only created on platforms supporting navigation and status bar tinting */
-
- Navit navit = activity;
- boolean isStatusShowing = !navit.isFullscreen;
- boolean isNavShowing = !ViewConfigurationCompat.hasPermanentMenuKey(ViewConfiguration.get(navit));
- Log.d(TAG, String.format("isStatusShowing=%b isNavShowing=%b", isStatusShowing, isNavShowing));
-
- boolean isLandscape = (navit.getResources().getConfiguration().orientation
- == Configuration.ORIENTATION_LANDSCAPE);
- boolean isNavAtBottom = (!isLandscape)
- || (navit.getResources().getConfiguration().smallestScreenWidthDp >= 600);
- Log.d(TAG, String.format("isNavAtBottom=%b (Configuration.smallestScreenWidthDp=%d, isLandscape=%b)",
- isNavAtBottom, navit.getResources().getConfiguration().smallestScreenWidthDp, isLandscape));
-
- padding_left = 0;
- padding_top = isStatusShowing ? status_bar_height : 0;
- padding_right = (isNavShowing && !isNavAtBottom) ? navigation_bar_width : 0;
- padding_bottom = (!(isNavShowing && isNavAtBottom)) ? 0 : (
- isLandscape ? navigation_bar_height_landscape : navigation_bar_height);
- }
- } else {
- /* API 18 and below does not support drawing under the system bars, padding is 0 all around */
- padding_left = 0;
- padding_right = 0;
- padding_top = 0;
- padding_bottom = 0;
+ adjustSystemBarsTintingViews(); // is incl paddingchangedcallback
}
+ }
+ }
- Log.d(TAG, String.format("Padding left=%d top=%d right=%d bottom=%d",
- padding_left, padding_top, padding_right, padding_bottom));
-
- adjustSystemBarsTintingViews();
- draw_bitmap = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888);
- draw_canvas = new Canvas(draw_bitmap);
- bitmap_w = w;
- bitmap_h = h;
- SizeChangedCallback(SizeChangedCallbackID, w, h);
+ @RequiresApi(api = Build.VERSION_CODES.KITKAT)
+ private void resizePaddingKitkat() {
+ /*
+ * API 19 does not support window insets.
+ *
+ * All system bar sizes are device defaults and do not change with rotation, but we have
+ * to figure out which ones apply.
+ *
+ * Status bar visibility is as on API 20-22.
+ *
+ * The navigation bar is shown on devices that report they have no physical menu button. This seems to
+ * work even on devices that allow disabling the physical buttons (and use the navigation bar, in which
+ * case they report no physical menu button is available; tested with a OnePlus One running CyanogenMod)
+ *
+ * If shown, the navigation bar may appear on the side or at the bottom. The logic to determine this is
+ * taken from AOSP RenderSessionImpl.findNavigationBar()
+ * platform/frameworks/base/tools/layoutlib/bridge/src/com/android/
+ * layoutlib/bridge/impl/RenderSessionImpl.java
+ */
+ mPaddingLeft = 0;
+ if (!sInMap) {
+ mPaddingTop = 0;
+ mPaddingRight = 0;
+ mPaddingBottom = 0;
+ return;
}
+ Resources resources = NavitAppConfig.sResources;
+ int shid = resources.getIdentifier("status_bar_height", "dimen", "android");
+ int nhid = resources.getIdentifier("navigation_bar_height", "dimen", "android");
+ int nhlid = resources.getIdentifier("navigation_bar_height_landscape", "dimen", "android");
+ int nwid = resources.getIdentifier("navigation_bar_width", "dimen", "android");
+ int statusBarHeight = (shid > 0) ? resources.getDimensionPixelSize(shid) : 0;
+ int navigationBarHeight = (nhid > 0) ? resources.getDimensionPixelSize(nhid) : 0;
+ int navigationBarHeightLandscape = (nhlid > 0) ? resources.getDimensionPixelSize(nhlid) : 0;
+ int navigationBarWidth = (nwid > 0) ? resources.getDimensionPixelSize(nwid) : 0;
+ Log.v(TAG, String.format("statusBarHeight=%d, navigationBarHeight=%d, "
+ + "navigationBarHeightLandscape=%d, navigationBarWidth=%d",
+ statusBarHeight, navigationBarHeight,
+ navigationBarHeightLandscape, navigationBarWidth));
+ boolean isStatusShowing = !mActivity.mIsFullscreen;
+ boolean isNavShowing = !ViewConfigurationCompat.hasPermanentMenuKey(ViewConfiguration.get(mActivity));
+ Log.v(TAG, String.format("isStatusShowing=%b isNavShowing=%b", isStatusShowing, isNavShowing));
+ boolean isLandscape = (mActivity.getResources().getConfiguration().orientation
+ == Configuration.ORIENTATION_LANDSCAPE);
+ boolean isNavAtBottom = (!isLandscape)
+ || (mActivity.getResources().getConfiguration().smallestScreenWidthDp >= 600);
+ Log.v(TAG, String.format("isNavAtBottom=%b (Config.smallestScreenWidthDp=%d, isLandscape=%b)",
+ isNavAtBottom, mActivity.getResources().getConfiguration().smallestScreenWidthDp, isLandscape));
+
+ mPaddingTop = isStatusShowing ? statusBarHeight : 0;
+ mPaddingRight = (isNavShowing && !isNavAtBottom) ? navigationBarWidth : 0;
+ mPaddingBottom = (!(isNavShowing && isNavAtBottom)) ? 0 : (
+ isLandscape ? navigationBarHeightLandscape : navigationBarHeight);
}
+
/**
- * @brief Returns whether the device has a hardware menu button.
+ * Returns whether the device has a hardware menu button.
*
- * Only Android versions starting with ICS (API version 14) support the API call to detect the presence of a
+ * <p>Only Android versions starting with ICS (API version 14) support the API call to detect the presence of a
* Menu button. On earlier Android versions, the following assumptions will be made: On API levels up to 10,
* this method will always return {@code true}, as these Android versions relied on devices having a physical
* Menu button. On API levels 11 through 13 (Honeycomb releases), this method will always return
- * {@code false}, as Honeycomb was a tablet-only release and did not require devices to have a Menu button.
+ * {@code false}, as Honeycomb was a tablet-only release and did not require devices to have a Menu button.</p>
*
- * Note that this method is not aware of non-standard mechanisms on some customized builds of Android. For
- * example, CyanogenMod has an option to add a menu button to the navigation bar. Even with that option,
- * this method will still return `false`.
+ * <p>Note that this method is not aware of non-standard mechanisms on some customized builds of Android</p>
*/
- public boolean hasMenuButton() {
+ boolean hasMenuButton() {
if (Build.VERSION.SDK_INT <= 10) {
return true;
} else {
if (Build.VERSION.SDK_INT <= 13) {
return false;
} else {
- return ViewConfiguration.get(activity.getApplication()).hasPermanentMenuKey();
+ return ViewConfiguration.get(mActivity.getApplication()).hasPermanentMenuKey();
}
}
}
- public void setSizeChangedCallback(int id) {
- SizeChangedCallbackID = id;
+ void setSizeChangedCallback(long id) {
+ mSizeChangedCallbackID = id;
}
- public void setPaddingChangedCallback(int id) {
- PaddingChangedCallbackID = id;
+ void setPaddingChangedCallback(long id) {
+ mPaddingChangedCallbackID = id;
}
- public void setButtonCallback(int id) {
- ButtonCallbackID = id;
+ void setButtonCallback(long id) {
+ Log.v(TAG,"set Buttononcallback");
+ mButtonCallbackID = id;
}
- public void setMotionCallback(int id) {
- MotionCallbackID = id;
- if (activity != null) {
- activity.setMotionCallback(id, this);
- }
+ void setMotionCallback(long id) {
+ mMotionCallbackID = id;
+ Log.v(TAG,"set Motioncallback");
}
- public void setKeypressCallback(int id) {
- KeypressCallbackID = id;
- // set callback id also in main intent (for menus)
- if (activity != null) {
- activity.setKeypressCallback(id, this);
- }
+ void setKeypressCallback(long id) {
+ Log.v(TAG,"set Keypresscallback");
+ mKeypressCallbackID = id;
}
@@ -1008,7 +895,7 @@ public class NavitGraphics {
path.lineTo(c[i], c[i + 1]);
}
//global_path.close();
- draw_canvas.drawPath(path, paint);
+ mDrawCanvas.drawPath(path, paint);
paint.setPathEffect(null);
}
@@ -1024,7 +911,7 @@ public class NavitGraphics {
path.lineTo(c[i], c[i + 1]);
}
//global_path.close();
- draw_canvas.drawPath(path, paint);
+ mDrawCanvas.drawPath(path, paint);
}
protected void draw_rectangle(Paint paint, int x, int y, int w, int h) {
@@ -1032,12 +919,12 @@ public class NavitGraphics {
paint.setStyle(Paint.Style.FILL);
paint.setAntiAlias(true);
//paint.setStrokeWidth(0);
- draw_canvas.drawRect(r, paint);
+ mDrawCanvas.drawRect(r, paint);
}
protected void draw_circle(Paint paint, int x, int y, int r) {
paint.setStyle(Paint.Style.STROKE);
- draw_canvas.drawCircle(x, y, r / 2, paint);
+ mDrawCanvas.drawCircle(x, y, r / 2, paint);
}
protected void draw_text(Paint paint, int x, int y, String text, int size, int dx, int dy, int bgcolor) {
@@ -1059,27 +946,27 @@ public class NavitGraphics {
paint.setColor(bgcolor);
paint.setStyle(Paint.Style.STROKE);
if (path == null) {
- draw_canvas.drawText(text, x, y, paint);
+ mDrawCanvas.drawText(text, x, y, paint);
} else {
- draw_canvas.drawTextOnPath(text, path, 0, 0, paint);
+ mDrawCanvas.drawTextOnPath(text, path, 0, 0, paint);
}
paint.setStyle(Paint.Style.FILL);
paint.setColor(oldcolor);
}
if (path == null) {
- draw_canvas.drawText(text, x, y, paint);
+ mDrawCanvas.drawText(text, x, y, paint);
} else {
- draw_canvas.drawTextOnPath(text, path, 0, 0, paint);
+ mDrawCanvas.drawTextOnPath(text, path, 0, 0, paint);
}
paint.clearShadowLayer();
}
protected void draw_image(Paint paint, int x, int y, Bitmap bitmap) {
- draw_canvas.drawBitmap(bitmap, x, y, null);
+ mDrawCanvas.drawBitmap(bitmap, x, y, null);
}
- /* takes an image and draws it on the screen as a prerendered maptile
+ /* takes an image and draws it on the screen as a prerendered maptile.
*
*
*
@@ -1116,56 +1003,82 @@ public class NavitGraphics {
matrix.preScale(scale, scale);
matrix.postTranslate(p0x, p0y);
matrix.postRotate(angle, p0x, p0y);
- draw_canvas.drawBitmap(bitmap, matrix, paint);
+ mDrawCanvas.drawBitmap(bitmap, matrix, paint);
}
}
/* 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 = 0;
+ private static final int DRAW_MODE_END = 1;
+ /* Used by the pedestrian plugin, draws without a mapbackground */
+ private static final int DRAW_MODE_BEGIN_CLEAR = 2;
protected void draw_mode(int mode) {
- if (mode == draw_mode_end) {
- if (parent_graphics == null) {
- view.invalidate();
+ if (mode == DRAW_MODE_END) {
+ if (mParentGraphics == null) {
+ mView.invalidate();
} else {
- parent_graphics.view.invalidate(get_rect());
+ mParentGraphics.mView.invalidate(get_rect());
}
}
- if (mode == draw_mode_begin && parent_graphics != null) {
- draw_bitmap.eraseColor(0);
+ if (mode == DRAW_MODE_BEGIN_CLEAR || (mode == DRAW_MODE_BEGIN && mParentGraphics != null)) {
+ mDrawBitmap.eraseColor(0);
}
}
protected void draw_drag(int x, int y) {
- pos_x = x;
- pos_y = y;
+ mPosX = x;
+ mPosY = y;
}
protected void overlay_disable(int disable) {
- Log.d(TAG,"overlay_disable: " + disable + "Parent: " + (parent_graphics != null));
+ Log.v(TAG,"overlay_disable: " + disable + ", Parent: " + (mParentGraphics != null));
// assume we are NOT in map view mode!
- if (parent_graphics == null) {
- in_map = (disable == 0);
+ // but this backfires when dragging the map
+ if (mParentGraphics == null) {
+ sInMap = (disable == 0);
+ workAroundForGuiInternal(sInMap);
}
- if (overlay_disabled != disable) {
- overlay_disabled = disable;
- if (parent_graphics != null) {
- parent_graphics.view.invalidate(get_rect());
+ if (mOverlayDisabled != disable) {
+ mOverlayDisabled = disable;
+ if (mParentGraphics != null) {
+ mParentGraphics.mView.invalidate(get_rect());
}
}
}
- protected void overlay_resize(int x, int y, int w, int h, int wraparound) {
- draw_bitmap = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888);
- bitmap_w = w;
- bitmap_h = h;
- pos_x = x;
- pos_y = y;
- pos_wraparound = wraparound;
- draw_canvas.setBitmap(draw_bitmap);
+ private void workAroundForGuiInternal(Boolean inMap) {
+ if (!mTinting) {
+ return;
+ }
+ Log.v(TAG,"workaround gui internal");
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && !inMap) {
+ mActivity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+ return;
+ }
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+ mActivity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+ return;
+ }
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && !inMap) {
+ mActivity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+ mActivity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
+ return;
+ }
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+ mActivity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+ mActivity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
+ }
}
- public static native String CallbackLocalizedString(String s);
+ protected void overlay_resize(int x, int y, int w, int h, int wraparound) {
+ mDrawBitmap = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888);
+ mBitmapWidth = w;
+ mBitmapHeight = h;
+ mPosX = x;
+ mPosY = y;
+ mPosWraparound = wraparound;
+ mDrawCanvas.setBitmap(mDrawBitmap);
+ }
}
View Lorry Controller Status