Xin Li f9ab1c41d6 [automerger skipped] Merge 24Q4 into AOSP main am: 413f38d475 -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/+/3413682

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

2024-12-13 19:42:05 -08:00

aconfig

Merge "Add aconfig flag on contacts default account settings in the app settings page." into main

2024-09-20 23:03:30 +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 "Partial revert to restore lottie_bubbles.json" into main am: 7067c6781f

2024-12-12 09:43:28 -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-11-26 07:03:26 -08:00

src/com/android/settings

Merge "Update the OWNERs" into main am: 5655b46dee

2024-12-12 23:38:24 -08:00

tests

Merge "Customize the availability of Testing Settings Menu" into main am: d25fdc50d8

2024-12-04 11:51:51 +00:00

.gitignore

Update .gitignore list

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

Android.bp

Move ObservablePreferenceFragment class

2024-09-13 20:39:59 +08:00

AndroidManifest.xml

Merge changes I28f7e3e6,I30450d13 into main

2024-09-19 07:38:44 +00:00

CleanSpec.mk

Move the app to /system_ext

2020-01-16 06:45:18 +00:00

color-check-baseline.xml

Update color-check-baseline.xml

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

NOTICE

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

OWNERS

Update OWNERS for Android Settings

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

PREUPLOAD.cfg

Migrate stringslint.py to AyeAye.

2022-08-03 13:52:10 -06: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

Wrap tintable icons with correctly tinted drawable XML

2015-04-10 15:46:18 -07:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%