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

[android] changed 12 hour format pattern.

Browse source
This commit is contained in:
Roman Romanov 2017-03-17 08:50:45 +04:00
parent d95ac250fe
commit b10265a894
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -32,6 +32,7 @@ import com.mapswithme.util.statistics.Statistics;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Locale;
import java.util.concurrent.TimeUnit;
public class NavigationController implements TrafficManager.TrafficCallback
@ -282,8 +283,8 @@ public class NavigationController implements TrafficManager.TrafficCallback
{
final Calendar currentTime = Calendar.getInstance();
currentTime.add(Calendar.SECOND, seconds);
final DateFormat timeFormat12 = new SimpleDateFormat("hh:mm a");
final DateFormat timeFormat24 = new SimpleDateFormat("HH:mm");
final DateFormat timeFormat12 = new SimpleDateFormat("h:mm aa", Locale.getDefault());
final DateFormat timeFormat24 = new SimpleDateFormat("HH:mm", Locale.getDefault());
boolean is24Format = android.text.format.DateFormat.is24HourFormat(mTimeMinuteValue.getContext());
UiUtils.setTextAndShow(mTimeMinuteValue, is24Format ? timeFormat24.format(currentTime.getTime())
: timeFormat12.format(currentTime.getTime()));