Justin Yun 1cf3f07163 [automerger skipped] Merge "Revert "Replace system_ext container with system"" into main am: faa8f0e399 am: badb14fdb1 -s ours ...

am skip reason: Merged-In I8f52d5f86e6ffaccd624846fbe1ba0a8fc842af6 with SHA-1 1337a88d11 is already in history

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

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

2025-01-24 02:18:31 -08:00

aconfig

settings_connectivity_flags is used from system_ext app

2025-01-24 16:23:38 +09: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 "Import translations. DO NOT MERGE ANYWHERE" into main

2025-01-22 14:51:31 -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 01:22:42 -08:00

src/com/android/settings

Merge "[Audiosharing] add profile service listener when BT just on" into main

2025-01-23 18:23:17 -08:00

tests

Merge "[Audiosharing] add profile service listener when BT just on" into main

2025-01-23 18:23:17 -08:00

.gitignore

Update .gitignore list

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

Android.bp

Merge "Allow to open Content Protection settings externally" into main

2025-01-07 00:58:53 -08:00

AndroidManifest.xml

Merge "Create Double Tap Power Settings Activity" into main

2025-01-17 11:35:54 -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

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

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%