Bill Yi 9251669f95 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: efe3ce5660 -s ours am: b71dd78a86 -s ours am: cd8e1c9e26 -s ours am: 2e5bc64514 -s ours am: a3d289e6a4 -s ours ...

am skip reason: subject contains skip directive

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

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

2023-05-13 01:03:19 +00:00

libs

…

protos

Record app optimization mode backup into BatteryHistoricalLog

2023-05-11 10:48:47 +08:00

res

Merge "[Auto Pin Confirmation]: Fix the color token for the checkbox fill icon" into udc-dev am: 28cf617ca2 am: ee54053ace

2023-05-12 17:36:05 +00:00

res-export

…

res-product

Import translations. DO NOT MERGE ANYWHERE

2023-05-09 20:03:33 -07:00

src/com/android/settings

Merge "Add extra null checks" into udc-dev am: 598ff21b78 am: dd305f28e9

2023-05-12 22:33:34 +00:00

tests

Merge "Add logging when a group tile with PreferenceCategory widget is added to the screen" into udc-d1-dev am: 60069d3039 am: 521e527edd am: 8b7482cb5e

2023-05-12 17:51:27 +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 "Move Note Shortcut from Settings to SystemUI" into udc-dev am: f5a3485300 am: d608996d1f am: d478fe535e am: af658f1ab4

2023-05-10 18:57:21 +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-09 15:18:50 +08:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%