Bill Yi 960eae9a2f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d77ddd6ab3 -s ours ...

am skip reason: subject contains skip directive

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

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

2023-03-01 01:34:32 +00:00

libs

Use androidx.window from prebuilt.

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

protos

[Settings] Code refactor - NetworkModePreference

2022-03-21 00:18:55 +00:00

res

Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master

2023-02-27 23:59:16 +00:00

src/com/android/settings

Merge "Update Autofill OWNERS" am: e35606efd3

2023-02-28 23:23:30 +00:00

tests

Merge changes from topic "nfc_logging_control" am: 4de9ff1a8f

2023-02-22 18:31:00 +00:00

.gitignore

Create gitignore for Settings

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

Android.bp

Added intro lottie for foldable.

2022-11-04 02:57:38 +00:00

AndroidManifest.xml

Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" am: 60763d6941

2023-02-23 07:27:18 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Bool to note Pending Intent bug fixed

2022-07-21 11:01:15 +00: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

Import the window extension libary in the Settings app

2021-08-19 17:23:11 +08:00

TEST_MAPPING

Change test case name

2020-02-03 01:03:46 +00:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%