Treehugger Robot 5751c90a3a [automerger skipped] Merge "Fix SubscriptionInfoListViewModelTest" into main am: c07341d522 am: 9c803b5dcb -s ours ...

am skip reason: Merged-In I7a3d27cb53c930a56ab0f0896b545807bf4f9dc0 with SHA-1 f97e76bc3f is already in history

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

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

2024-06-18 08:32:08 +00:00

aconfig

Merge "[ConnectedDevicePage] Make bonded bluetooth devices can be found by Settings search" into main

2024-06-11 10:50:04 +00:00

libs

Use androidx.window from prebuilt.

2022-04-14 09:55:36 +00:00

protos

Add AppOptimizationModeEventsUtils to save & update app optimization mode expiration events.

2024-06-03 19:42:26 +08:00

res

Merge "Import translations. DO NOT MERGE ANYWHERE" into main

2024-06-17 21:32:39 +00:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

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

res-product

Import translations. DO NOT MERGE ANYWHERE

2024-06-13 14:48:04 -07:00

src/com/android/settings

Merge "Use Kotlin List & NonNull String" into main

2024-06-18 08:21:28 +00:00

tests

Merge "[Audiosharing] Add audio sharing loggings (P4)" into main

2024-06-18 07:47:24 +00:00

.gitignore

Update .gitignore list

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

Android.bp

Biometrics Enrollment refactor (7/N)

2024-06-05 18:18:59 +00:00

AndroidManifest.xml

[Audiosharing] Clean up unused code.

2024-06-04 07:09:03 +00:00

CleanSpec.mk

Move the app to /system_ext

2020-01-16 06:45:18 +00:00

color-check-baseline.xml

Fix color_hook broken in repo upload caused by ag/27381753.

2024-06-04 12:35:56 +08:00

NOTICE

…

OWNERS

Remove yantingyang from OWNERS

2024-02-05 08:46:27 +00:00

PREUPLOAD.cfg

Migrate stringslint.py to AyeAye.

2022-08-03 13:52:10 -06:00

proguard.flags

Refine Settings proguard rules

2022-10-06 09:10:38 -07: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%