Bill Yi 5e9e77e3ee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2653ed9e80 -s ours am: 794185fe20 -s ours ...

am skip reason: subject contains skip directive

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

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

2023-07-08 19:23:41 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Add allowlist mechanism for battery optimization mode

2023-05-15 14:28:49 +08:00

res

Import translations. DO NOT MERGE ANYWHERE

2023-07-06 22:13:52 -07:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

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

res-product

Support the about device warning message for tablets

2023-06-28 02:28:34 +00:00

src/com/android/settings

Merge "Restrict ApnEditor settings" into main

2023-07-07 13:50:42 +00:00

tests

Merge "Restrict ApnEditor settings" into main

2023-07-07 13:50:42 +00:00

.gitignore

…

Android.bp

Merge "Moving FingerprintSettings to Kotlin"

2023-06-29 12:31:22 +00:00

AndroidManifest.xml

Merge "Clean up assist gesture from Settings" into main

2023-07-06 05:42:20 +00:00

CleanSpec.mk

…

color-check-baseline.xml

Merge "Disabled state UI of Flash Notifications preview button" into udc-dev

2023-05-11 01:41:47 +00:00

NOTICE

…

OWNERS

Owners updates

2023-05-24 07:41:50 +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 presubmit biometrics unit tests

2023-05-09 15:18:50 +08:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%