Merge "Set aspect ratio app list settings page id as attribtion in logs" into main (4211b4a8) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/spa/app/appcompat/UserAspectRatioAppPreference.kt

+3 −3

Original line number	Diff line number	Diff line
		@@ -63,18 +63,18 @@ class UserAspectRatioAppPresenter(
		}.flowOn(Dispatchers.IO)

		fun startActivity() =
		navigateToAppAspectRatioSettings(context, app)
		navigateToAppAspectRatioSettings(context, app, AppInfoSettingsProvider.METRICS_CATEGORY)

		val summaryFlow = flow {
		emit(manager.getUserMinAspectRatioEntry(app.packageName, context.userId))
		}.flowOn(Dispatchers.IO)
		}

		fun navigateToAppAspectRatioSettings(context: Context, app: ApplicationInfo) {
		fun navigateToAppAspectRatioSettings(context: Context, app: ApplicationInfo, metricsCategory: Int) {
		AppInfoDashboardFragment.startAppInfoFragment(
		UserAspectRatioDetails::class.java,
		app,
		context,
		AppInfoSettingsProvider.METRICS_CATEGORY,
		metricsCategory,
		)
		}

+8 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.settings.spa.app.appcompat

		import android.app.settings.SettingsEnums
		import android.content.Context
		import android.content.pm.ApplicationInfo
		import android.content.pm.PackageInfo
		@@ -155,7 +156,13 @@ class UserAspectRatioAppListModel(private val context: Context)
		override fun AppListItemModel<UserAspectRatioAppListItemModel>.AppItem() {
		val app = record.app
		AppListItem(
		onClick = { navigateToAppAspectRatioSettings(context, app) }
		onClick = {
		navigateToAppAspectRatioSettings(
		context,
		app,
		SettingsEnums.USER_ASPECT_RATIO_APP_LIST_SETTINGS
		)
		}
		)
		}