Treehugger Robot f11e2b4968 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 09bcd6cab8 -s ours ...

am skip reason: contains skip directive

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

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

2024-04-22 17:39:58 +00:00

aconfig

Merge "Add trunk stable flag for slice retirement" into main

2024-04-19 09:57:05 +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 16:54:41 +00:00

res

Create AppDataUsageSummaryController

2024-04-22 04:58:49 +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-18 22:30:30 -07:00

src/com/android/settings

Merge "Add info on whether the rule is active to ZenMode" into main

2024-04-22 16:20:38 +00:00

tests

Merge "Add info on whether the rule is active to ZenMode" into main

2024-04-22 16:20:38 +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 "Add READ_SYSTEM_GRAMMATICAL_GENDER to Settings app" into main

2024-04-22 07:27:19 +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%