Xin Li 967bdd4310 [automerger skipped] Merge Android 14 QPR1 am: 784b56d43f -s ours am: 7d2f4be0ba -s ours am: 36a2f3cc93 -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: I4bae7926a47aa80d04c89cdbe7f7d4d9737b8881
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2023-12-11 22:57:30 +00:00

aconfig

Add flag to offload bluetooth callback/operations to background thread

2023-11-30 11:05:39 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Update battery usage data clear mechanism while time change.

2023-11-03 15:25:17 +08:00

res

Merge "feat(MultiFingerMultiTap): Update shortcut string to double tap from triple tap" into main

2023-12-09 05:04:34 +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-11-29 18:33:38 -08:00

src/com/android/settings

Merge "Lock Private space at the end of PS setup." into main

2023-12-11 22:05:12 +00:00

tests

Lock Private space at the end of PS setup.

2023-12-11 20:43:59 +00:00

.gitignore

Update .gitignore list

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

Android.bp

Re-enable nullaway plugin

2023-11-30 21:36:24 +08:00

AndroidManifest.xml

Add activity to handle app specific request to open media routing controll special

2023-12-08 08:52:44 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Update Power Anomaly UI.

2023-11-13 11:52:44 +08:00

NOTICE

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

OWNERS

Update Settings OWNERS file

2023-10-26 19:54:52 +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

Adding screenshot tests to postsubmit.

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

wrap_alpha.py

Wrap tintable icons with correctly tinted drawable XML

2015-04-10 15:46:18 -07:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%