Merge "Add HideNonSystemOverlayMixin for SpaActivity" into main
This commit is contained in:
@@ -18,9 +18,11 @@ package com.android.settings.spa
|
|||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
|
import android.os.Bundle
|
||||||
import android.util.Log
|
import android.util.Log
|
||||||
import androidx.annotation.VisibleForTesting
|
import androidx.annotation.VisibleForTesting
|
||||||
import com.android.settings.spa.app.appinfo.AppInfoSettingsProvider
|
import com.android.settings.spa.app.appinfo.AppInfoSettingsProvider
|
||||||
|
import com.android.settingslib.core.lifecycle.HideNonSystemOverlayMixin
|
||||||
import com.android.settingslib.spa.framework.BrowseActivity
|
import com.android.settingslib.spa.framework.BrowseActivity
|
||||||
import com.android.settingslib.spa.framework.common.SettingsPage
|
import com.android.settingslib.spa.framework.common.SettingsPage
|
||||||
import com.android.settingslib.spa.framework.util.SESSION_BROWSE
|
import com.android.settingslib.spa.framework.util.SESSION_BROWSE
|
||||||
@@ -31,6 +33,11 @@ class SpaActivity : BrowseActivity() {
|
|||||||
override fun isPageEnabled(page: SettingsPage) =
|
override fun isPageEnabled(page: SettingsPage) =
|
||||||
super.isPageEnabled(page) && !isSuwAndPageBlocked(page.sppName)
|
super.isPageEnabled(page) && !isSuwAndPageBlocked(page.sppName)
|
||||||
|
|
||||||
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
|
super.onCreate(savedInstanceState)
|
||||||
|
lifecycle.addObserver(HideNonSystemOverlayMixin(this))
|
||||||
|
}
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
private const val TAG = "SpaActivity"
|
private const val TAG = "SpaActivity"
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user