Skip to content
Snippets Groups Projects
Verified Commit 8749a15f authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Fixes the icon in setup activities on Android Pie

parent 39250721
No related branches found
No related tags found
No related merge requests found
Pipeline #252 passed
......@@ -22,6 +22,7 @@ package de.kuschku.quasseldroid.ui.setup
import android.content.Context
import android.content.SharedPreferences
import android.content.pm.PackageManager
import android.os.Build
import android.os.Bundle
import android.os.Parcelable
import android.util.SparseArray
......@@ -131,8 +132,11 @@ abstract class ServiceBoundSetupActivity :
currentPage.value?.requestFocus()
}
fun updateRecentsHeader() =
fun updateRecentsHeader() {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
updateRecentsHeaderIfExisting(title.toString(), icon, recentsHeaderColor)
}
}
override fun setTitle(title: CharSequence?) {
super.setTitle(title)
......
......@@ -21,6 +21,7 @@ package de.kuschku.quasseldroid.ui.setup
import android.content.Context
import android.content.pm.PackageManager
import android.os.Build
import android.os.Bundle
import android.os.Parcelable
import android.util.SparseArray
......@@ -48,7 +49,6 @@ import de.kuschku.quasseldroid.util.helper.or
import de.kuschku.quasseldroid.util.helper.switchMap
import de.kuschku.quasseldroid.util.helper.updateRecentsHeaderIfExisting
import de.kuschku.quasseldroid.util.ui.LocaleHelper
abstract class SetupActivity : DaggerAppCompatActivity() {
@BindView(R.id.menu_view)
lateinit var menuView: ActionMenuView
......@@ -97,8 +97,11 @@ abstract class SetupActivity : DaggerAppCompatActivity() {
currentPage.value?.requestFocus()
}
fun updateRecentsHeader() =
fun updateRecentsHeader() {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
updateRecentsHeaderIfExisting(title.toString(), icon, recentsHeaderColor)
}
}
override fun setTitle(title: CharSequence?) {
super.setTitle(title)
......@@ -276,3 +279,4 @@ abstract class SetupActivity : DaggerAppCompatActivity() {
private const val resultKey = ":setupActivity:result"
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment