Tom Hsu aeb05239de [automerger skipped] Merge "Avoid test flaky" into main am: ec571901be am: 60d85b9363 -s ours ...

am skip reason: Merged-In Id1290e6979fdafa93ded6f50e49d6b3464a80b50 with SHA-1 1955144ffc is already in history

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

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

2024-10-14 04:47:32 +00:00

aconfig

Sound screen migration

2024-10-11 04:00:17 +00: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 VPN app dialog message to include version code" into main

2024-10-14 03:37:58 +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-09-26 15:21:29 -07:00

src/com/android/settings

Merge "Connect to OWE Wi-Fi network when QR code has no password" into main

2024-10-14 03:52:39 +00:00

tests

Merge "Connect to OWE Wi-Fi network when QR code has no password" into main

2024-10-14 03:52:39 +00:00

.gitignore

Update .gitignore list

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

Android.bp

Include settings flags into flags_packages

2024-09-26 11:25:43 +08:00

AndroidManifest.xml

Merge "[Language Setting] Cleanup Language and Input Setting" into main

2024-10-08 06:33:28 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Update color-check-baseline.xml

2024-09-23 11:06:20 +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

Keep FakeFeatureFlagsImpl

2024-06-27 08:46:17 +00: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

Wrap tintable icons with correctly tinted drawable XML

2015-04-10 15:46:18 -07:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%