Xin Li ce57d7c3c0 [automerger skipped] Merge "Merge Android 14 QPR2 to AOSP main" into main am: 12e4524868 -s ours am: fe3023d496 -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: Id494c4c38bd7bd1689e706944de8580d9f8ae0e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2024-03-07 10:49:18 +00:00

aconfig

Merge changes I69049a13,I7fcc01b8 into main

2024-02-28 19:38:27 +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 16:54:41 +00:00

res

Merge "Add the mechanism of enable DSDS" into main

2024-03-07 04:33:37 +00:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

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

res-product

Import translations. DO NOT MERGE ANYWHERE

2024-03-01 18:35:22 -08:00

src/com/android/settings

Merge "Sort the selectable subscription by id" into main

2024-03-07 06:40:34 +00:00

tests

Merge "Sort the selectable subscription by id" into main

2024-03-07 06:40:34 +00:00

.gitignore

Update .gitignore list

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

Android.bp

[DataStore] Migrate BatteryBackupHelper to BackupRestoreStorage

2024-03-03 22:42:00 +08:00

AndroidManifest.xml

Merge "Change WepNetworkDialogActivity exported="true"." into main

2024-03-04 10:15:53 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Fix settings/widget test failures

2024-03-04 16:55:55 +08:00

NOTICE

…

OWNERS

Remove yantingyang from OWNERS

2024-02-05 08:46:27 +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 Safety Center & Security unit tests on presubmit.

2024-02-08 16:08:40 +00:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%