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

[android] Fixed 24/12 hour time format in routing information

Browse source
This commit is contained in:
Roman Romanov 2017-03-16 16:57:32 +04:00
parent c8d09d4c30
commit d95ac250fe
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
android/src/com/mapswithme/maps/routing/NavigationController.java
View file

@ -30,6 +30,7 @@ import com.mapswithme.util.statistics.AlohaHelper;
import com.mapswithme.util.statistics.Statistics;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.concurrent.TimeUnit;
@ -281,8 +282,11 @@ public class NavigationController implements TrafficManager.TrafficCallback
{
final Calendar currentTime = Calendar.getInstance();
currentTime.add(Calendar.SECOND, seconds);
UiUtils.setTextAndShow(mTimeMinuteValue, DateFormat.getTimeInstance(DateFormat.SHORT)
.format(currentTime.getTime()));
final DateFormat timeFormat12 = new SimpleDateFormat("hh:mm a");
final DateFormat timeFormat24 = new SimpleDateFormat("HH:mm");
boolean is24Format = android.text.format.DateFormat.is24HourFormat(mTimeMinuteValue.getContext());
UiUtils.setTextAndShow(mTimeMinuteValue, is24Format ? timeFormat24.format(currentTime.getTime())
: timeFormat12.format(currentTime.getTime()));
UiUtils.hide(mTimeHourUnits, mTimeHourValue, mTimeMinuteUnits);
}