Bill Yi 29b8f505fc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 6b558097e2 -s ours ...

am skip reason: contains skip directive

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

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

2024-02-23 00:47:43 +00:00

aconfig

Merge "Adding FingerprintEnrollConfirmation" into main

2024-02-22 23:56:51 +00:00

libs

Use androidx.window from prebuilt.

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

protos

[DON'T BLOCK] Test ownership migration rules

2024-02-09 17:45:41 +00:00

res

Merge "Import translations. DO NOT MERGE ANYWHERE" into main

2024-02-22 23:54:53 +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-02-21 16:00:27 -08:00

src/com/android/settings

Merge "Adding FingerprintEnrollConfirmation" into main

2024-02-22 23:56:51 +00:00

tests

Merge "Adding FingerprintEnrollConfirmation" into main

2024-02-22 23:56:51 +00:00

.gitignore

Update .gitignore list

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

Android.bp

Merge "Drop platform_apis from android_library" into main am: ff6f53b24a am: 2605622758

2024-02-21 19:43:11 +00:00

AndroidManifest.xml

Merge "Add new Special App Access screen for Backup Tasks." into main

2024-02-22 21:46:53 +00:00

CleanSpec.mk

…

color-check-baseline.xml

Update Power Anomaly UI.

2023-11-13 11:52:44 +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

Refine Settings proguard rules

2022-10-06 09:10:38 -07:00

TEST_MAPPING

Enable Safety Center & Security unit tests on presubmit.

2024-02-08 16:08:40 +00:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%