Merge code

This commit is contained in:
2022-04-18 02:32:15 +08:00
parent 18064d7cac
commit ffdaa233f7

View File

@@ -37,12 +37,12 @@ class PreferenceActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
title = "PreferenceFragment" title = "PreferenceFragment"
supportActionBar?.setDisplayHomeAsUpEnabled(true)
if (savedInstanceState == null) if (savedInstanceState == null)
supportFragmentManager supportFragmentManager
.beginTransaction() .beginTransaction()
.replace(android.R.id.content, SettingsFragment()) .replace(android.R.id.content, SettingsFragment())
.commitAllowingStateLoss() .commitAllowingStateLoss()
supportActionBar?.setDisplayHomeAsUpEnabled(true)
} }
override fun onSupportNavigateUp(): Boolean { override fun onSupportNavigateUp(): Boolean {