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

Commit 91cf3c22 authored by Zekan Qian's avatar Zekan Qian Committed by Android (Google) Code Review
Browse files

Merge "Move Slice code to spa/slice folder & add tests."

parents e7583641 e63c91cc

packages/SettingsLib/Spa/gallery/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
            android:exported="false">

        </provider>



        <provider android:name="com.android.settingslib.spa.framework.SpaSliceProvider"

        <provider android:name="com.android.settingslib.spa.slice.SpaSliceProvider"

            android:authorities="com.android.spa.gallery.slice.provider"

            android:exported="true" >

            <intent-filter>
@@ -52,7 +52,7 @@ 
        </provider>



        <receiver

            android:name="com.android.settingslib.spa.framework.SpaSliceBroadcastReceiver"

            android:name="com.android.settingslib.spa.slice.SpaSliceBroadcastReceiver"

            android:exported="false">

        </receiver>

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

+5 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.settingslib.spa.gallery



import android.content.Context

import com.android.settingslib.spa.framework.SpaSliceBroadcastReceiver

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

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

import com.android.settingslib.spa.framework.common.SpaEnvironment
@@ -39,6 +38,7 @@ import com.android.settingslib.spa.gallery.preference.SwitchPreferencePageProvid 
import com.android.settingslib.spa.gallery.preference.TwoTargetSwitchPreferencePageProvider

import com.android.settingslib.spa.gallery.ui.CategoryPageProvider

import com.android.settingslib.spa.gallery.ui.SpinnerPageProvider

import com.android.settingslib.spa.slice.SpaSliceBroadcastReceiver



/**

 * Enum to define all SPP name here.
@@ -81,9 +81,12 @@ class GallerySpaEnvironment(context: Context) : SpaEnvironment(context) { 
        )

    }



    override val logger = LocalLogger()



    override val browseActivityClass = GalleryMainActivity::class.java

    override val sliceBroadcastReceiverClass = SpaSliceBroadcastReceiver::class.java



    // For debugging

    override val searchProviderAuthorities = "com.android.spa.gallery.search.provider"

    override val sliceProviderAuthorities = "com.android.spa.gallery.slice.provider"

    override val logger = LocalLogger()

}

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SpaEnvironment.kt

+4 −1
Original line number Diff line number Diff line
@@ -70,11 +70,14 @@ abstract class SpaEnvironment(context: Context) { 
    // In Robolectric test, applicationContext is not available. Use context as fallback.

    val appContext: Context = context.applicationContext ?: context



    open val logger: SpaLogger = object : SpaLogger {}



    open val browseActivityClass: Class<out Activity>? = null

    open val sliceBroadcastReceiverClass: Class<out BroadcastReceiver>? = null



    // Specify provider authorities for debugging purpose.

    open val searchProviderAuthorities: String? = null

    open val sliceProviderAuthorities: String? = null

    open val logger: SpaLogger = object : SpaLogger {}



    // TODO: add other environment setup here.

}

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/SpaSliceBroadcastReceiver.kt→packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/slice/SpaSliceBroadcastReceiver.kt

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.settingslib.spa.framework

package com.android.settingslib.spa.slice



import android.content.BroadcastReceiver

import android.content.Context

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/SpaSliceProvider.kt→packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/slice/SpaSliceProvider.kt

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.settingslib.spa.framework

package com.android.settingslib.spa.slice



import android.net.Uri

import android.util.Log