Treehugger Robot c5dc26d495 Merge "Fix typo when execute query on BiometricSettingsProvider" into main am: fc564f2bd1 ...

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

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

2025-03-11 19:02:01 -07:00

aconfig

Revert "Replace system_ext container with system"

2025-03-02 14:31:20 -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 25Q1 (ab/BP1A.250305.020) to aosp-main-future

2025-03-06 12:22:41 -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-01-22 15:29:09 -08:00

src/com/android/settings

Merge "Fix typo when execute query on BiometricSettingsProvider" into main

2025-03-11 18:21:58 -07:00

tests

Merge 25Q1 (ab/BP1A.250305.020) to aosp-main-future

2025-03-06 12:22:41 -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

Revert^2 "Integrate Settings with Preference Service"

2024-12-06 17:20:48 +00:00

CleanSpec.mk

Move the app to /system_ext

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

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%