Automerger Merge Worker 729874bb31 Merge changes from topic "am-6f9e4022de18455493ebda8b0cfe7548" into udc-d1-dev-plus-aosp am: b273d4ce5e am: 7a561f02d5 ...

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

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

2023-07-17 19:08:25 +00:00

libs

…

protos

Add a mechanism to log battery usage periodic job events

2023-07-07 17:47:19 +08:00

res

Merge "Add 'Stay unlocked on fold' toogle to settings" into udc-qpr-dev am: 8c68b0e7e2 am: 32d914ea56

2023-07-17 16:48:24 +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-07-06 22:31:41 -07:00

src/com/android/settings

Merge "Add 'Stay unlocked on fold' toogle to settings" into udc-qpr-dev am: 8c68b0e7e2 am: 32d914ea56

2023-07-17 16:48:24 +00:00

tests

Merge "Add 'Stay unlocked on fold' toogle to settings" into udc-qpr-dev am: 8c68b0e7e2 am: 32d914ea56

2023-07-17 16:48:24 +00:00

.gitignore

…

Android.bp

Moving FingerprintSettings to Kotlin

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

AndroidManifest.xml

Moving FingerprintSettings to Kotlin

2023-07-11 17:43:07 +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

Migrate stringslint.py to AyeAye.

2022-08-03 13:52:10 -06:00

proguard.flags

Refine Settings proguard rules

2022-10-06 09:10:38 -07:00

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%