Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1040882f authored by Chaohui Wang's avatar Chaohui Wang
Browse files

Create SpaEnvironment 

Make SettingsPageProviderRepository & SettingsEntryRepository defined as
Lazy, so it will not initialize when app start up.

Also move browseActivityClass & entryProviderAuthorities into the
SpaEnvironment.

Bug: 249028339
Test: Manual with Gallery App
Test: EntryRepo not shown in logcat when gallery start up
Test: EntryRepo only initialized once for debug activity
Change-Id: I1e2d5ff36a61e673b715e5f33c26dbbdcfb8b7cc
parent 29ddeab3

packages/SettingsLib/Spa/build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ buildscript { 
    }

}

plugins {

    id 'com.android.application' version '7.3.0-rc01' apply false

    id 'com.android.library' version '7.3.0-rc01' apply false

    id 'com.android.application' version '7.3.0' apply false

    id 'com.android.library' version '7.3.0' apply false

    id 'org.jetbrains.kotlin.android' version '1.6.10' apply false

}

packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/GalleryDebugActivity.kt

+1 −5
Original line number Diff line number Diff line
@@ -18,8 +18,4 @@ package com.android.settingslib.spa.gallery 


import com.android.settingslib.spa.framework.DebugActivity



class GalleryDebugActivity : DebugActivity(

    SpaEnvironment.EntryRepository,

    browseActivityClass = MainActivity::class.java,

    entryProviderAuthorities = "com.android.spa.gallery.provider",

)
 
class GalleryDebugActivity : DebugActivity(GallerySpaEnvironment)

packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/GalleryEntryProvider.kt

+1 −4
Original line number Diff line number Diff line
@@ -18,7 +18,4 @@ package com.android.settingslib.spa.gallery 


import com.android.settingslib.spa.framework.EntryProvider



class GalleryEntryProvider : EntryProvider(

    SpaEnvironment.EntryRepository,

    browseActivityClass = MainActivity::class.java,

)
 
class GalleryEntryProvider : EntryProvider(GallerySpaEnvironment)

packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/SpaEnvironment.kt→packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/GallerySpaEnvironment.kt

+5 −8
Original line number Diff line number Diff line
@@ -18,9 +18,9 @@ package com.android.settingslib.spa.gallery 


import android.os.Bundle

import androidx.navigation.NamedNavArgument

import com.android.settingslib.spa.framework.common.SettingsEntryRepository

import com.android.settingslib.spa.framework.common.SettingsPage

import com.android.settingslib.spa.framework.common.SettingsPageProviderRepository

import com.android.settingslib.spa.framework.common.SpaEnvironment

import com.android.settingslib.spa.gallery.button.ActionButtonPageProvider

import com.android.settingslib.spa.gallery.home.HomePageProvider

import com.android.settingslib.spa.gallery.page.ArgumentPageProvider
@@ -62,9 +62,8 @@ fun createSettingsPage( 
    )

}



object SpaEnvironment {

    val PageProviderRepository: SettingsPageProviderRepository by

    lazy(LazyThreadSafetyMode.SYNCHRONIZED) {

object GallerySpaEnvironment : SpaEnvironment() {

    override val pageProviderRepository = lazy {

        SettingsPageProviderRepository(

            allPageProviders = listOf(

                HomePageProvider,
@@ -88,9 +87,7 @@ object SpaEnvironment { 
        )

    }



    val EntryRepository: SettingsEntryRepository by lazy(LazyThreadSafetyMode.SYNCHRONIZED) {

        SettingsEntryRepository(PageProviderRepository)

    }

    override val browseActivityClass = MainActivity::class.java



    // TODO: add other environment setup here.

    override val entryProviderAuthorities = "com.android.spa.gallery.provider"

}

packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/MainActivity.kt

+1 −1
Original line number Diff line number Diff line
@@ -18,4 +18,4 @@ package com.android.settingslib.spa.gallery 


import com.android.settingslib.spa.framework.BrowseActivity



class MainActivity : BrowseActivity(SpaEnvironment.PageProviderRepository)
 
class MainActivity : BrowseActivity(GallerySpaEnvironment)