Treehugger Robot 64faf68d0b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: d52951de52 -s ours ...

am skip reason: subject contains skip directive

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

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

2023-07-22 02:48:30 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Add allowlist mechanism for battery optimization mode

2023-05-15 14:28:49 +08:00

res

Import translations. DO NOT MERGE ANYWHERE

2023-07-18 14:41:23 -07:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

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

res-product

Import translations. DO NOT MERGE ANYWHERE

2023-07-06 21:38:09 -07:00

src/com/android/settings

Update learn more string for udfps fp settings am: c6c9d74f06

2023-07-22 00:51:46 +00:00

tests

Merge "[Regulatory Labels] Load labels from overlays" into udc-d1-dev am: fe38ff963a

2023-07-11 08:30:00 +00:00

.gitignore

…

Android.bp

Exclude screen on time in battery usage page when the device is in charging.

2023-03-30 20:23:33 +08:00

AndroidManifest.xml

[Regulatory Labels] Load labels from overlays

2023-07-07 14:52:26 +00:00

CleanSpec.mk

…

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

…

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%