Xin Li a233ff2126 [automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: f0e00b8bf7 -s ours ...

am skip reason: Merged-In I96574a79eba581db95d387f0d9c9fde2e004c41c with SHA-1 c9a3eeb792 is already in history

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

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

2024-05-29 20:48:53 +00:00

aconfig

Merge "Add Device Diagnostics to Settings." into main

2024-05-15 20:58:32 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Update database clear & job refresh mechanism for time zone change intent

2024-05-10 11:22:58 +08:00

res

Merge "Import translations. DO NOT MERGE ANYWHERE" into main

2024-05-29 19:23:14 +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-05-28 22:20:44 -07:00

src/com/android/settings

Merge "Ignore OEM Unlocking when wiping PDB during factory reset on V+" into main

2024-05-29 16:23:18 +00:00

tests

Merge "Ignore OEM Unlocking when wiping PDB during factory reset on V+" into main

2024-05-29 16:23:18 +00:00

.gitignore

Update .gitignore list

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

Android.bp

Fix incorrect password attempts messaging on headless

2024-04-19 12:49:31 +00:00

AndroidManifest.xml

Merge "Create activity for BluetoothDashboardFragment." into main

2024-05-27 07:19:32 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

feat(brightness suw): add brightness preferences in suw

2024-05-15 03:19:40 +00: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 VPN2 package to Presubmit as the tests aren't flaky during local tests.

2024-05-21 08:49:04 +00:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%