Bill Yi 120f89d40f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 458e8cc311 -s ours am: 269d31645e -s ours ...

am skip reason: subject contains skip directive

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

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

2023-09-08 00:36:35 +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" into aosp-main-future

2023-08-31 18:57:38 +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-08-30 20:14:48 -07:00

src/com/android/settings

Fix kotlin nullable errors in Settings

2023-09-07 17:11:11 +00:00

tests

Merge "Fix META-INF for settings library to match robolectric" into main am: cd34a5f6d6 am: cc1d59b3b9 am: eb446ca146

2023-08-30 16:51:10 +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

Revert "Fix rotate device at face unlock detailed page, device will display"

2023-07-25 20:31:36 +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%