Matías Hernández 3b3697d704 [automerger skipped] Merge "Remove incorrect call to Window.addFlags with a system flag" into udc-dev am: 4a584df0c4 am: a434120410 -s ours ...

am skip reason: Merged-In I539fca77a1d136bdd0e4892993020884430b8a4e with SHA-1 e0510a62eb is already in history

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

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

2025-02-03 03:47:46 -08:00

aconfig

Merge "Add "Hub Mode" settings to mobile settings." into main

2025-01-27 20:28:02 -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 "Create "Change PIN" settings UI" into main

2025-01-31 14:13:12 -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-27 14:36:52 -08:00

src/com/android/settings

Merge "[Settings] Create new fragment for app language" into main

2025-02-03 00:54:39 -08:00

tests

Merge "Desktop Experience needs the device to be eligible" into main

2025-02-01 04:56:13 -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

Fix broken Safety Center redirect when SafetySourceData is null

2025-01-28 02:06:27 +00: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%