Xin Li 0998b9c893 [automerger skipped] Merge "Merge ab/AP4A.240925.013 into aosp-main-future" into aosp-main-future am: 207c4c5c5e -s ours ...

am skip reason: Merged-In I4e2a72a80f68579d60466e859370b6fd93a8cd23 with SHA-1 aa322bc4f7 is already in history

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

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

2024-11-25 18:19:54 +00:00

aconfig

Add aconfig for biometric onboarding education

2024-11-25 09:20:00 +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 "[Catalyst] Update ColorAndMotionScreen" into main

2024-11-25 18:18: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-11-10 21:49:47 -08:00

src/com/android/settings

Merge "[Catalyst] Update ColorAndMotionScreen" into main

2024-11-25 18:18:37 +00:00

tests

Merge "Use flag to control the hierarchy tree changes" into main

2024-11-25 15:34:57 +00:00

.gitignore

Update .gitignore list

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

Android.bp

[Screen off unlock UDFPS] Fingerprint Settings integration 2/2

2024-10-30 02:29:43 +00:00

AndroidManifest.xml

Revert^2 "Add intent filters for NfcTagAppsSettings"

2024-11-18 11:29:49 +00:00

CleanSpec.mk

…

color-check-baseline.xml

Update color-check-baseline.xml

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

NOTICE

…

OWNERS

Remove yantingyang from OWNERS

2024-02-05 08:46:27 +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

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%