Xin Li 91195f39f7 [automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: cfa19e11a6 -s ours ...

am skip reason: Merged-In Ie90e7495dd4a134538bae6e3e08eea0d02134b14 with SHA-1 62449dd61b is already in history

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

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

2024-11-13 23:25:15 +00:00

aconfig

Merge "Gate screen off unlock UDFPS until power optimitized" into main

2024-11-10 14:09:50 +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(brightness suw): adjust brightness toggles UI and remove autobrightness standalone page" into main

2024-11-13 08:22:07 +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 "Remove the margin in Device Detail page" into main

2024-11-13 17:52:51 +00:00

tests

Merge "Revert "Migrate Battery percentage preference into catalyst. Ref..."" into main

2024-11-13 15:16:23 +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

Add an action name and support 2-pane UI in Backup page

2024-11-06 14:44:17 +08: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%