Bill Yi b2f1f13a2c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c796674b36 -s ours am: 6048dbb88d -s ours ...

am skip reason: subject contains skip directive

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

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

2023-05-17 19:58:50 +00:00

libs

…

protos

Add allowlist mechanism for battery optimization mode

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

res

Merge "Add FSI toggle to per-app notification settings" into udc-dev am: 28edfb8df9 am: 2474419ac8 am: e7eb3ab983

2023-05-17 16:41:49 +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-09 19:19:35 -07:00

src/com/android/settings

Merge "Add FSI toggle to per-app notification settings" into udc-dev am: 28edfb8df9 am: 2474419ac8 am: e7eb3ab983

2023-05-17 16:41:49 +00:00

tests

Merge "Add FSI toggle to per-app notification settings" into udc-dev am: 28edfb8df9 am: 2474419ac8 am: e7eb3ab983

2023-05-17 16:41:49 +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

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%