Xin Li d122c78e33 [automerger skipped] Merge "Merge 10952656" into aosp-main-future am: 7b262e34b7 -s ours ...

am skip reason: Merged-In Ib02ae9caef06a46938947806dac8aabb1fa12d94 with SHA-1 8319a77527 is already in history

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

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

2023-10-19 18:50:49 +00:00

libs

Use androidx.window from prebuilt.

2022-04-14 09:55:36 +00:00

protos

Add a mechanism to log battery usage periodic job events

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

res

[Cherry-pick] Add debug property to safe guard ANGLE developer option UI.

2023-10-17 21:06:05 +00:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

2022-12-07 11:47:43 +00:00

res-product

Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8 am: 5007841ebd

2023-06-20 07:28:29 +00:00

src/com/android/settings

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

2023-10-19 00:33:18 +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

…

Android.bp

Battery usage page latency improvement (1-8)

2023-08-16 15:12:04 +08:00

AndroidManifest.xml

Use experimental string in user aspect ratio settings

2023-09-22 14:12:25 +00:00

CleanSpec.mk

Move the app to /system_ext

2020-01-16 06:45:18 +00:00

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-11 06:07:08 +00:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%