Xin Li 49d8ff965d [automerger skipped] Merge "Merge 24Q4 into AOSP main" into main am: b1c96fcf83 -s ours am: 9ee5de3b2f -s ours ...

am skip reason: Merged-In I2c1246a4b34c6b09a42c05153c0e3f015d475df1 with SHA-1 c47df6271a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3412198

Change-Id: If673e7532a8679449edb1b727ce64f5463fd2baa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2024-12-13 21:24:16 -08:00

aconfig

Merge "Add AppInfo setting for page size appcompat" into main

2024-11-27 10:25:02 +00:00

libs

Use androidx.window from prebuilt.

2022-04-14 09:55:36 +00:00

protos

Fix search for MMS Message

2024-07-30 11:34:24 +08:00

res

Merge "feat(HCT): Perform custom migration logic for existing HCT users" into main

2024-12-13 09:22:08 -08:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

2022-12-07 11:47:43 +00:00

res-product

Import translations. DO NOT MERGE ANYWHERE

2024-12-10 15:27:55 -08:00

src/com/android/settings

Merge changes from topic "catalyst" into main

2024-12-13 20:57:36 -08:00

tests

Merge "Support GetMetadata for Preference Service" into main

2024-12-13 13:07:25 -08:00

.gitignore

Update .gitignore list

2023-09-28 10:40:22 -07:00

Android.bp

Revert^2 "Integrate Settings with Preference Service"

2024-12-06 17:20:48 +00:00

AndroidManifest.xml

feat(HCT): Perform custom migration logic for existing HCT users

2024-12-13 05:01:33 +00:00

CleanSpec.mk

Move the app to /system_ext

2019-11-25 20:28:35 +09:00

color-check-baseline.xml

Update color-check-baseline.xml

2024-09-23 11:06:20 +08:00

NOTICE

…

OWNERS

Update OWNERS for Android Settings

2024-11-28 09:15:16 +00:00

PREUPLOAD.cfg

Disable checkcolor hook

2024-11-22 12:59:43 +00:00

proguard.flags

Keep FakeFeatureFlagsImpl

2024-06-27 08:46:17 +00:00

TEST_MAPPING

Enable VPN2 package to Presubmit as the tests aren't flaky during local tests.

2024-05-21 08:49:04 +00:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%