From 8749a15f0c894d1907a6557149ca9ada272abe1c Mon Sep 17 00:00:00 2001 From: Janne Koschinski <janne@kuschku.de> Date: Wed, 7 Nov 2018 22:56:30 +0100 Subject: [PATCH] Fixes the icon in setup activities on Android Pie --- .../quasseldroid/ui/setup/ServiceBoundSetupActivity.kt | 8 ++++++-- .../de/kuschku/quasseldroid/ui/setup/SetupActivity.kt | 10 +++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/ServiceBoundSetupActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/ServiceBoundSetupActivity.kt index d3b4ae05d..2f22b0124 100644 --- a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/ServiceBoundSetupActivity.kt +++ b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/ServiceBoundSetupActivity.kt @@ -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() = - updateRecentsHeaderIfExisting(title.toString(), icon, recentsHeaderColor) + fun updateRecentsHeader() { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) { + updateRecentsHeaderIfExisting(title.toString(), icon, recentsHeaderColor) + } + } override fun setTitle(title: CharSequence?) { super.setTitle(title) diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/SetupActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/SetupActivity.kt index 8f184dea6..27c791983 100644 --- a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/SetupActivity.kt +++ b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/SetupActivity.kt @@ -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() = - updateRecentsHeaderIfExisting(title.toString(), icon, recentsHeaderColor) + 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" } } + -- GitLab