Xin Li c847dc7e0e [automerger skipped] Merge "Merge 25Q1 (ab/BP1A.250305.020) to AOSP main" into main am: 9e67fd6d31 am: 4289f97705 -s ours ...

am skip reason: Merged-In I04f90b42907d07c6111a7b41a531f7717df33672 with SHA-1 f29f29cdc0 is already in history

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

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

2025-03-10 11:48:07 -07:00

aconfig

Merge "[catalyst] migrate media controls settings" into main

2025-03-07 07:27:51 -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

Update the required or optional styles of EditText in VPN settings

2025-03-10 15:32:42 +08:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

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

res-product

Merge "Settings: Duplicate device product strings for desktop" into main

2025-03-07 16:10:09 -08:00

src/com/android/settings

[MainSwitchPreference] Remove SettingsMainSwitchPreferenceController

2025-03-11 00:35:01 +08:00

tests

[MainSwitchPreference] Remove SettingsMainSwitchPreferenceController

2025-03-11 00:35:01 +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

Update ActionDisabledByAdvancedProtectionDialog

2025-03-04 12:00:50 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

[Expressive design] Add colors for homepage icons

2025-02-26 06:24:47 -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%