Rename AppSettings to AppInfoSettings for Spa

To align with current naming.

Bug: 236346018
Test: Make Settings App
Change-Id: I20b2423faf5ee433a530e6a963dd6bb3de33ba90
This commit is contained in:
Chaohui Wang
2022-10-12 17:49:04 +08:00
parent d07a698301
commit d44e2ad3f6
17 changed files with 28 additions and 27 deletions

View File

@@ -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();
}

View File

@@ -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,

View File

@@ -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),
)
}
}

View File

@@ -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

View File

@@ -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

View File

@@ -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.material.icons.Icons

View File

@@ -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.ApplicationInfo
import android.content.pm.PackageInfo

View File

@@ -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.settings.SettingsEnums
import android.content.pm.ApplicationInfo

View File

@@ -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.ApplicationInfo
import android.os.Bundle
@@ -42,8 +42,8 @@ import com.android.settingslib.spaprivileged.template.app.AppInfoProvider
private const val PACKAGE_NAME = "packageName"
private const val USER_ID = "userId"
object AppSettingsProvider : SettingsPageProvider {
override val name = "AppSettings"
object AppInfoSettingsProvider : SettingsPageProvider {
override val name = "AppInfoSettings"
override val parameter = listOf(
navArgument(PACKAGE_NAME) { type = NavType.StringType },
@@ -59,7 +59,7 @@ object AppSettingsProvider : SettingsPageProvider {
val packageInfoPresenter = remember {
PackageInfoPresenter(context, packageName, userId, coroutineScope)
}
AppSettings(packageInfoPresenter)
AppInfoSettings(packageInfoPresenter)
packageInfoPresenter.PackageRemoveDetector()
}
@@ -67,7 +67,7 @@ object AppSettingsProvider : SettingsPageProvider {
fun navigator(app: ApplicationInfo) = navigator(route = "$name/${app.toRoute()}")
/**
* Gets the route to the App Settings page.
* Gets the route to the App Info Settings page.
*
* Expose route to enable enter from non-SPA pages.
*/
@@ -75,13 +75,13 @@ object AppSettingsProvider : SettingsPageProvider {
}
@Composable
private fun AppSettings(packageInfoPresenter: PackageInfoPresenter) {
private fun AppInfoSettings(packageInfoPresenter: PackageInfoPresenter) {
val packageInfo = packageInfoPresenter.flow.collectAsState().value ?: return
val app = packageInfo.applicationInfo
RegularScaffold(
title = stringResource(R.string.application_info_label),
actions = {
AppSettingsMoreOptions(packageInfoPresenter, app)
AppInfoSettingsMoreOptions(packageInfoPresenter, app)
}
) {
val appInfoProvider = remember { AppInfoProvider(packageInfo) }

View File

@@ -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.Context
import android.content.pm.ApplicationInfo
@@ -34,7 +34,7 @@ import com.android.settingslib.spaprivileged.model.app.isDisallowControl
import com.android.settingslib.spaprivileged.model.app.userId
@Composable
fun AppSettingsMoreOptions(packageInfoPresenter: PackageInfoPresenter, app: ApplicationInfo) {
fun AppInfoSettingsMoreOptions(packageInfoPresenter: PackageInfoPresenter, app: ApplicationInfo) {
val context = LocalContext.current
// We don't allow uninstalling update for DO/PO if it's a system app, because it will clear data
// on all users. We also don't allow uninstalling for all users if it's DO/PO for any user.

View File

@@ -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.Intent
import android.content.pm.ApplicationInfo

View File

@@ -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.Intent
import android.content.pm.ApplicationInfo

View File

@@ -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.ActivityNotFoundException
import android.content.Context

View File

@@ -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.Context
import android.content.pm.ApplicationInfo

View File

@@ -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.om.OverlayManager
import android.content.pm.ApplicationInfo

View File

@@ -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.app.settings.SettingsEnums

View File

@@ -13,7 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.spa.app.appsettings
package com.android.settings.spa.app.appinfo
import android.content.Context
import android.content.pm.ApplicationInfo