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

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

Merge tag 'android-13.0.0_r52' of...

Merge tag 'android-13.0.0_r52' of https://android.googlesource.com/platform/packages/apps/Settings into staging/lineage-20.0_merge-android-13.0.0_r52

Android 13.0.0 Release 52 (TQ3A.230605.012)

* tag 'android-13.0.0_r52' of https://android.googlesource.com/platform/packages/apps/Settings: (149 commits)
  Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency.
  Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency.
  Import translations. DO NOT MERGE ANYWHERE
  Refine permission check process of 2-pane deep link
  Refine permission check process of 2-pane deep link
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Add "for work" in work profile biometrics string
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  [Settings] Avoid from user without sufficient permission to change WiFi calling
  Restrict DataUsageList for guest user
  Restrict DataUsageSummary for guest user
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Revert "Disallow screenshot on Wi-Fi QR code settings"
  Don't show NLSes with excessively long component names
  [Settings] User with restriction should avoid from having entries through Settings search
  ...

 Conflicts:
	res/values/config.xml
	res/xml/screen_lock_settings.xml
	res/xml/sound_settings.xml
	src/com/android/settings/Utils.java
	src/com/android/settings/localepicker/AppLocalePickerActivity.java
	src/com/android/settings/security/screenlock/PatternVisiblePreferenceController.java
	src/com/android/settings/security/screenlock/ScreenLockSettings.java
	tests/robotests/src/com/android/settings/localepicker/AppLocalePickerActivityTest.java

Change-Id: Ib6d0597c69bfed5b4c0065e31a2bcb63765b5a0d
parents 78f8a422 c64ad6f3
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