Treehugger Robot e68bd9f854 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: f33c479f74 -s ours ...

am skip reason: contains skip directive

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

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

2024-11-26 20:40:29 +00:00

aconfig

Add aconfig for biometric onboarding education

2024-11-26 09:15:09 +00:00

libs

…

protos

Fix search for MMS Message

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

res

Merge "Updating Setting EvenDimmer->ExtraDim" into main

2024-11-26 15:52:20 +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 "Update comments to point to the new location of event.logtags." into main am: fa6413ed0b am: 60f7c04dac

2024-11-26 11:06:46 +00:00

tests

Merge "Make UI and wording dynamically show on" into main

2024-11-26 04:47:40 +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

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%