Bill Yi 193005bd26 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 31c51eb0d6 -s ours ...

am skip reason: subject contains skip directive

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

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

2023-03-31 20:34:18 +00:00

libs

…

protos

Add a config to hide the 3G option at preferred network mode UI

2023-02-08 07:48:08 +08:00

res

Merge "Change page title of More security & privacy settings" into udc-dev am: d082c0aa4c

2023-03-31 18:42:54 +00:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

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

res-product

Merge "Post-enroll settings screen shows class 3 strings" into udc-dev am: 9ff72e4205

2023-03-31 05:19:27 +00:00

src/com/android/settings

Merge "Moves lock screen shortcuts summary loading to the background." into udc-dev

2023-03-31 18:48:29 +00:00

tests

Merge "Moves lock screen shortcuts summary loading to the background." into udc-dev

2023-03-31 18:48:29 +00:00

.gitignore

…

Android.bp

Exclude screen on time in battery usage page when the device is in charging.

2023-03-30 20:23:33 +08:00

AndroidManifest.xml

Exclude screen on time in battery usage page when the device is in charging.

2023-03-30 20:23:33 +08:00

CleanSpec.mk

…

color-check-baseline.xml

Fix checkcolor_hook error of Settings

2023-03-30 20:51:09 +08:00

NOTICE

…

OWNERS

Merge "Fixes resource file exemption."

2023-01-30 20:28:12 +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

Add AppStoragePreference for Spa

2022-10-13 17:21:08 +08:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%