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

Commit 784b56d4 authored by Xin Li's avatar Xin Li
Browse files

Merge Android 14 QPR1 

Merged-In: I22fa193e9846fdb998810c93c9c26344a40d89a9
Bug: 315507370
Change-Id: I4a3a51affce75afe081a0cc9197e0034e34fe82d
parents 75a49e0a 4f1ec8cb

Android.bp

+9 −3
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ android_library { 
        "androidx.appcompat_appcompat",

        "androidx.cardview_cardview",

        "androidx.compose.runtime_runtime-livedata",

        "androidx.activity_activity-ktx",

        "androidx.preference_preference",

        "androidx.recyclerview_recyclerview",

        "androidx.window_window",
@@ -82,6 +83,8 @@ android_library { 
        "net-utils-framework-common",

        "app-usage-event-protos-lite",

        "battery-event-protos-lite",

        "battery-usage-slot-protos-lite",

        "power-anomaly-event-protos-lite",

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

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

        "settings-telephony-protos-lite",
@@ -149,14 +152,17 @@ filegroup { 
    srcs: ["proguard.flags"],

}



// The sources for Settings need to be exposed to SettingsGoogle, etc.

// so they can run the com.android.settingslib.search.IndexableProcessor

// over all the sources together.

// Deprecated. The sources for Settings need to be exposed to ArcSettings, so they can run the

// com.android.settingslib.search.IndexableProcessor over all the sources together.

// Use "-Acom.android.settingslib.search.processor.package=" instead to generate the search data

// separately for different modules.

filegroup {

    name: "Settings_srcs",

    srcs: ["src/**/*.java", "src/**/*.kt"],

}



// Deprecated. Do not depend on this, only depend on Settings-core, and its manifest is also

// included.

filegroup {

    name: "Settings_manifest",

    srcs: ["AndroidManifest.xml"],

AndroidManifest.xml

+67 −3
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
    <uses-permission android:name="android.permission.HARDWARE_TEST" />

    <uses-permission android:name="android.permission.CALL_PHONE" />

    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />

    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS_PRIVILEGED" />

    <uses-permission android:name="android.permission.QUERY_AUDIO_STATE" />

    <uses-permission android:name="android.permission.MASTER_CLEAR" />

    <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH" />
@@ -658,7 +659,7 @@ 
        <activity android:name="Settings$FaceSettingsActivity"

            android:label="@string/security_settings_face_preference_title"

            android:exported="true"

            android:configChanges="orientation|screenSize"

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

            android:icon="@drawable/ic_face_header">

            <intent-filter>

                <action android:name="android.settings.FACE_SETTINGS" />
@@ -673,8 +674,8 @@ 
        <activity android:name="Settings$FaceSettingsInternalActivity"

                  android:label="@string/security_settings_face_preference_title"

                  android:exported="false"

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

                  android:icon="@drawable/ic_face_header"

                  android:configChanges="orientation|screenSize"

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

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

                       android:value="com.android.settings.biometrics.face.FaceSettings" />
@@ -864,6 +865,7 @@ 


        <activity

            android:name="Settings$LongBackgroundTasksActivity"

            android:knownActivityEmbeddingCerts="@array/config_known_host_certs"

            android:exported="true"

            android:label="@string/long_background_tasks_label">

            <intent-filter android:priority="1">
@@ -1545,6 +1547,7 @@ 


        <activity

            android:name="Settings$ManageApplicationsActivity"

            android:knownActivityEmbeddingCerts="@array/config_known_host_certs"

            android:exported="true"

            android:label="@string/applications_settings">

            <intent-filter android:priority="1">
@@ -1577,6 +1580,33 @@ 
                       android:value="@string/menu_key_apps"/>

        </activity-alias>



        <activity android:name="Settings$UserAspectRatioAppListActivity"

            android:exported="true"

            android:label="@string/aspect_ratio_experimental_title">

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

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

                <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"/>

        </activity>



        <activity android:name="Settings$UserAspectRatioAppActivity"

                  android:exported="true"

                  android:label="@string/aspect_ratio_experimental_title">

            <intent-filter>

                <action android:name="android.settings.MANAGE_USER_ASPECT_RATIO_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.appcompat.UserAspectRatioDetails" />

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

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

        </activity>



        <activity

            android:name="Settings$ManageDomainUrlsActivity"

            android:exported="true"
@@ -1607,6 +1637,7 @@ 


        <activity

            android:name="Settings$HighPowerApplicationsActivity"

            android:knownActivityEmbeddingCerts="@array/config_known_host_certs"

            android:exported="true"

            android:label="@string/high_power_apps">

            <intent-filter android:priority="1">
@@ -1665,6 +1696,7 @@ 
             This is for compatibility with old shortcuts. -->

        <activity-alias android:name=".RunningServices"

                android:label="@string/runningservices_settings_title"

                android:knownActivityEmbeddingCerts="@array/config_known_host_certs"

                android:exported="true"

                android:targetActivity="Settings$ManageApplicationsActivity">

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -1677,6 +1709,7 @@ 
             This is for compatibility with old shortcuts. -->

        <activity-alias android:name=".applications.StorageUse"

                android:label="@string/storageuse_settings_title"

                android:knownActivityEmbeddingCerts="@array/config_known_host_certs"

                android:exported="true"

                android:targetActivity="Settings$ManageApplicationsActivity">

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -1743,6 +1776,7 @@ 
        <!-- Provide direct entry into manage apps showing running services. -->

        <activity android:name="Settings$RunningServicesActivity"

                android:exported="true"

                android:knownActivityEmbeddingCerts="@array/config_known_host_certs"

                android:label="@string/runningservices_settings_title">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />
@@ -1761,6 +1795,7 @@ 
        <!-- Provide direct entry into manage apps showing storage usage of apps. -->

        <activity

            android:name="Settings$StorageUseActivity"

            android:knownActivityEmbeddingCerts="@array/config_known_host_certs"

            android:exported="true"

            android:label="@string/storageuse_settings_title">

            <intent-filter android:priority="1">
@@ -2105,6 +2140,7 @@ 


        <activity

            android:name="Settings$UsageAccessSettingsActivity"

            android:knownActivityEmbeddingCerts="@array/config_known_host_certs"

            android:exported="true"

            android:label="@string/usage_access_title">

            <intent-filter android:priority="1">
@@ -2389,6 +2425,8 @@ 
            <intent-filter android:priority="1">

                <action android:name="android.app.action.CONFIRM_DEVICE_CREDENTIAL" />

                <action android:name="android.app.action.CONFIRM_FRP_CREDENTIAL" />

                <action android:name="android.app.action.PREPARE_REPAIR_MODE_DEVICE_CREDENTIAL" />

                <action android:name="android.app.action.CONFIRM_REPAIR_MODE_DEVICE_CREDENTIAL" />

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

            </intent-filter>

        </activity>
@@ -3240,6 +3278,7 @@ 
            android:name="Settings$DataUsageSummaryActivity"

            android:label="@string/data_usage_summary_title"

            android:exported="true"

            android:enabled="@bool/config_show_sim_info"

            android:icon="@drawable/ic_homepage_data_usage">

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

                <action android:name="android.settings.DATA_USAGE_SETTINGS" />
@@ -3466,6 +3505,7 @@ 
        <activity

            android:name="Settings$TurnScreenOnSettingsActivity"

            android:exported="true"

            android:knownActivityEmbeddingCerts="@array/config_known_host_certs"

            android:label="@string/turn_screen_on_title">

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

                <action android:name="android.settings.TURN_SCREEN_ON_SETTINGS" />
@@ -3645,6 +3685,7 @@ 
        <activity android:name="Settings$NotificationAppListActivity"

                  android:label="@string/app_notifications_title"

                  android:icon="@drawable/ic_notifications"

                  android:knownActivityEmbeddingCerts="@array/config_known_host_certs"

                  android:exported="true">

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

                <action android:name="android.settings.ALL_APPS_NOTIFICATION_SETTINGS" />
@@ -3659,6 +3700,7 @@ 
        <!-- Displays a list of apps available for cloning on the device -->

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

                  android:label="@string/cloned_apps_dashboard_title"

                  android:knownActivityEmbeddingCerts="@array/config_known_host_certs"

                  android:exported="true">

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

                <action android:name="android.settings.MANAGE_CLONED_APPS_SETTINGS" />
@@ -3731,6 +3773,7 @@ 
        <!-- Show regulatory info (from settings item or dialing "*#07#") -->

        <activity

            android:name="RegulatoryInfoDisplayActivity"

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

            android:label="@string/regulatory_labels"

            android:exported="true"

            android:enabled="@bool/config_show_regulatory_info">
@@ -3924,6 +3967,7 @@ 


        <activity

            android:name="Settings$OverlaySettingsActivity"

            android:knownActivityEmbeddingCerts="@array/config_known_host_certs"

            android:exported="true"

            android:label="@string/draw_overlay">

            <intent-filter android:priority="1">
@@ -3961,6 +4005,7 @@ 


        <activity

            android:name="Settings$WriteSettingsActivity"

            android:knownActivityEmbeddingCerts="@array/config_known_host_certs"

            android:exported="true"

            android:label="@string/write_settings_title">

            <intent-filter android:priority="1">
@@ -3994,6 +4039,7 @@ 
        <activity

            android:name="Settings$AlarmsAndRemindersActivity"

            android:exported="true"

            android:knownActivityEmbeddingCerts="@array/config_known_host_certs"

            android:label="@string/alarms_and_reminders_label">

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

                <action android:name="android.settings.REQUEST_SCHEDULE_EXACT_ALARM" />
@@ -4024,6 +4070,7 @@ 


        <activity

            android:name="Settings$ManageExternalSourcesActivity"

            android:knownActivityEmbeddingCerts="@array/config_known_host_certs"

            android:exported="true"

            android:label="@string/install_other_apps">

            <intent-filter android:priority="1">
@@ -4078,6 +4125,7 @@ 


        <activity

            android:name="Settings$ManageExternalStorageActivity"

            android:knownActivityEmbeddingCerts="@array/config_known_host_certs"

            android:exported="true"

            android:label="@string/manage_external_storage_title">

            <intent-filter android:priority="1">
@@ -4109,6 +4157,7 @@ 


        <activity

            android:name="Settings$MediaManagementAppsActivity"

            android:knownActivityEmbeddingCerts="@array/config_known_host_certs"

            android:exported="true"

            android:label="@string/media_management_apps_title">

            <intent-filter android:priority="1">
@@ -4804,7 +4853,7 @@ 
        </activity>



        <activity android:name="Settings$FactoryResetActivity"

                  android:permission="android.permission.BACKUP"

                  android:permission="android.permission.MASTER_CLEAR"

                  android:label="@string/main_clear_title"

                  android:exported="true"

                  android:theme="@style/SudThemeGlif.Light">
@@ -4864,10 +4913,25 @@ 
        <activity

            android:name=".spa.SpaActivity"

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

            android:knownActivityEmbeddingCerts="@array/config_known_host_certs"

            android:exported="false" />

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

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



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

            android:label="@string/security_settings_fingerprint_preference_title"

            android:exported="false"

            android:icon="@drawable/ic_fingerprint_header">

            <intent-filter>

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

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

            </intent-filter>

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

                android:value="com.android.settings.biometrics.fingerprint2.ui.fragment.FingerprintSettingsV2Fragment" />

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

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

        </activity>



        <activity-alias android:name="UsageStatsActivity"

                        android:exported="true"

                        android:label="@string/testing_usage_stats"

protos/fuelgauge_log.proto

+23 −2
Original line number Diff line number Diff line
@@ -5,13 +5,12 @@ option java_multiple_files = true; 
option java_package = "com.android.settings.fuelgauge";

option java_outer_classname = "FuelgaugeLogProto";



// Stores history of setting optimize mode

// Store history of setting optimize mode

message BatteryOptimizeHistoricalLog {

  repeated BatteryOptimizeHistoricalLogEntry log_entry = 1;

}



message BatteryOptimizeHistoricalLogEntry {



  // The action to set optimize mode

  enum Action {

    UNKNOWN = 0;
@@ -28,3 +27,25 @@ message BatteryOptimizeHistoricalLogEntry { 
  optional string action_description = 3;

  optional int64 timestamp = 4;

}





// Store history of battery usage periodic job

message BatteryUsageHistoricalLog {

  repeated BatteryUsageHistoricalLogEntry log_entry = 1;

}



message BatteryUsageHistoricalLogEntry {

  // The action to record battery usage job event

  enum Action {

    UNKNOWN = 0;

    SCHEDULE_JOB = 1;

    EXECUTE_JOB = 2;

    RECHECK_JOB = 3;

    FETCH_USAGE_DATA = 4;

    INSERT_USAGE_DATA = 5;

  }



  optional int64 timestamp = 1;

  optional Action action = 2;

  optional string action_description = 3;

}

res-product/values-af/strings.xml

+9 −9
Original line number Diff line number Diff line
@@ -131,8 +131,8 @@ 
    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5" product="default" msgid="6556725426776167791">"Jou kind se foon kan ontsluit word wanneer hulle nie bedoel om dit te doen nie, soos as iemand dit teen sy of haar vinger druk."</string>

    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5" product="tablet" msgid="5156581794964551571">"Jou kind se tablet kan ontsluit word wanneer hulle nie bedoel om dit te doen nie, soos as iemand dit teen hul vinger druk."</string>

    <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5" product="device" msgid="8309101436391515400">"Jou kind se toestel kan ontsluit word wanneer hulle nie bedoel om dit te doen nie, soos as iemand dit teen hul vinger druk."</string>

    <string name="security_settings_fingerprint_v2_home_screen_text" product="tablet" msgid="5074447304036758639">"Gebruik jou vingerafdruk om jou tablet te ontsluit of te verifieer dis jy, soos wanneer jy by apps aanmeld"</string>

    <string name="security_settings_fingerprint_v2_home_screen_text" product="device" msgid="7398339851724524558">"Gebruik jou vingerafdruk om jou toestel te ontsluit of te verifieer dis jy, soos wanneer jy by apps aanmeld"</string>

    <string name="security_settings_fingerprint_v2_home_screen_text" product="tablet" msgid="5074447304036758639">"Gebruik jou vingerafdruk om jou tablet te ontsluit of te verifieer dis jy, soos wanneer jy by programme aanmeld"</string>

    <string name="security_settings_fingerprint_v2_home_screen_text" product="device" msgid="7398339851724524558">"Gebruik jou vingerafdruk om jou toestel te ontsluit of te verifieer dis jy, soos wanneer jy by programme aanmeld"</string>

    <string name="security_settings_fingerprint_v2_home_screen_text" product="default" msgid="5376408603508393038">"Gebruik jou vingerafdruk om jou foon te ontsluit of te verifieer dis jy, soos wanneer jy aanmeld by programme"</string>

    <string name="biometric_settings_hand_back_to_guardian" product="tablet" msgid="9034560319613439593">"Gee die tablet terug vir jou ouer"</string>

    <string name="biometric_settings_hand_back_to_guardian" product="device" msgid="2149647165743006307">"Gee die toestel terug vir jou ouer"</string>
@@ -191,9 +191,9 @@ 
    <string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Dit vee die vingerafdrukprente en -model uit wat met \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" geassosieer word en op jou foon geberg is"</string>

    <string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Dit vee die vingerafdrukprente en -model uit wat met \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" geassosieer word en op jou tablet geberg is"</string>

    <string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Dit vee die vingerafdrukprente en -model uit wat met \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" geassosieer word en op jou toestel geberg is"</string>

    <string name="fingerprint_last_delete_message" product="default" msgid="3187410175262625294">"Jy sal nie jou vingerafdruk kan gebruik om jou foon te ontsluit of in apps te verifieer dis jy nie."</string>

    <string name="fingerprint_last_delete_message" product="tablet" msgid="8618307419148004587">"Jy sal nie jou vingerafdruk kan gebruik om jou tablet te ontsluit of in apps te verifieer dis jy nie."</string>

    <string name="fingerprint_last_delete_message" product="device" msgid="3910012280858587242">"Jy sal nie jou vingerafdruk kan gebruik om jou toestel te ontsluit nie of in apps te verifieer dis jy nie."</string>

    <string name="fingerprint_last_delete_message" product="default" msgid="3187410175262625294">"Jy sal nie jou vingerafdruk kan gebruik om jou foon te ontsluit of in programme te verifieer dis jy nie."</string>

    <string name="fingerprint_last_delete_message" product="tablet" msgid="8618307419148004587">"Jy sal nie jou vingerafdruk kan gebruik om jou tablet te ontsluit of in programme te verifieer dis jy nie."</string>

    <string name="fingerprint_last_delete_message" product="device" msgid="3910012280858587242">"Jy sal nie jou vingerafdruk kan gebruik om jou toestel te ontsluit nie of in programme te verifieer dis jy nie."</string>

    <string name="fingerprint_unlock_title" product="default" msgid="3224008661274975980">"Jy kan jou foon met jou vingerafdruk ontsluit. Om veiligheidsredes vereis hierdie opsie \'n rugsteunskermslot."</string>

    <string name="fingerprint_unlock_title" product="tablet" msgid="6920040586231644124">"Jy kan jou tablet met jou vingerafdruk ontsluit. Om veiligheidsredes vereis hierdie opsie ’n rugsteunskermslot."</string>

    <string name="fingerprint_unlock_title" product="device" msgid="1469790269368691678">"Jy kan jou toestel met jou vingerafdruk ontsluit. Om veiligheidredes vereis hierdie opsie \'n rugsteunskermslot."</string>
@@ -350,8 +350,8 @@ 
    <string name="battery_tip_incompatible_charging_message" product="default" msgid="5315451445653379744">"Battery laai stadig of wil nie laai nie. Kyk of die kabel en kragprop met jou foon werk"</string>

    <string name="battery_tip_incompatible_charging_message" product="device" msgid="7265524281090787927">"Battery laai stadig of wil nie laai nie. Kyk of die kabel en kragprop met jou toestel werk"</string>

    <string name="battery_tip_incompatible_charging_message" product="tablet" msgid="174383022413708569">"Battery laai stadig of wil nie laai nie. Kyk of die kabel en kragprop met jou tablet werk"</string>

    <string name="lockscreen_trivial_controls_summary" product="default" msgid="42562533085885152">"Sonder om jou foon te ontsluit"</string>

    <string name="lockscreen_trivial_controls_summary" product="tablet" msgid="9052068482124729345">"Sonder om jou tablet te ontsluit"</string>

    <string name="auto_rotate_summary_a11y" product="default" msgid="2813368383309985185">"Wanneer jy jou foon tussen portret en landskap beweeg"</string>

    <string name="auto_rotate_summary_a11y" product="tabled" msgid="4708833814245913981">"Wanneer jy jou tablet tussen portret en landskap beweeg"</string>

    <!-- no translation found for lockscreen_trivial_controls_summary (42562533085885152) -->

    <skip />

    <!-- no translation found for lockscreen_trivial_controls_summary (9052068482124729345) -->

    <skip />

</resources>

res-product/values-am/strings.xml

+29 −29

File changed.

Preview size limit exceeded, changes collapsed.