mnalis/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Fixed empty text in routing slot when MapObject has no title.

Browse source
This commit is contained in:
Dmitry Yunitsky 2016-03-25 18:23:07 +03:00
parent a7da17fecb
commit de732bc2b8
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
android/src/com/mapswithme/maps/routing/SlotFrame.java
View file

@ -7,6 +7,7 @@ import android.graphics.Rect;
import android.os.Build;
import android.support.annotation.IdRes;
import android.support.annotation.NonNull;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.View;
@ -99,7 +100,7 @@ public class SlotFrame extends LinearLayout
if (MapObject.isOfType(MapObject.MY_POSITION, mMapObject))
mText.setText(R.string.p2p_your_location);
else
mText.setText(mMapObject.getTitle());
mText.setText(!TextUtils.isEmpty(mMapObject.getTitle()) ? mMapObject.getTitle() : mMapObject.getSubtitle());
mText.setTextColor(mTextColor);
}