Automerger Merge Worker 1a0002b8fd Merge changes from topic "am-c96afa0d048c4d6f8d1121d9e6343e97" into tm-d1-dev-plus-aosp ...

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 0a2b1de3a5 -s ours am: 6c9433b31e -s ours am: 2a21fa1024 -s ours am: e6ecfff870 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b81da264a8 -s ours am: e0da5747da -s ours am: 1a4297414e -s ours am: c0bf62368b -s ours

2022-05-02 22:55:33 +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 "Update the SafetyCenter icon" into tm-dev am: 297028ea69 am: d1d0f0a88e

2022-04-29 23:44:28 +00:00

src/com/android/settings

Merge "Update dream settings logic to keep the customize button unselected." into tm-dev am: dc44eb1feb am: b58d2ed5cd

2022-05-02 15:03:20 +00:00

tests

Merge "Show restricted message in Wi-Fi Direct summary" into tm-dev am: 38989c9c6a am: fb214b99c0

2022-04-29 23:44:46 +00:00

.gitignore

…

Android.bp

Use androidx.window from prebuilt.

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

AndroidManifest.xml

Merge "[Panlingual] Avoid activity restart during rotation" into tm-dev

2022-04-29 07:14:14 +00:00

CleanSpec.mk

…

color-check-baseline.xml

Fix color lint

2022-04-11 20:40:18 +08:00

NOTICE

…

OWNERS

…

PREUPLOAD.cfg

Precommit hook added to Settings, preventing the creation of new Robolectric tests.

2020-12-10 14:40:49 +08:00

proguard.flags

Import the window extension libary in the Settings app

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

TEST_MAPPING

…

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%