Bill Yi 12f88cebaa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 0e856c1a68 -s ours ...

am skip reason: contains skip directive

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

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

2024-02-15 22:16:44 +00:00

aconfig

[DON'T BLOCK] Test ownership migration rules

2024-02-14 14:25:53 +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 16:54:41 +00:00

res

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

2024-02-15 18:10:24 +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-14 16:26:42 -08:00

src/com/android/settings

Merge "Adding more biometric screenshot tests" into main

2024-02-15 17:17:51 +00:00

tests

Merge "Adding more biometric screenshot tests" into main

2024-02-15 17:17:51 +00:00

.gitignore

Update .gitignore list

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

Android.bp

Merge "[DON'T BLOCK] Test ownership migration rules" into main

2024-02-12 19:30:40 +00:00

AndroidManifest.xml

Intent handler for new BACKGROUND_RESTRICTIONS_SETTINGS

2024-02-14 22:27:10 +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%