Merge "Add HideNonSystemOverlayMixin for SpaActivity" into main

This commit is contained in:
Chaohui Wang
2023-12-11 03:31:56 +00:00
committed by Android (Google) Code Review

View File

@@ -18,9 +18,11 @@ package com.android.settings.spa
import android.content.Context
import android.content.Intent
import android.os.Bundle
import android.util.Log
import androidx.annotation.VisibleForTesting
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.common.SettingsPage
import com.android.settingslib.spa.framework.util.SESSION_BROWSE
@@ -31,6 +33,11 @@ class SpaActivity : BrowseActivity() {
override fun isPageEnabled(page: SettingsPage) =
super.isPageEnabled(page) && !isSuwAndPageBlocked(page.sppName)
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
lifecycle.addObserver(HideNonSystemOverlayMixin(this))
}
companion object {
private const val TAG = "SpaActivity"