Xin Li c118ba99fa [automerger skipped] Merge "Merge Android 14 QPR1" into main am: 32cdca80cc -s ours am: 5cd5689267 -s ours ...

am skip reason: Merged-In I22fa193e9846fdb998810c93c9c26344a40d89a9 with SHA-1 4f1ec8cb8a is already in history

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

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

2023-12-11 22:05:10 +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

Async load eid in SimEidPreferenceController am: d3cc9b20e4

2023-12-05 07:12:45 +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-09-13 03:59:47 -07:00

src/com/android/settings

Check isSimHardwareVisible earlier am: b731e63096

2023-12-05 07:12:53 +00:00

tests

Merge "Unconditionally enable ANGLE developer option UI." into main am: 4e6db90f5d am: bcefa0a8c4

2023-11-17 02:39:48 +00:00

.gitignore

…

Android.bp

Merge "settings: Remove @hide NFC API usage" into main am: 75a49e0abb

2023-11-30 18:31:27 +00:00

AndroidManifest.xml

Merge "settings(nfc): Remove NFC beam settings" into main am: e8df63f148

2023-10-30 21:03:30 +00:00

CleanSpec.mk

Move the app to /system_ext

2019-11-25 20:28:35 +09: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%