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

Commit 82183011 authored by Chaohui Wang's avatar Chaohui Wang
Browse files

Use SettingsIntro for app lists 

Bug: 417374093
Flag: EXEMPT bug fix
Test: visual
Change-Id: I4850af41db02f883f5f261a0740fbc16e708800a
parent 3ba83732

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

+2 −4
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ import android.content.pm.ApplicationInfo 
import android.content.pm.PackageInfo

import android.content.pm.PackageManager

import android.content.pm.PackageManager.GET_ACTIVITIES

import android.content.pm.PackageManager.USER_MIN_ASPECT_RATIO_APP_DEFAULT

import android.content.pm.PackageManager.USER_MIN_ASPECT_RATIO_UNSET

import android.os.Build

import android.os.Bundle

import android.util.Log
@@ -51,7 +49,7 @@ import com.android.settingslib.spa.widget.illustration.IllustrationModel 
import com.android.settingslib.spa.widget.illustration.ResourceType

import com.android.settingslib.spa.widget.preference.Preference

import com.android.settingslib.spa.widget.preference.PreferenceModel

import com.android.settingslib.spa.widget.ui.SettingsBody

import com.android.settingslib.spa.widget.ui.SettingsIntro

import com.android.settingslib.spa.widget.ui.SpinnerOption

import com.android.settingslib.spaprivileged.model.app.AppListModel

import com.android.settingslib.spaprivileged.model.app.AppRecord
@@ -113,7 +111,7 @@ fun UserAspectRatioAppList( 
        appList = appList,

        header = {

            Box(Modifier.padding(SettingsDimension.itemPadding)) {

                SettingsBody(stringResource(R.string.aspect_ratio_main_summary_text, Build.MODEL))

                SettingsIntro(stringResource(R.string.aspect_ratio_main_summary_text, Build.MODEL))

            }

            Illustration(object : IllustrationModel {

                override val resId = R.raw.user_aspect_ratio_education

src/com/android/settings/spa/app/backgroundinstall/BackgroundInstalledAppsPageProvider.kt

+2 −1
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ import com.android.settingslib.spa.framework.util.formatString 
import com.android.settingslib.spa.widget.preference.Preference

import com.android.settingslib.spa.widget.preference.PreferenceModel

import com.android.settingslib.spa.widget.ui.SettingsBody

import com.android.settingslib.spa.widget.ui.SettingsIntro

import com.android.settingslib.spaprivileged.model.app.AppEntry

import com.android.settingslib.spaprivileged.model.app.AppListModel

import com.android.settingslib.spaprivileged.model.app.AppRecord
@@ -148,7 +149,7 @@ fun BackgroundInstalledAppList( 
            appList = appList,

            header = {

                Box(Modifier.padding(SettingsDimension.itemPadding)) {

                    SettingsBody(stringResource(R.string.background_install_summary))

                    SettingsIntro(stringResource(R.string.background_install_summary))

                }

            }

    )

src/com/android/settings/spa/system/AppLanguages.kt

+2 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import com.android.settingslib.spa.framework.theme.SettingsDimension 
import com.android.settingslib.spa.widget.preference.Preference

import com.android.settingslib.spa.widget.preference.PreferenceModel

import com.android.settingslib.spa.widget.ui.SettingsBody

import com.android.settingslib.spa.widget.ui.SettingsIntro

import com.android.settingslib.spaprivileged.template.app.AppListPage



object AppLanguagesPageProvider : SettingsPageProvider {
@@ -56,7 +57,7 @@ object AppLanguagesPageProvider : SettingsPageProvider { 
                        } else {

                            R.string.desc_app_locale_selection_supported_with_disclaimer

                        }

                    SettingsBody(stringResource(titleId))

                    SettingsIntro(stringResource(titleId))

                }

            },

        )