Xin Li beaed58a46 [automerger skipped] Merge "Merge Android 14 QPR3 to AOSP main" into main am: 87973cf893 -s ours ...

am skip reason: Merged-In If518bbb88342ae4c2e5e9f131727de58446be780 with SHA-1 cb7bd9dd74 is already in history

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

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

2024-06-17 20:43:48 +00:00

aconfig

Merge Android 24Q2 Release (ab/11526283) to aosp-main-future

2024-05-23 14:12:07 -07: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 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future

2024-06-05 14:12:13 -07:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

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

res-product

Import translations. DO NOT MERGE ANYWHERE

2024-04-10 18:00:26 +00:00

src/com/android/settings

Merge "Fix NPE force close if disabling BT feature" into main am: 1bb8e28762

2024-06-07 08:56:58 +00:00

tests

Merge "Move Enable16KbTest to device-tests" into main am: df6affdc3d

2024-06-12 01:27:02 +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 Android 24Q2 Release (ab/11526283) to aosp-main-future

2024-05-23 14:12:07 -07:00

CleanSpec.mk

…

color-check-baseline.xml

Update Power Anomaly UI.

2023-11-13 11:52:44 +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%