TreeHugger Robot 02232ddccd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c2a92b394e -s ours am: 647555b203 -s ours am: 33bd312320 -s ours am: f85bda0633 -s ours ...

am skip reason: subject contains skip directive

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

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

2023-05-31 19:44:50 +00:00

libs

…

protos

Add allowlist mechanism for battery optimization mode

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

res

Merge "Import translations. DO NOT MERGE ANYWHERE"

2023-05-31 19:16:40 +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:30:23 -07:00

src/com/android/settings

Merge "Fix RTL-flipped phone number in Conversations" into udc-qpr-dev am: 8238bfd731 am: e2afcd0d8b

2023-05-31 10:32:18 +00:00

tests

Merge "Move UpdatableListPreferenceDialogFragment to Settings"

2023-05-31 08:16:11 +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

Update activity name for ManageFullScreenIntent am: 94906cfe3d am: 22b3c0462f

2023-05-30 03:38:56 +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%