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

Commit cfa19e11 authored by Xin Li's avatar Xin Li
Browse files

Merge 24Q4 (ab/12406339) into aosp-main-future 

Bug: 370570306
Merged-In: Ie90e7495dd4a134538bae6e3e08eea0d02134b14
Change-Id: I20517e9ee410e95f2cbeb1247c0c0288ed9f006f
parents c4d90bf7 658459de

Android.bp

+20 −10
Original line number Diff line number Diff line
@@ -68,6 +68,9 @@ android_library { 
    static_libs: [

        // External dependencies

        "androidx.navigation_navigation-fragment-ktx",

        "androidx.slice_slice-builders",

        "androidx.slice_slice-core",

        "androidx.slice_slice-view",

        "androidx.window_window-java",

        "gson",

        "guava",
@@ -79,40 +82,41 @@ android_library { 
        "android.hardware.dumpstate-V1-java",

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

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

        "android.view.accessibility.flags-aconfig-java",

        "com_android_server_accessibility_flags_lib",

        "net-utils-framework-common",

        "notification_flags_lib",

        "securebox",

        "android.os.flags-aconfig-java",

        "//frameworks/libs/systemui:com_android_systemui_shared_flags_lib",

        "WindowManager-Shell-shared-desktopMode",



        // Settings dependencies

        "FingerprintManagerInteractor",

        "MediaDrmSettingsFlagsLib",

        "Settings-change-ids",

        "SettingsLib",

        "SettingsLibDataStore",

        "SettingsLibActivityEmbedding",

        "SettingsLibDataStore",

        "SettingsLibMetadata",

        "SettingsLibPreference",

        "aconfig_settings_flags_lib",

        "accessibility_settings_flags_lib",

        "contextualcards",

        "development_settings_flag_lib",

        "factory_reset_flags_lib",

        "fuelgauge-log-protos-lite",

        "settings-protos-lite",

        "fuelgauge-protos-lite",

        "settings-contextual-card-protos-lite",

        "settings-log-bridge-protos-lite",

        "settings-logtags",

        "settings-telephony-protos-lite",

        "statslog-settings",

        "telephony_flags_core_java_lib",

        "setupdesign-lottie-loading-layout",

        "device_policy_aconfig_flags_lib",

        "kotlinx-coroutines-core",

        "kotlinx-coroutines-android",

        "keyboard_flags_lib",

    ],



    plugins: ["androidx.room_room-compiler-plugin"],

    plugins: [

        "SettingsLibMetadata-processor",

        "androidx.room_room-compiler-plugin",

    ],



    errorprone: {

        extra_check_modules: ["//external/nullaway:nullaway_plugin"],
@@ -125,6 +129,9 @@ android_library { 
        "telephony-common",

        "ims-common",

    ],

    flags_packages: [

        "android.app.flags-aconfig",

    ],

}



platform_compat_config {
@@ -155,6 +162,9 @@ android_app { 
    optimize: {

        proguard_flags_files: ["proguard.flags"],

    },

    flags_packages: [

        "android.app.flags-aconfig",

    ],

}



android_library_import {

AndroidManifest.xml

+147 −31
Original line number Diff line number Diff line
@@ -740,6 +740,7 @@ 
        <activity android:name="Settings$FaceSettingsActivity"

            android:label="@string/security_settings_face_preference_title"

            android:exported="true"

            android:enableOnBackInvokedCallback="false"

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

            android:icon="@drawable/ic_face_header">

            <intent-filter>
@@ -755,6 +756,7 @@ 
        <activity android:name="Settings$FaceSettingsInternalActivity"

                  android:label="@string/security_settings_face_preference_title"

                  android:exported="false"

                  android:enableOnBackInvokedCallback="false"

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

                  android:icon="@drawable/ic_face_header"

                  android:taskAffinity="com.android.settings.root">
@@ -767,6 +769,7 @@ 
        <activity android:name="Settings$FingerprintSettingsActivity"

                  android:label="@string/security_settings_fingerprint_preference_title"

                  android:exported="true"

                  android:enableOnBackInvokedCallback="false"

                  android:icon="@drawable/ic_fingerprint_header">

            <intent-filter>

                <action android:name="android.settings.FINGERPRINT_SETTINGS" />
@@ -780,8 +783,13 @@ 


        <activity android:name="Settings$CombinedBiometricSettingsActivity"

                  android:label="@string/security_settings_biometric_preference_title"

                  android:exported="false"

                  android:exported="true"

                  android:enableOnBackInvokedCallback="false"

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

            <intent-filter>

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

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

            </intent-filter>

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

                       android:value="com.android.settings.biometrics.combination.CombinedBiometricSettings" />

            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
@@ -1286,21 +1294,64 @@ 
            </intent-filter>

        </activity>



        <activity

            android:name="Settings$ModesSettingsActivity"

            android:label="@string/zen_modes_list_title"

            android:icon="@*android:drawable/ic_zen_priority_modes"

            android:exported="true">

            <intent-filter android:priority="1"

                           android:featureFlag="android.app.modes_ui">

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

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

            </intent-filter>

            <intent-filter android:priority="1"

                           android:featureFlag="android.app.modes_ui">

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

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

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

            </intent-filter>

            <intent-filter android:priority="41"

                           android:featureFlag="android.app.modes_ui">

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

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

            </intent-filter>

            <intent-filter android:priority="10"

                           android:featureFlag="android.app.modes_ui">

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

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

            </intent-filter>

            <intent-filter android:priority="10"

                           android:featureFlag="android.app.modes_ui">

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

                <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.notification.modes.ZenModesListFragment"/>

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

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

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

                       android:value="true" />

        </activity>



        <activity

            android:name="Settings$ZenModeSettingsActivity"

            android:label="@string/zen_mode_settings_title"

            android:icon="@drawable/ic_homepage_notification"

            android:exported="true">

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

            <intent-filter android:priority="1"

                           android:featureFlag="!android.app.modes_ui">

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

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

            </intent-filter>

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

            <intent-filter android:priority="1"

                           android:featureFlag="!android.app.modes_ui">

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

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

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

            </intent-filter>

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

            <intent-filter android:priority="41"

                           android:featureFlag="!android.app.modes_ui">

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

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

            </intent-filter>
@@ -1312,6 +1363,26 @@ 
                android:value="true" />

        </activity>



        <activity

            android:name="Settings$ModeSettingsActivity"

            android:exported="true">

            <intent-filter android:priority="1"

                           android:featureFlag="android.app.modes_ui">

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

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

            </intent-filter>

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

                       android:value="com.android.settings.notification.modes.ZenModeFragment"/>

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

                       android:value="true" />

        </activity>



        <activity

            android:name=".notification.modes.SetupInterstitialActivity"

            android:exported="false"

            android:theme="@style/Theme.Settings.NoActionBar">

        </activity>



        <activity

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

            android:label="@string/zen_mode_settings_title"
@@ -1351,11 +1422,13 @@ 
            android:label="@string/zen_mode_automation_settings_title"

            android:icon="@drawable/ic_notifications"

            android:exported="true">

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

            <intent-filter android:priority="10"

                           android:featureFlag="!android.app.modes_ui">

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

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

            </intent-filter>

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

            <intent-filter android:priority="10"

                           android:featureFlag="!android.app.modes_ui">

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

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

                <category android:name="android.intent.category.DEFAULT" />
@@ -1368,6 +1441,19 @@ 
                       android:value="true" />

        </activity>



        <activity

            android:name=".Settings$ManageAdaptiveNotificationsActivity"

            android:exported="true">

            <intent-filter>

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

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

            </intent-filter>

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

                android:value="com.android.settings.notification.PoliteNotificationsPreferenceFragment" />

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

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

        </activity>



        <activity android:name="Settings$WallpaperSettingsActivity"

                  android:label="@string/wallpaper_settings_fragment_title"

                  android:icon="@drawable/ic_wallpaper"
@@ -2193,13 +2279,6 @@ 
                       android:value="com.android.settings.privacy.PrivacyControlsFragment" />

        </activity>



        <activity android:name=".development.tare.TareHomePage"

                  android:label="@string/tare_settings"

                  android:exported="false" />



        <activity android:name=".development.tare.DropdownActivity"

                  android:exported="false" />



        <activity android:name="SetFullBackupPassword"

                  android:label="@string/local_backup_password_title"

                  android:exported="false" />
@@ -2727,11 +2806,16 @@ 
        <activity android:name=".biometrics.fingerprint.FingerprintSettings"

                  android:exported="false"

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

        <activity android:name=".biometrics.fingerprint.FingerprintEnrollFindSensor" android:exported="false"/>

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

            android:exported="false"

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

        <activity android:name=".biometrics.fingerprint.FingerprintEnrollEnrolling" android:exported="false"/>

        <activity android:name=".biometrics.fingerprint.FingerprintEnrollFinish" android:exported="false"/>

        <activity android:name=".biometrics.fingerprint.FingerprintEnrollParentalConsent" android:exported="false"/>

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

            android:exported="false"

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

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

            android:exported="true"

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

            <intent-filter>
@@ -2741,29 +2825,25 @@ 
            </intent-filter>

        </activity>



        <activity android:name=".biometrics2.ui.view.FingerprintEnrollmentActivity"

            android:exported="true"

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



        <activity android:name=".biometrics2.ui.view.FingerprintEnrollmentActivity$InternalActivity"

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

              android:exported="false"

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

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



        <activity android:name=".biometrics2.ui.view.FingerprintEnrollmentActivity$SetupActivity"

            android:exported="true"

            android:permission="android.permission.MANAGE_FINGERPRINT"

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



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

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

            android:exported="false"

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

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



        <activity android:name=".biometrics.fingerprint.SetupFingerprintEnrollFindSensor" android:exported="false"/>

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

            android:exported="false"

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

        <activity android:name=".biometrics.fingerprint.SetupFingerprintEnrollEnrolling" android:exported="false"/>

        <activity android:name=".biometrics.fingerprint.SetupFingerprintEnrollFinish" android:exported="false"/>

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

            android:exported="false"

            android:permission="android.permission.MANAGE_FINGERPRINT"

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

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

            android:exported="true"

            android:permission="android.permission.MANAGE_FINGERPRINT"

            android:theme="@style/GlifTheme.Light">
@@ -2773,7 +2853,6 @@ 
            </intent-filter>

        </activity>





        <activity android:name=".biometrics.fingerprint2.ui.enrollment.activity.FingerprintEnrollmentV2Activity"

            android:exported="true"

            android:permission="android.permission.MANAGE_FINGERPRINT"
@@ -3162,6 +3241,19 @@ 
            </intent-filter>

        </activity>



        <activity android:name=".bluetooth.BluetoothKeyMissingDialog"

                  android:permission="android.permission.BLUETOOTH_PRIVILEGED"

                  android:excludeFromRecents="true"

                  android:windowSoftInputMode="stateVisible|adjustResize"

                  android:theme="@style/Theme.AlertDialog"

                  android:exported="false"

                  android:taskAffinity=".bluetooth.BluetoothKeyMissingDialog">

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

                <action android:name="android.bluetooth.device.action.KEY_MISSING" />

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

            </intent-filter>

        </activity>



        <activity android:name=".bluetooth.RequestPermissionActivity"

                  android:excludeFromRecents="true"

                  android:permission="android.permission.BLUETOOTH_CONNECT"
@@ -3216,6 +3308,13 @@ 
            </intent-filter>

        </receiver>



        <receiver android:name=".bluetooth.BluetoothKeyMissingReceiver"

            android:exported="true">

            <intent-filter>

                <action android:name="android.bluetooth.device.action.KEY_MISSING" />

            </intent-filter>

        </receiver>



        <receiver android:name=".bluetooth.BluetoothPermissionRequest"

                  android:exported="true"

                  android:permission="android.permission.BLUETOOTH_CONNECT">
@@ -5111,6 +5210,15 @@ 
        <activity android:name=".spa.SpaBridgeActivity" android:exported="false"/>

        <activity android:name=".spa.SpaAppBridgeActivity" android:exported="false"/>



        <activity

            android:name=".spa.search.SpaSearchLandingActivity"

            android:exported="true">

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

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

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

            </intent-filter>

        </activity>



        <activity android:name=".Settings$FingerprintSettingsActivityV2"

            android:label="@string/security_settings_fingerprint_preference_title"

            android:exported="false"
@@ -5254,6 +5362,14 @@ 
            </intent-filter>

        </receiver>



        <receiver

            android:name=".shortcut.ShortcutsUpdateReceiver"

            android:exported="true">

            <intent-filter>

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

            </intent-filter>

        </receiver>



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

    </application>

</manifest>

aconfig/Android.bp

+18 −5
Original line number Diff line number Diff line
@@ -6,9 +6,10 @@ package { 
aconfig_declarations {

    name: "aconfig_settings_flags",

    package: "com.android.settings.flags",

    container: "system_ext",

    container: "system",

    srcs: [

        "*.aconfig",

        "catalyst/*.aconfig",

    ],

}
@@ -20,7 +21,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "factory_reset_flags",

    package: "com.android.settings.factory_reset",

    container: "system_ext",

    container: "system",

    srcs: ["factory_reset/*.aconfig"],

}
@@ -32,7 +33,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "media_drm_flags",

    package: "com.android.settings.media_drm",

    container: "system_ext",

    container: "system",

    srcs: ["media_drm/*.aconfig"],

}
@@ -44,7 +45,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "accessibility_flags",

    package: "com.android.settings.accessibility",

    container: "system_ext",

    container: "system",

    srcs: ["accessibility/*.aconfig"],

}
@@ -56,7 +57,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "development_settings_flags",

    package: "com.android.settings.development",

    container: "system_ext",

    container: "system",

    srcs: [

        "development/**/*.aconfig",

    ],
@@ -66,3 +67,15 @@ java_aconfig_library { 
    name: "development_settings_flag_lib",

    aconfig_declarations: "development_settings_flags",

}



aconfig_declarations {

    name: "keyboard_flags",

    package: "com.android.settings.keyboard",

    container: "system",

    srcs: ["keyboard/*.aconfig"],

}



java_aconfig_library {

    name: "keyboard_flags_lib",

    aconfig_declarations: "keyboard_flags",

}

aconfig/accessibility/accessibility_flags.aconfig

+54 −4
Original line number Diff line number Diff line 
package: "com.android.settings.accessibility"

container: "system_ext"

container: "system"



# NOTE: Keep alphabetized to help limit merge conflicts from multiple simultaneous editors.
@@ -10,6 +10,26 @@ flag { 
  bug: "332974327"

}



flag {

  name: "audio_balance_state_description"

  namespace: "accessibility"

  description: "Provides a more valuable state description to the audio balance slider."

  bug: "319575109"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



flag {

  name: "check_prebundled_is_preinstalled"

  namespace: "accessibility"

  description: "Checks that all 'prebundled' components, used for grouping, are also preinstalled"

  bug: "353888087"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



flag {

  name: "edit_shortcuts_in_full_screen"

  namespace: "accessibility"
@@ -17,6 +37,13 @@ flag { 
  bug: "300302098"

}



flag {

  name: "enable_color_contrast_control"

  namespace: "accessibility"

  description: "Allows users to control color contrast in the Accessibility settings page."

  bug: "246577325"

}



flag {

  name: "enable_hearing_aid_preset_control"

  namespace: "accessibility"
@@ -31,6 +58,16 @@ flag { 
  bug: "301198830"

}



flag {

  name: "fix_a11y_settings_search"

  namespace: "accessibility"

  description: "Fix the a11y related search items in Settings app"

  bug: "333437173"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



flag {

  name: "hide_magnification_always_on_toggle_when_window_mode_only"

  namespace: "accessibility"
@@ -41,6 +78,16 @@ flag { 
  }

}



flag {

  name: "never_restrict_accessibility_activity"

  namespace: "accessibility"

  description: "Stops possibly restricting AccessibilityActivityPreferences"

  bug: "331990900"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



flag {

  name: "remove_qs_tooltip_in_suw"

  namespace: "accessibility"
@@ -49,8 +96,11 @@ flag { 
}



flag {

  name: "enable_color_contrast_control"

  name: "toggle_feature_fragment_collection_info"

  namespace: "accessibility"

  description: "Allows users to control color contrast in the Accessibility settings page."

  bug: "246577325"

  description: "Provides custom CollectionInfo for ToggleFeaturePreferenceFragment"

  bug: "318607873"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}

aconfig/catalyst/about_phone.aconfig

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

container: "system"



flag {

  name: "catalyst_legal_information"

  namespace: "android_settings"

  description: "Flag for Legal information"

  bug: "323791114"

}



flag {

  name: "catalyst_firmware_version"

  namespace: "android_settings"

  description: "Flag for Android version"

  bug: "323791114"

}