Xin Li c7699dd04c [automerger skipped] Merge 25Q1 (ab/BP1A.250305.020) to aosp-main-future am: 10d930d1cf -s ours ...

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

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

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

2025-03-06 18:30:19 -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 "Update string name to "desktop windowing" from "Desktop view" for developer options." into main

2025-03-06 05:57:01 -08:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

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

res-product

Import translations. DO NOT MERGE ANYWHERE

2025-03-03 20:39:10 -08:00

src/com/android/settings

Merge "Fix for next button contentdescription in TextReadingPreviewPreference" into main

2025-03-06 16:14:03 -08:00

tests

Merge "Hide 'Reset mobile network settings' if not telephony capable" into main

2025-03-06 06:20:31 -08:00

.gitignore

Update .gitignore list

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

Android.bp

Merge 25Q1 (ab/12770256) to aosp-main-future

2025-02-26 11:59:26 -08:00

AndroidManifest.xml

Update ActionDisabledByAdvancedProtectionDialog

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

CleanSpec.mk

…

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%