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

Commit 5bfde9fb authored by Xin Li's avatar Xin Li
Browse files

Merge 25Q1 (ab/12770256) to aosp-main-future 

Bug: 385190204
Merged-In: Iaee6792d1a27be8fa4b443f783a47a3715b6d3a1
Change-Id: I0ac29cecfec526a38cf4a120b8ef704ee7bc01b3
parents 188402ad 97072e43

Android.bp

+7 −1
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ android_library { 
        "BiometricsSharedLib",

        "SystemUIUnfoldLib",

        "WifiTrackerLib",

        "android.hardware.biometrics.flags-aconfig-java",

        "android.hardware.dumpstate-V1-java",

        "android.hardware.dumpstate-V1.0-java",

        "android.hardware.dumpstate-V1.1-java",
@@ -98,6 +99,7 @@ android_library { 
        "SettingsLibDataStore",

        "SettingsLibMetadata",

        "SettingsLibPreference",

        "SettingsLibService",

        "aconfig_settings_flags_lib",

        "accessibility_settings_flags_lib",

        "contextualcards",
@@ -107,7 +109,6 @@ android_library { 
        "fuelgauge-protos-lite",

        "settings-logtags",

        "statslog-settings",

        "telephony_flags_core_java_lib",

        "setupdesign-lottie-loading-layout",

        "device_policy_aconfig_flags_lib",

        "keyboard_flags_lib",
@@ -131,7 +132,12 @@ android_library { 
        "ims-common",

    ],

    flags_packages: [

        "aconfig_settings_flags",

        "aconfig_settingslib_flags",

        "android.app.flags-aconfig",

        "android.provider.flags-aconfig",

        "android.security.flags-aconfig",

        "keyboard_flags",

    ],

}

AndroidManifest.xml

+146 −60
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ 
            <intent-filter>

                <action android:name="android.intent.action.USER_INITIALIZE"/>

                <action android:name="android.intent.action.PRE_BOOT_COMPLETED"/>

                <action android:name="com.google.android.setupwizard.SETUP_WIZARD_FINISHED"/>

            </intent-filter>

        </receiver>
@@ -851,10 +852,15 @@ 
        </activity>



        <activity android:name=".network.SimOnboardingActivity"

            android:exported="false"

            android:exported="true"

            android:configChanges="orientation|keyboard|keyboardHidden|screenSize|screenLayout|smallestScreenSize"

            android:permission="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"

            android:theme="@style/Theme.SpaLib.BottomSheetDialog"/>

            android:theme="@style/Theme.SpaLib.BottomSheetDialog">

            <intent-filter android:priority="1">

                <action android:name="android.settings.SIM_PREFERENCE_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

      </activity>



        <activity android:name=".network.telephony.ToggleSubscriptionDialogActivity"

                  android:exported="false"
@@ -1072,28 +1078,6 @@ 
            android:theme="@android:style/Theme.NoDisplay">

        </activity>



        <activity

            android:name=".Settings$LanguageAndInputSettingsActivity"

            android:label="@string/language_settings"

            android:exported="true"

            android:icon="@drawable/ic_settings_language">

            <intent-filter>

                <action android:name="android.settings.LANGUAGE_SETTINGS"/>

                <category android:name="android.intent.category.DEFAULT"/>

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN"/>

                <category android:name="android.intent.category.VOICE_LAUNCH"/>

                <category android:name="android.intent.category.DEFAULT"/>

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.language.LanguageAndInputSettings"/>

            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"

                       android:value="@string/menu_key_system"/>

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                       android:value="true"/>

        </activity>



        <activity

            android:name=".Settings$LanguageSettingsActivity"

            android:label="@string/languages_settings"
@@ -1148,6 +1132,38 @@ 
                android:value="true"/>

        </activity>



        <activity

            android:name=".Settings$TemperatureUnitSettingsActivity"

            android:label="@string/temperature_preferences_title"

            android:exported="true" >

            <intent-filter android:priority="1">

                <action android:name="android.settings.TEMPERATURE_UNIT_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.regionalpreferences.TemperatureUnitFragment"/>

            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"

                android:value="@string/menu_key_system"/>

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true"/>

        </activity>



        <activity

            android:name=".Settings$FirstDayOfWeekSettingsActivity"

            android:label="@string/first_day_of_week_preferences_title"

            android:exported="true" >

            <intent-filter android:priority="1">

                <action android:name="android.settings.FIRST_DAY_OF_WEEK_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.regionalpreferences.FirstDayOfWeekItemFragment"/>

            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"

                android:value="@string/menu_key_system"/>

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true"/>

        </activity>



        <activity

            android:name=".Settings$KeyboardSettingsActivity"

            android:label="@string/keyboard_settings"
@@ -1219,14 +1235,29 @@ 
                       android:value="@string/menu_key_system"/>

        </activity>



        <activity android:name="Settings$PhysicalKeyboardLayoutPickerActivity"

            android:label="@string/physical_keyboard_layout_picker_title"

            android:exported="true"

            android:clearTaskOnLaunch="true"

            android:featureFlag="com.android.settings.keyboard.keyboard_and_touchpad_a11y_new_page_enabled">

            <intent-filter android:priority="1">

                <action android:name="android.settings.HARD_KEYBOARD_LAYOUT_PICKER_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.inputmethod.NewKeyboardLayoutEnabledLocalesFragment" />

            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"

                android:value="@string/menu_key_system"/>

        </activity>



        <!-- Keep compatibility with old shortcuts. -->

        <activity-alias android:name="LanguageSettings"

                android:label="@string/language_input_gesture_title"

                android:clearTaskOnLaunch="true"

                android:exported="true"

                android:targetActivity="Settings$LanguageAndInputSettingsActivity">

                android:targetActivity="Settings$LanguageSettingsActivity">

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.language.LanguageAndInputSettings" />

                android:value="com.android.settings.language.LanguageSettings" />

            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"

                       android:value="@string/menu_key_system"/>

        </activity-alias>
@@ -1383,40 +1414,6 @@ 
            android:theme="@style/Theme.Settings.NoActionBar">

        </activity>



        <activity

            android:name=".notification.zen.ZenSuggestionActivity"

            android:label="@string/zen_mode_settings_title"

            android:icon="@drawable/ic_suggestion_dnd"

            android:exported="true"

            android:theme="@android:style/Theme.NoDisplay">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.suggested.category.ZEN" />

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />

            </intent-filter>



            <meta-data android:name="com.android.settings.dismiss"

                       android:value="0" />

            <meta-data android:name="com.android.settings.title"

                       android:resource="@string/zen_suggestion_title" />

            <meta-data android:name="com.android.settings.summary"

                       android:resource="@string/zen_suggestion_summary" />

        </activity>



        <activity

            android:name=".notification.zen.ZenOnboardingActivity"

            android:label="@string/zen_onboarding_dnd_visual_disturbances_header"

            android:icon="@drawable/ic_notifications"

            android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar"

            android:exported="true">

            <intent-filter android:priority="1">

                <action android:name="android.settings.ZEN_MODE_ONBOARDING" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

        </activity>

        <activity

            android:name="Settings$ZenModeAutomationSettingsActivity"

            android:label="@string/zen_mode_automation_settings_title"
@@ -1985,6 +1982,20 @@ 
                android:value="@string/menu_key_apps"/>

        </activity-alias>



        <activity android:name="Settings$AppStorageSettingsActivity"

                  android:label="@string/storage_label"

                  android:exported="true">

            <intent-filter android:priority="1">

                <action android:name="com.android.settings.APP_STORAGE_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

                <data android:scheme="package" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                   android:value="com.android.settings.applications.AppStorageSettings" />

            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"

                   android:value="@string/menu_key_apps"/>

        </activity>



        <activity android:name=".applications.InstalledAppOpenByDefaultActivity"

                  android:label="@string/application_info_label"

                  android:exported="true">
@@ -2833,6 +2844,10 @@ 
            android:exported="false"

            android:theme="@style/GlifTheme.Light"

            android:taskAffinity="com.android.settings.root" />

        <activity android:name=".biometrics.fingerprint.FingerprintEnroll$AddAdditionalFingerprint"

            android:exported="false"

            android:theme="@style/GlifTheme.Light"

            android:taskAffinity="com.android.settings.root" />



        <activity android:name=".biometrics.fingerprint.SetupFingerprintEnrollFindSensor"

            android:exported="false"
@@ -3420,6 +3435,21 @@ 
                       android:value="@string/menu_key_battery"/>

        </activity>



        <activity

            android:name="Settings$PowerUsageAdvancedActivity"

            android:label="@string/advanced_battery_title"

            android:exported="true"

            android:configChanges="orientation|screenSize|screenLayout|smallestScreenSize">

            <intent-filter android:priority="1">

                <action android:name="com.android.settings.battery.action.POWER_USAGE_ADVANCED" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.fuelgauge.batteryusage.PowerUsageAdvanced" />

            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"

                android:value="@string/menu_key_battery"/>

        </activity>



        <provider

            android:name=".fuelgauge.batteryusage.BatteryUsageContentProvider"

            android:enabled="true"
@@ -4533,6 +4563,10 @@ 
                  android:label="@string/privacy_settings_title"

                  android:exported="true"

                  android:icon="@drawable/ic_settings_backup">

            <intent-filter android:priority="1">

                <action android:name="com.android.settings.BACKUP_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.DEFAULT" />
@@ -5348,12 +5382,47 @@ 
                android:value="com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamConfirmDialog" />

        </activity>



        <activity

            android:name="Settings$ContactsStorageSettingsActivity"

            android:label="@string/contacts_storage_settings_title"

            android:exported="true"

            android:featureFlag="android.provider.new_default_account_api_enabled">

            <intent-filter>

                <action android:name="android.provider.action.SET_DEFAULT_ACCOUNT" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.applications.contacts.ContactsStorageSettings"/>

        </activity>



        <service

            android:name="com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamMediaService"

            android:foregroundServiceType="mediaPlayback"

            android:enabled="true"

            android:exported="false" />



        <!-- Once b/364771256 is fixed, add android:featureFlag="com.android.settings.flags.catalyst_service". -->

        <!-- Permission is not yet finalized, use READ_BASIC_PHONE_STATE temporarily. -->

        <service

            android:name=".SettingsService"

            android:exported="true"

            android:permission="android.permission.READ_BASIC_PHONE_STATE">

            <intent-filter>

                <action android:name="com.android.settingslib.PREFERENCE_SERVICE" />

            </intent-filter>

        </service>



        <!-- Service to expose Preference Metadata and Get/Set functionality -->

        <service

            android:name=".service.PreferenceService"

            android:exported="true"

            android:featureFlag="com.android.settingslib.flags.settings_catalyst"

            android:permission="android.permission.READ_SYSTEM_PREFERENCES">

            <intent-filter>

                <action android:name="android.service.settings.preferences.action.PREFERENCE_SERVICE" />

            </intent-filter>

        </service>



        <receiver android:name="com.android.settings.connecteddevice.audiosharing.AudioSharingReceiver"

            android:exported="false">

            <intent-filter>
@@ -5370,6 +5439,23 @@ 
            </intent-filter>

        </receiver>



        <activity

            android:name="Settings$ChangeNfcTagAppsActivity"

            android:exported="true"

            android:label="@string/change_nfc_tag_apps_title">

            <intent-filter android:priority="1">

                <action android:name="android.nfc.action.CHANGE_TAG_INTENT_PREFERENCE" />

                <category android:name="android.intent.category.BROWSABLE" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.applications.manageapplications.ManageApplications" />

            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"

                       android:value="@string/menu_key_apps"/>

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                       android:value="true" />

        </activity>



        <!-- This is the longest AndroidManifest.xml ever. -->

    </application>

</manifest>

PREUPLOAD.cfg

+2 −1
Original line number Diff line number Diff line 
[Hook Scripts]

checkcolor_hook = ${REPO_ROOT}/prebuilts/checkcolor/checkcolor.py -p .

# TODO(b/377902600): Re-enable this hook once it is fixed.

#checkcolor_hook = ${REPO_ROOT}/prebuilts/checkcolor/checkcolor.py -p .



checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}

aconfig/catalyst/about_phone.aconfig

+6 −0
Original line number Diff line number Diff line
@@ -15,3 +15,9 @@ flag { 
  bug: "323791114"

}



flag {

  name: "catalyst_my_device_info_pref_screen"

  namespace: "android_settings"

  description: "Flag for About phone"

  bug: "323791114"

}

aconfig/catalyst/accessibility.aconfig

0 → 100644
+16 −0
Original line number Diff line number Diff line 
package: "com.android.settings.flags"

container: "system"



flag {

  name: "catalyst_accessibility_color_and_motion"

  namespace: "android_settings"

  description: "Migrate Color and motion screen to the Catalyst infrastructure"

  bug: "323791114"

}



flag {

  name: "catalyst_text_reading_screen"

  namespace: "android_settings"

  description: "Flag for Display size and text"

  bug: "323791114"

}