Xin Li ac425a05cb [automerger skipped] Merge Android 14 QPR2 to AOSP main am: a80653d111 -s ours ...

am skip reason: Merged-In I309e4d56dc379680d07bf1e28648ca620b824bad with SHA-1 887741ee49 is already in history

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

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

2024-03-07 09:54:56 +00:00

aconfig

Add the flag to control the dual sim onboarding feature

2023-12-13 07:15:47 +00:00

libs

Use androidx.window from prebuilt.

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

protos

[DON'T BLOCK] Test ownership migration rules

2024-02-09 17:45:41 +00:00

res

Merge "[Thread] add Thread toggle in settings" into main am: 522e193947

2024-02-29 17:43:51 +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 "[Thread] fix wrong kotlin argument name" into main am: dee4388b93

2024-03-05 15:22:33 +00:00

tests

Merge "[Thread] add Thread toggle in settings" into main am: 522e193947

2024-02-29 17:43:51 +00:00

.gitignore

Update .gitignore list

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

Android.bp

Merge "Drop platform_apis from android_library" into main am: ff6f53b24a

2024-02-21 19:09:57 +00:00

AndroidManifest.xml

Merge Android 24Q1 Release (ab/11220357)

2024-01-30 09:24:25 -08:00

CleanSpec.mk

Move the app to /system_ext

2019-11-25 20:28:35 +09:00

color-check-baseline.xml

Update Power Anomaly UI.

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

NOTICE

…

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

Revert "Adding screenshot tests to postsubmit."

2023-12-11 23:31:44 +00:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%