From 61ad72ab6cb7f2df136268b93e604d027bc273c2 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 29 Apr 2018 15:11:57 -0400 Subject: [PATCH] #1090 - Respect 24 hour time setting when changing time for auto night mode --- .../src/main/java/feature/settings/SettingsActivity.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/presentation/src/main/java/feature/settings/SettingsActivity.kt b/presentation/src/main/java/feature/settings/SettingsActivity.kt index b8fddedc..d9c4109c 100644 --- a/presentation/src/main/java/feature/settings/SettingsActivity.kt +++ b/presentation/src/main/java/feature/settings/SettingsActivity.kt @@ -22,6 +22,7 @@ import android.app.ProgressDialog import android.app.TimePickerDialog import android.os.Bundle import android.support.design.widget.Snackbar +import android.text.format.DateFormat import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.BuildConfig import com.moez.QKSMS.R @@ -143,13 +144,13 @@ class SettingsActivity : QkThemedActivity(), SettingsView { override fun showStartTimePicker(hour: Int, minute: Int) { TimePickerDialog(this, TimePickerDialog.OnTimeSetListener { _, newHour, newMinute -> startTimeSelectedIntent.onNext(Pair(newHour, newMinute)) - }, hour, minute, false).show() + }, hour, minute, DateFormat.is24HourFormat(this)).show() } override fun showEndTimePicker(hour: Int, minute: Int) { TimePickerDialog(this, TimePickerDialog.OnTimeSetListener { _, newHour, newMinute -> endTimeSelectedIntent.onNext(Pair(newHour, newMinute)) - }, hour, minute, false).show() + }, hour, minute, DateFormat.is24HourFormat(this)).show() } override fun showTextSizePicker() = textSizeDialog.show(this)