Bill Yi b8a491486e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c2e4800c6 -s ours am: c5a289d530 -s ours am: 45604d8938 -s ours am: e6a8da6540 -s ours ...

am skip reason: subject contains skip directive

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

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

2023-05-24 00:43:48 +00:00

libs

…

protos

Add allowlist mechanism for battery optimization mode

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

res

Merge "Remove volume_separate_notification flag" into udc-dev am: 7aa8424cc0 am: 2aecb2f1ea am: ffbc25e249

2023-05-22 15:17:18 +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-05-16 23:39:35 -07:00

src/com/android/settings

Merge "Fix the bytes displayed unit" into udc-qpr-dev am: 3168137798

2023-05-23 11:34:37 +00:00

tests

Merge "Fix the bytes displayed unit" into udc-qpr-dev am: 3168137798

2023-05-23 11:34:37 +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

Merge "Update theme for ChannelPanelActivity" into udc-dev

2023-05-16 12:06:37 +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

Update Settings owners list

2023-04-12 01:48:48 +00:00

PREUPLOAD.cfg

…

proguard.flags

…

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%