From 2f0944035516f2d932be09fb7dff9ca95ebdb9ba Mon Sep 17 00:00:00 2001
From: Anton Chekulaev <metaphore@bk.ru>
Date: Wed, 19 Aug 2020 13:38:49 +1000
Subject: [PATCH] Merge fixes.
---
.../securesms/loki/activities/SettingsActivity.kt | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt
index aa9e5b7fd9..72ec815eca 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt
@@ -11,11 +11,11 @@ import android.os.AsyncTask
import android.os.Bundle
import android.os.Handler
import android.os.Looper
-import android.support.v7.app.AppCompatDelegate
import android.view.View
import android.view.inputmethod.InputMethodManager
import android.widget.LinearLayout
import android.widget.Toast
+import androidx.appcompat.app.AppCompatDelegate
import kotlinx.android.synthetic.main.activity_settings.*
import network.loki.messenger.BuildConfig
import network.loki.messenger.R
@@ -115,9 +115,10 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
return themeFlag == Configuration.UI_MODE_NIGHT_YES;
}
+ //TODO Remove it.
private fun setDarkTheme(darkTheme: Boolean) {
// AppCompatDelegate.setDefaultNightMode(if (darkTheme) AppCompatDelegate.MODE_NIGHT_YES else AppCompatDelegate.MODE_NIGHT_NO )
- AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_AUTO)
+ AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
}
public override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {