Bill Yi b3db689a07 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b5824f6c9 -s ours am: 0a31322199 -s ours am: 0813a0de64 -s ours am: 84b1429d7c -s ours ...

am skip reason: subject contains skip directive

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

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

2023-06-05 21:49:58 +00:00

libs

…

protos

Add allowlist mechanism for battery optimization mode

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

res

Merge "Use custom action key icon" into udc-qpr-dev am: dbec7ba7fb

2023-06-05 18:03:19 +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-29 05:31:30 -07:00

src/com/android/settings

Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev am: 89e829e3dc am: 0e3ea95a58 am: b9d09dddda

2023-06-05 19:49:39 +00:00

tests

Merge "Use custom action key icon" into udc-qpr-dev am: dbec7ba7fb

2023-06-05 18:03:19 +00:00

.gitignore

…

Android.bp

Update comment for Settings_srcs build target

2023-05-31 14:02:01 +08:00

AndroidManifest.xml

One more fix for missing Activity embedding allowlisting for Assistant.

2023-06-01 16:30:51 +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

Owners updates

2023-05-24 07:41:50 +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%