Xin Li 3f7e49dbc6 [automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: 3efb972a55 -s ours am: d47d22ecaf -s ours ...

am skip reason: Merged-In Ib5c41ab9214cf34a17ef02864dccffb5371cfe3a with SHA-1 b781605c1e is already in history

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

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

2024-09-07 04:23:44 +00:00

aconfig

Merge "Show a dialog if bluetooth key is missing when reconnecting" into main

2024-09-06 08:18:55 +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 "Show a dialog if bluetooth key is missing when reconnecting" into main

2024-09-06 08:18:55 +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-09-05 05:58:17 -07:00

src/com/android/settings

Merge "Update main toggle state in User Settings onResume()" into main

2024-09-06 14:29:09 +00:00

tests

Merge "Show a dialog if bluetooth key is missing when reconnecting" into main

2024-09-06 08:18:55 +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

Merge "Show a dialog if bluetooth key is missing when reconnecting" into main

2024-09-06 08:18:55 +00:00

CleanSpec.mk

Move the app to /system_ext

2020-01-16 06:45:18 +00:00

color-check-baseline.xml

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

2024-06-04 12:35:56 +08:00

NOTICE

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

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

Wrap tintable icons with correctly tinted drawable XML

2015-04-10 15:46:18 -07:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%