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

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

Merge "Rename AppSettings to AppInfoSettings for Spa"

parents ee4d9024 d44e2ad3

src/com/android/settings/applications/InstalledAppDetailsTop.java

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import android.util.FeatureFlagUtils; 
import com.android.settings.SettingsActivity;

import com.android.settings.applications.appinfo.AppInfoDashboardFragment;

import com.android.settings.spa.SpaActivity;

import com.android.settings.spa.app.appsettings.AppSettingsProvider;

import com.android.settings.spa.app.appinfo.AppInfoSettingsProvider;



public class InstalledAppDetailsTop extends SettingsActivity {
@@ -35,7 +35,7 @@ public class InstalledAppDetailsTop extends SettingsActivity { 
        }

        String packageName = super.getIntent().getData().getSchemeSpecificPart();

        SpaActivity.startSpaActivity(

                this, AppSettingsProvider.INSTANCE.getRoute(packageName, getUserId()));

                this, AppInfoSettingsProvider.INSTANCE.getRoute(packageName, getUserId()));

        finish();

    }

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

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


import com.android.settings.spa.app.AllAppListPageProvider

import com.android.settings.spa.app.AppsMainPageProvider

import com.android.settings.spa.app.appsettings.AppSettingsProvider

import com.android.settings.spa.app.appinfo.AppInfoSettingsProvider

import com.android.settings.spa.app.specialaccess.AlarmsAndRemindersAppListProvider

import com.android.settings.spa.app.specialaccess.AllFilesAccessAppListProvider

import com.android.settings.spa.app.specialaccess.DisplayOverOtherAppsAppListProvider
@@ -54,7 +54,7 @@ object SettingsSpaEnvironment : SpaEnvironment() { 
                HomePageProvider,

                AppsMainPageProvider,

                AllAppListPageProvider,

                AppSettingsProvider,

                AppInfoSettingsProvider,

                SpecialAppAccessPageProvider,

                NotificationMainPageProvider,

                AppListNotificationsPageProvider,

src/com/android/settings/spa/app/AllAppList.kt

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import androidx.compose.runtime.Composable 
import androidx.compose.runtime.remember

import androidx.compose.ui.res.stringResource

import com.android.settings.R

import com.android.settings.spa.app.appsettings.AppSettingsProvider

import com.android.settings.spa.app.appinfo.AppInfoSettingsProvider

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

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

import com.android.settingslib.spa.framework.common.SettingsPageProvider
@@ -65,7 +65,7 @@ private fun AllAppListPage() { 
    ) { itemModel ->

        AppListItem(

            itemModel = itemModel,

            onClick = AppSettingsProvider.navigator(app = itemModel.record.app),

            onClick = AppInfoSettingsProvider.navigator(app = itemModel.record.app),

        )

    }

}

src/com/android/settings/spa/app/appsettings/AppButtonRepository.kt→src/com/android/settings/spa/app/appinfo/AppButtonRepository.kt

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

 */



package com.android.settings.spa.app.appsettings

package com.android.settings.spa.app.appinfo



import android.app.ActivityManager

import android.content.ComponentName

src/com/android/settings/spa/app/appsettings/AppButtons.kt→src/com/android/settings/spa/app/appinfo/AppButtons.kt

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

 */



package com.android.settings.spa.app.appsettings

package com.android.settings.spa.app.appinfo



import android.content.pm.PackageInfo

import androidx.compose.runtime.Composable