Merge pull request #2535 from yunikkk/routing-slot-empty

[android] Fixed empty routing slot.
This commit is contained in:
Alexander Marchuk 2016-03-25 21:12:11 +03:00
commit 218762dc4f

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);
}