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

Commit f6db01cc authored by Chaohui Wang's avatar Chaohui Wang Committed by Android (Google) Code Review
Browse files

Merge "Add EntryProvider in SettingsGoogle"

parents b84d28f4 f1fabd48

AndroidManifest.xml

+7 −5
Original line number Diff line number Diff line
@@ -4579,6 +4579,13 @@ 


        <activity android:name=".spa.SpaActivity" android:exported="false"/>

        <activity android:name=".spa.SpaBridgeActivity" android:exported="false"/>

        <activity android:name=".spa.SpaDebugActivity" android:exported="false"/>

        <provider

            android:name=".spa.SpaEntryProvider"

            android:authorities="com.android.settings.spa.provider"

            android:enabled="true"

            android:exported="false">

        </provider>



        <activity-alias android:name="UsageStatsActivity"

                        android:exported="true"
@@ -4592,11 +4599,6 @@ 
                       android:value="UsageStats"/>

        </activity-alias>



        <activity

            android:name="com.android.settings.spa.SpaDebugActivity"

            android:exported="false">

        </activity>



        <activity

            android:name="com.android.settings.applications.mobilebundledapps.MobileBundledAppDetailsActivity"

            android:label="@string/mobile_bundled_apps_details_title"

src/com/android/settings/spa/SpaDebugActivity.kt

+5 −2
Original line number Diff line number Diff line
@@ -18,5 +18,8 @@ package com.android.settings.spa 


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



class SpaDebugActivity :

    DebugActivity(SpaEnvironment.settingsEntryRepository, SpaActivity::class.java)
 
class SpaDebugActivity : DebugActivity(

    SpaEnvironment.settingsEntryRepository,

    browseActivityClass = SpaActivity::class.java,

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

)

src/com/android/settings/spa/SpaEntryProvider.kt

0 → 100644
+24 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settings.spa



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



class SpaEntryProvider : EntryProvider(

    SpaEnvironment.settingsEntryRepository,

    browseActivityClass = SpaActivity::class.java,

)