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

Unverified Commit 2452c62d authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-14.0.0_r17' into staging/lineage-21.0_merge-android-14.0.0_r17 

Android 14.0.0 Release 17 (UQ1A.231205.015)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZXDPMwAKCRDorT+BmrEO
# eDsNAJwPNh3ft5QqeATgPUtj/1HcdXDx+ACeOU6T39nl9EGDNaXx9W9669E/NN4=
# =Ml22
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed Dec  6 21:44:51 2023 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 2194 signatures in the past
#      2 years.  Encrypted 4 messages in the past 23 months.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By Bill Yi (180) and others
# Via Automerger Merge Worker (1804) and others
* tag 'android-14.0.0_r17': (482 commits)
  Revert fixing the style of Choose screen lock wasn’t consistent in initial setup and deferred setup
  Remove 4:3 aspect ratio option for foldables
  Add aspect ratio settings to advanced category children
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Add controller to Advanced category in Apps page
  Import translations. DO NOT MERGE ANYWHERE
  Add warning text to Aspect ratio app info header
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  ...

 Conflicts:
	src/com/android/settings/notification/VolumeSeekBarPreference.java
	tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceTest.java

Change-Id: Ib96a588e4e186266433f7bda34429c8764f46933
parents bb0582e8 40795bae

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>
@@ -3257,6 +3295,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" />
@@ -3483,6 +3522,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" />
@@ -3662,6 +3702,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" />
@@ -3676,6 +3717,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" />
@@ -3748,6 +3790,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">
@@ -3941,6 +3984,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">
@@ -3978,6 +4022,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">
@@ -4011,6 +4056,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" />
@@ -4041,6 +4087,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">
@@ -4095,6 +4142,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">
@@ -4126,6 +4174,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">
@@ -4821,7 +4870,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">
@@ -4881,10 +4930,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-am/strings.xml

+6 −6

File changed.

Preview size limit exceeded, changes collapsed.

res-product/values-ar/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -188,9 +188,9 @@ 
    <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"يجب ضبط رقم تعريف شخصي لإعداد ميزتَي \"فتح الجهاز بالتعرف على الوجه\" و\"فتح الجهاز ببصمة الإصبع\".\n\nيحمي رقم التعريف الشخصي الهاتف في حال فقدانه أو سرقته."</string>

    <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"يجب ضبط نقش لإعداد ميزتَي \"فتح الجهاز بالتعرف على الوجه\" و\"فتح الجهاز ببصمة الإصبع\".\n\nيحمي النقش الهاتف في حال فقدانه أو سرقته."</string>

    <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"يجب ضبط كلمة مرور لإعداد ميزتَي \"فتح الجهاز بالتعرف على الوجه\" و\"فتح الجهاز ببصمة الإصبع\".\n\nتحمي كلمة المرور الهاتف في حال فقدانه أو سرقته."</string>

    <string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"يؤدي هذا الإجراء إلى حذف النموذج والصور المرتبطة ببصمة الإصبع \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\"، والتي تم تخزينها على هاتفك."</string>

    <string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"يؤدي هذا الإجراء إلى حذف النموذج والصور المرتبطة ببصمة الإصبع \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\"، والتي تم تخزينها على جهازك اللوحي."</string>

    <string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"يؤدي هذا الإجراء إلى حذف النموذج والصور المرتبطة ببصمة الإصبع \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\"، والتي تم تخزينها على جهازك."</string>

    <string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"يؤدي هذا الإجراء إلى حذف النموذج والصور المرتبطة ببصمة الإصبع \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\"، والتي تم تخزينها على هاتفك"</string>

    <string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"يؤدي هذا الإجراء إلى حذف النموذج والصور المرتبطة ببصمة الإصبع \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\"، والتي تم تخزينها على جهازك اللوحي"</string>

    <string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"يؤدي هذا الإجراء إلى حذف النموذج والصور المرتبطة ببصمة الإصبع \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\"، والتي تم تخزينها على جهازك"</string>

    <string name="fingerprint_last_delete_message" product="default" msgid="3187410175262625294">"لن تتمكّن من استخدام بصمة إصبعك لفتح قفل هاتفك أو إثبات هويتك في التطبيقات."</string>

    <string name="fingerprint_last_delete_message" product="tablet" msgid="8618307419148004587">"لن تتمكّن من استخدام بصمة إصبعك لفتح قفل جهازك اللوحي أو إثبات هويتك في التطبيقات."</string>

    <string name="fingerprint_last_delete_message" product="device" msgid="3910012280858587242">"لن تتمكّن من استخدام بصمة إصبعك لفتح قفل جهازك أو إثبات هويتك في التطبيقات."</string>