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

am skip reason: contains skip directive

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

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

2024-06-26 19:44:58 +00:00

aconfig

Merge "Added External Display settings page" into main

2024-06-25 15:01:01 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Add AppOptimizationModeEventsUtils to save & update app optimization mode expiration events.

2024-06-03 19:42:26 +08:00

res

Merge "Revise the order in the strings to make "Face" in front of "Fingerprint" except for "Choose a screen lock" screen" into main

2024-06-26 17:09:49 +00:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

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

res-product

Revise the order in the strings to make "Face" in front of

2024-06-26 06:41:05 +00:00

src/com/android/settings

Merge "Add more condition to avoid to open the SimOnboardingActivity" into main

2024-06-26 17:15:20 +00:00

tests

Merge "Move 'show hidden channels' option" into main

2024-06-26 13:30:48 +00:00

.gitignore

Update .gitignore list

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

Android.bp

Migrate Settings intents

2024-06-20 12:48:40 -04:00

AndroidManifest.xml

Merge "Opt out of predictive back for biometrics" into main

2024-06-24 18:26:23 +00:00

CleanSpec.mk

…

color-check-baseline.xml

Fix color_hook broken in repo upload caused by ag/27381753.

2024-06-04 12:35:56 +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

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%