Eric Biggers fd1e089b4c Merge "Unlock non-secure users automatically (2/2)" into main am: fcaf0aceeb am: 3eb12fab5e am: 81afb5c097 ...

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

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

2023-10-19 01:22:26 +00:00

aconfig

fingerprint pre-enroll calibration

2023-10-18 04:25:14 +00:00

libs

…

protos

Add a mechanism to log battery usage periodic job events

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

res

Merge "Revert "Adding screenshot tests to settings"" into main

2023-10-18 10:20:42 +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-10-06 15:42:54 -07:00

src/com/android/settings

Merge "Unlock non-secure users automatically (2/2)" into main am: fcaf0aceeb am: 3eb12fab5e am: 81afb5c097

2023-10-19 01:22:26 +00:00

tests

Merge changes from topic "angle-developer-option-toggle1" into main am: 0481d6a318 am: c711d1c39a

2023-10-18 21:09:15 +00:00

.gitignore

Update .gitignore list

2023-09-28 10:40:22 -07:00

Android.bp

Merge "Settings for Polite Notifications" into main

2023-10-11 12:04:37 +00:00

AndroidManifest.xml

Fix battery usage database is not clear when time is changed

2023-10-11 17:40:14 +08: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

Revert "Move SettingsUITests to presubmit"

2023-09-26 07:21:01 +00:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%