SongFerng Wang 9259bb9b43 [automerger skipped] Merge "Encounter unknown error in test" into main am: 45d7ae68e4 am: ddd033762b -s ours ...

am skip reason: Merged-In I76bfc4c1cabaf569d74309e9e9ad6612f5649d9b with SHA-1 dd7e4d27ae is already in history

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

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

2024-12-29 19:49:57 -08:00

aconfig

[Settings] Add feature flag for new UI

2024-12-22 22:45:46 -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 "Update Flash Notifications screen with expressive design" into main

2024-12-28 17:35:28 -08:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

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

res-product

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

2024-12-26 11:58:01 -08:00

src/com/android/settings

Merge "[Catalyst] Implement get{Read,Write}Permissions for Use Battery Saver" into main

2024-12-29 16:49:23 -08:00

tests

Merge "Update Flash Notifications screen with expressive design" into main

2024-12-28 17:35:28 -08:00

.gitignore

Update .gitignore list

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

Android.bp

Merge "Hide Linux terminal if VM isn't supported" into main am: c8e78dc149 am: bf33cb8c33

2024-12-28 08:18:17 -08:00

AndroidManifest.xml

Merge "Revert "[AAPM] Add advanced protection dialog according to API f..."" into main

2024-12-27 14:25:58 -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%