Shraddha Basantwani 5702cc90d4 [automerger skipped] Merge "RESTRICT AUTOMERGE Add biometric authentication for package modification" into tm-dev am: f313de51cf am: 1135fa48e1 -s ours am: ba7d8ce77e -s ours am: 4dd997ea37 -s ours am: c467e11211 -s ours ...

am skip reason: contains skip directive

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

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

2025-02-20 23:21:07 -08:00

aconfig

Merge "Remove the perform backup tasks flag." into main

2025-02-19 09:05:21 -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 "16KB -> 16 KB" into main am: 63a8931a41 am: 1c2464aae4

2025-02-20 20:13:38 -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-02-14 12:43:08 -08:00

src/com/android/settings

Merge "[Audiosharing] Adopt fallback API when developer preview on" into main

2025-02-20 23:01:25 -08:00

tests

Merge "[Battery refactor] Move stylus related functions to BluetoothUtils as util functions." into main

2025-02-20 21:36:37 -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 actions to AudioSharingReceiver intent filter

2025-02-17 15:48:28 +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%