Lin Yuan 6d140ee148 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into rvc-dev am: 3a95e552c6 am: 95d21bc12f -s ours am: 18c00007b7 -s ours am: 8e637809fd -s ours am: 312065af42 -s ours am: 91a7965763 -s ours am: d618ebd737 -s ours am: 1c0e8bd8d3 -s ours ...

am skip reason: subject contains skip directive

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

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

2022-06-24 05:39:24 +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 tm-dev

2022-06-21 16:17:20 +00:00

src/com/android/settings

Merge "Well control enrolling icon animation by UX design" into tm-qpr-dev am: 84154328df am: c51deb5ccd

2022-06-24 01:13:51 +00:00

tests

Merge "Add unit tests for verifying title"

2022-06-23 17:17:38 +00:00

.gitignore

…

Android.bp

Enable Kotlin for Settings App

2022-05-30 01:58:25 +08:00

AndroidManifest.xml

Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31 am: e941740b35

2022-06-22 19:43:37 +00:00

CleanSpec.mk

…

color-check-baseline.xml

Clean up unused string resource sync_plug

2022-06-01 18:43:10 +08:00

NOTICE

…

OWNERS

Update owner list

2022-05-30 01:11:08 +00:00

PREUPLOAD.cfg

…

proguard.flags

Import the window extension libary in the Settings app

2021-08-24 12:01:35 +08:00

TEST_MAPPING

…

wrap_alpha.py

…

Description

No description provided

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%