No description

Adam Bookatz 7ee9c00352 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 44a35ac07b -s ours am: 9d81e7d2e5 -s ours am: d5e5daf68e -s ours am: 80f4a4d681 -s ours am: 647c3b30a7 -s ours am: a1cf0740a7 -s ours am: 50a9158019 -s ours ... am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30487387 Change-Id: I39a166b5863b2e11fbd33925009fcb6f9f0c3461 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>		2024-12-03 22:25:41 +00:00
libs
protos	Add a mechanism to log battery usage periodic job events	2023-07-07 17:47:19 +08:00
res	Import translations. DO NOT MERGE ANYWHERE	2024-11-13 22:43:37 +00:00
res-export	Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"	2022-12-07 11:47:43 +00:00
res-product	Import translations. DO NOT MERGE ANYWHERE	2024-02-21 16:01:20 -08:00
src/com/android/settings	Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into udc-qpr-dev	2024-12-03 19:51:15 +00:00
tests	Block the content scheme intent in AccountTypePreferenceLoader am: 8fa1dcb034 am: b5bf33ab76 am: 26e1224ea6	2024-11-25 05:04:07 +00:00
.gitignore
Android.bp	Battery usage page latency improvement (1-8)	2023-08-16 15:12:04 +08:00
AndroidManifest.xml	Use experimental string in user aspect ratio settings	2023-09-22 14:12:25 +00:00
CleanSpec.mk
color-check-baseline.xml	Merge "Disabled state UI of Flash Notifications preview button" into udc-dev	2023-05-11 01:41:47 +00:00
NOTICE
OWNERS	Update Settings owners list	2023-04-12 01:48:48 +00:00
PREUPLOAD.cfg
proguard.flags	Refine Settings proguard rules	2022-10-06 09:10:38 -07:00
TEST_MAPPING	Enable presubmit biometrics unit tests	2023-05-11 06:07:08 +00:00
wrap_alpha.py