Treehugger Robot 42815119ca [automerger skipped] Merge "Merge 24Q3 (ab/AP3A.240905.015) to aosp-main-future" into aosp-main-future am: 05422458fe -s ours ...

am skip reason: Merged-In I54a12b03ed9be6dc49fb957df0f1f7b31647810d with SHA-1 da21128568 is already in history

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

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

2024-08-15 18:24:56 +00:00

aconfig

Merge "[Physical Keyboard] Add flag for keyboard a11y new page features" into main

2024-08-14 02:26:13 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Fix search for MMS Message

2024-07-30 11:34:24 +08:00

res

Merge "Implement Spatial audio toggle domain layer" into main

2024-08-15 10:54:48 +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-08-12 20:56:14 -07:00

src/com/android/settings

Merge "Prevent restricted users from being made admins" into main

2024-08-15 16:59:58 +00:00

tests

Merge "Read new value of admin status on UserCapabilities update" into main

2024-08-15 15:10:46 +00:00

.gitignore

Update .gitignore list

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

Android.bp

Merge "[Physical Keyboard] Add flag for keyboard a11y new page features" into main

2024-08-14 02:26:13 +00:00

AndroidManifest.xml

Add interstitial for modes that are disabled but not by user

2024-08-01 18:44:22 -04:00

CleanSpec.mk

…

color-check-baseline.xml

Fix color_hook broken in repo upload caused by ag/27381753.

2024-06-04 12:35:56 +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

Keep FakeFeatureFlagsImpl

2024-06-27 08:46:17 +00: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%