Xin Li a907af136a [automerger skipped] Merge 25Q1 (ab/12770256) to aosp-main-future am: 5bfde9fbf5 -s ours ...

am skip reason: Merged-In Iaee6792d1a27be8fa4b443f783a47a3715b6d3a1 with SHA-1 087ac777a8 is already in history

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

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

2025-02-27 18:38:12 -08:00

aconfig

Merge "Remove all associaitons when forget a device in Settings" into main

2025-02-27 13:04:53 -08: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 "Talkback should not announce Selected when changing screen resolution" into main

2025-02-27 15:07:14 -08:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

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

res-product

Remove all associaitons when forget a device in Settings

2025-02-26 17:35:23 +00:00

src/com/android/settings

Merge "Talkback should not announce Selected when changing screen resolution" into main

2025-02-27 15:07:14 -08:00

tests

Merge "Remove all associaitons when forget a device in Settings" into main

2025-02-27 13:04:53 -08:00

.gitignore

Update .gitignore list

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

Android.bp

Changes to add Ethernet settings row item

2025-02-15 18:20:46 +00:00

AndroidManifest.xml

[Audiosharing] Add join handler activity to manifest

2025-02-25 16:48:46 +08:00

CleanSpec.mk

…

color-check-baseline.xml

Update color-check-baseline.xml

2024-09-23 11:06:20 +08:00

NOTICE

…

OWNERS

Update OWNERS for Android Settings

2024-11-28 09:15:16 +00:00

PREUPLOAD.cfg

Disable checkcolor hook

2024-11-22 12:59:43 +00:00

proguard.flags

Explicitly keep default constructor in rules without members

2025-01-08 00:15:31 -08: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%