Bill Yi 11d22a70ee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: bc051a4860 -s ours ...

am skip reason: subject contains skip directive

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

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

2023-04-04 04:56:48 +00:00

libs

Use androidx.window from prebuilt.

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

protos

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

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

res

Merge "Show a dialog preventing fingerprint enrollment in split mode." into udc-dev

2023-04-03 21:14:37 +00:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"

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

res-product

Merge "Show Class 3 consent screen in enrollment with strong face." into udc-dev

2023-04-03 21:06:40 +00:00

src/com/android/settings

Merge "Fix App battery usage crash" into udc-dev

2023-04-04 04:47:31 +00:00

tests

Merge "Fix App battery usage crash" into udc-dev

2023-04-04 04:47:31 +00:00

.gitignore

Create gitignore for Settings

2019-04-04 12:49:15 -07:00

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

Move the app to /system_ext

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

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%