Oriol Prieto Gasco 18f711f552 [automerger skipped] RESTRICT AUTOMERGE am: 0a441b2f06 am: 1aaa1f96ca -s ours ...

am skip reason: contains skip directive

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

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

2024-05-03 14:52:26 +00:00

aconfig

fix container designation, it should be system_ext

2024-04-30 22:06:28 +00:00

libs

Use androidx.window from prebuilt.

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

protos

[DON'T BLOCK] Test ownership migration rules

2024-02-09 17:45:41 +00:00

res

Merge "Add a new string for the hide settings" into main

2024-05-03 14:32:08 +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-04-28 19:48:11 -07:00

src/com/android/settings

Merge "Check whether the user is a sub profile before starting Settings homepage" into main

2024-05-03 02:14:26 +00:00

tests

Merge "Fix test case failed issue" into 24D1-dev am: df8dc5dc61

2024-05-03 02:37:33 +00:00

.gitignore

Update .gitignore list

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

Android.bp

Fix incorrect password attempts messaging on headless

2024-04-19 12:49:31 +00:00

AndroidManifest.xml

Merge "Revert^2 "Add a new warning dialog for Satellite mode"" into 24D1-dev am: 0a8d830616

2024-04-30 07:24:09 +00:00

CleanSpec.mk

Move the app to /system_ext

2019-11-25 20:28:35 +09:00

color-check-baseline.xml

Fix settings/widget test failures

2024-03-04 16:55:55 +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

Enabling private space unit tests in presubmit

2024-03-25 12:38:39 +00:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%