Automerger Merge Worker d6b1cd7123 Merge changes from topic "am-57e0d74080e946758c2b4cbce9ad25bc" into tm-qpr-dev-plus-aosp ...

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 725c53880a -s ours am: 3de5617a68 -s ours am: 7f6ae2418e -s ours am: 688597e471 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 106e52ca92 -s ours am: 2036b1873c -s ours am: 082d0f39ff -s ours am: 2c9fda98b1 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e852811d18 -s ours am: 722272143c -s ours am: 868a03b273 -s ours am: d11e1a39a2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96fda27ccb -s ours am: 26d22ef04d -s ours am: 59bb14f56e -s ours am: 6e565398ba -s ours

2022-06-07 00:06:09 +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-qpr-dev

2022-06-06 18:40:47 +00:00

src/com/android/settings

Merge "Restrict network preferences settings" into tm-qpr-dev am: 5afb322f3a

2022-06-06 22:00:03 +00:00

tests

Merge "Restrict network preferences settings" into tm-qpr-dev am: 5afb322f3a

2022-06-06 22:00:03 +00:00

.gitignore

…

Android.bp

Enable Kotlin for Settings App

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

AndroidManifest.xml

Merge "[LE Audio] Broadcast Sink UI" am: e3295efcd0

2022-06-02 04:01:11 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Fix color lint

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

NOTICE

…

OWNERS

Add myself to OWNERS for emergency approval.

2020-11-26 01:34:01 +00:00

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

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%