Bill Yi 5a16ea8c50 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e04caacadf -s ours ...

am skip reason: subject contains skip directive

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

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

2023-08-17 00:25:39 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Add a mechanism to log battery usage periodic job events

2023-07-07 17:47:19 +08:00

res

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

2023-08-16 23:43:22 +00:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

2022-12-07 11:47:43 +00:00

res-product

Import translations. DO NOT MERGE ANYWHERE

2023-08-15 17:40:45 -07:00

src/com/android/settings

Merge "Basic structure for fingerprint enrollment." into main

2023-08-16 15:10:55 +00:00

tests

Fixing RemoteAuth Tests breakage

2023-08-16 18:45:09 +00:00

.gitignore

…

Android.bp

Merge "Basic structure for fingerprint enrollment." into main

2023-08-16 15:10:55 +00:00

AndroidManifest.xml

Merge "Basic structure for fingerprint enrollment." into main

2023-08-16 15:10:55 +00:00

CleanSpec.mk

Move the app to /system_ext

2020-01-16 06:45:18 +00:00

color-check-baseline.xml

Merge "Disabled state UI of Flash Notifications preview button" into udc-dev

2023-05-11 01:41:47 +00:00

NOTICE

…

OWNERS

Merge "Extend resource OWNERS exemption to other res folders (res-product). " into main

2023-07-12 22:03:16 +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 presubmit biometrics unit tests

2023-05-11 06:07:08 +00:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%