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

Skip to content
Unverified Commit 07aaaa61 authored by Michael Bestas's avatar Michael Bestas
Browse files

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

Android 14.0.0 Release 50 (AP2A.240605.024)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZmdzpwAKCRDorT+BmrEO
# eBnSAKCIr30CONBD8wAh5o1aReJZ8+6iWQCeLueQ//tred5guCD2XmLwXkDdS74=
# =jExA
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Jun 11 00:44:07 2024 EEST
# 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 2504 signatures in the past
#      2 years.  Encrypted 4 messages in the past 2 years.
# 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 (62) and others
# Via Android (Google) Code Review (446) and others
* tag 'android-14.0.0_r50': (543 commits)
  Restore enterprise policy checks
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Fix toolbar keyboard navigation and touch.
  Fix keyboard vibration settings delay
  Modify PK Settings page to make it more user friendly
  Add fixed amplitude check for keyboard vibration
  Fix the testcase failed
  Add the log for SidecarFragment
  Create phoneNumberFlow
  Fix anomaly is not logged in non-debug mode.
  Update the logic for logging anomaly information to WW.
  Ignore failed Wi-Fi unit tests
  [DataStore] Migrate BatteryBackupHelper to BackupRestoreStorage
  Fix SimDialogActivityTest
  Create isSubscriptionEnabledFlow
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Make SmartBatterySettings unsearchable when it's not available.
  [A11y Setting] Add keyboard keys preferences under A11y page
  ...

 Conflicts:
	Android.bp
	AndroidManifest.xml
	res-product/values-fr/strings.xml
	res/values-af/strings.xml
	res/values-am/strings.xml
	res/values-ar/strings.xml
	res/values-as/strings.xml
	res/values-az/strings.xml
	res/values-b+sr+Latn/strings.xml
	res/values-be/strings.xml
	res/values-bg/strings.xml
	res/values-bn/strings.xml
	res/values-bs/strings.xml
	res/values-ca/strings.xml
	res/values-cs/strings.xml
	res/values-da/strings.xml
	res/values-de/strings.xml
	res/values-el/strings.xml
	res/values-en-rAU/strings.xml
	res/values-en-rCA/strings.xml
	res/values-en-rGB/strings.xml
	res/values-en-rIN/strings.xml
	res/values-en-rXC/strings.xml
	res/values-es-rUS/strings.xml
	res/values-es/strings.xml
	res/values-et/strings.xml
	res/values-eu/strings.xml
	res/values-fa/strings.xml
	res/values-fi/strings.xml
	res/values-fr-rCA/strings.xml
	res/values-fr/strings.xml
	res/values-gl/strings.xml
	res/values-gu/strings.xml
	res/values-hi/strings.xml
	res/values-hr/strings.xml
	res/values-hu/strings.xml
	res/values-hy/strings.xml
	res/values-in/strings.xml
	res/values-is/strings.xml
	res/values-it/strings.xml
	res/values-iw/strings.xml
	res/values-ja/strings.xml
	res/values-ka/strings.xml
	res/values-kk/strings.xml
	res/values-km/strings.xml
	res/values-kn/strings.xml
	res/values-ko/strings.xml
	res/values-ky/strings.xml
	res/values-lo/strings.xml
	res/values-lt/strings.xml
	res/values-lv/strings.xml
	res/values-mk/strings.xml
	res/values-ml/strings.xml
	res/values-mn/strings.xml
	res/values-mr/strings.xml
	res/values-ms/strings.xml
	res/values-my/strings.xml
	res/values-nb/strings.xml
	res/values-ne/strings.xml
	res/values-nl/strings.xml
	res/values-or/strings.xml
	res/values-pa/strings.xml
	res/values-pl/strings.xml
	res/values-pt-rBR/strings.xml
	res/values-pt-rPT/strings.xml
	res/values-pt/strings.xml
	res/values-ro/strings.xml
	res/values-ru/strings.xml
	res/values-si/strings.xml
	res/values-sk/strings.xml
	res/values-sl/strings.xml
	res/values-sq/strings.xml
	res/values-sr/strings.xml
	res/values-sv/strings.xml
	res/values-sw/strings.xml
	res/values-ta/strings.xml
	res/values-te/strings.xml
	res/values-th/strings.xml
	res/values-tl/strings.xml
	res/values-tr/strings.xml
	res/values-uk/strings.xml
	res/values-ur/strings.xml
	res/values-uz/strings.xml
	res/values-vi/strings.xml
	res/values-zh-rCN/strings.xml
	res/values-zh-rHK/strings.xml
	res/values-zh-rTW/strings.xml
	res/values-zu/strings.xml
	res/values/config.xml
	res/xml/physical_keyboard_settings.xml
	res/xml/power_usage_summary.xml
	src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
	src/com/android/settings/datausage/AppDataUsage.java
	src/com/android/settings/fuelgauge/AllowBackgroundPreferenceController.java
	src/com/android/settings/fuelgauge/BatterySettingsFeatureProviderImpl.java
	src/com/android/settings/fuelgauge/datasaver/DynamicDenylistManager.java
	src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
	src/com/android/settings/network/telephony/ConvertToEsimPreferenceController.java
	src/com/android/settings/network/telephony/NetworkSelectSettings.java
	tests/robotests/src/com/android/settings/fuelgauge/datasaver/DynamicDenylistManagerTest.java

Change-Id: I33bd58edcb6e7f0dc466e6165779b139e8a5d3c8
parents 9dd46987 fdcb1ee0
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment