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

am skip reason: contains skip directive

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

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

2024-07-23 09:20:36 +00:00

aconfig

Merge "Add accessibility appearance settings backup feature flag" into main

2024-07-17 09:28:02 +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 changes Ibb68252c,Ide20e07f,I5d2e2c70 into main

2024-07-23 02:52:11 +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-07-15 19:23:42 -07:00

src/com/android/settings

Merge "Add mandatory biometric prompt to platform surfaces (3/N)" into main

2024-07-23 05:20:19 +00:00

tests

Merge "Add mandatory biometric prompt to platform surfaces (3/N)" into main

2024-07-23 05:20:19 +00:00

.gitignore

Update .gitignore list

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

Android.bp

Clean up slice from spa and move androidx.slice dependency to Settings.

2024-07-18 08:25:48 +00:00

AndroidManifest.xml

Merge "Revert^2 "Support search "Mobile data""" into main

2024-07-15 05:35:40 +00:00

CleanSpec.mk

Move the app to /system_ext

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

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

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%