Automerger Merge Worker 06908e191a Merge changes from topic "am-1b5ff54850484f67a65c2bda86eb0cf0" into tm-qpr-dev-plus-aosp ...

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2b662c5a07 -s ours am: ee896b46e1 -s ours am: 05d57094a6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5391d591c8 -s ours am: 6a5ff2d6a9 -s ours am: 0aa65938ba -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 71826af4fb -s ours am: 1175da33ce -s ours am: 5bc97b815c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1ebda67c2 -s ours am: 5c0212eab6 -s ours am: e64846d166 -s ours

2022-06-10 07:36:03 +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 "Add functionality to restart fp enrollment." into tm-qpr-dev am: 81224f09e3

2022-06-09 16:09:27 +00:00

src/com/android/settings

Revert "Do not show the redundant RemoveAccountFailureDialog" am: 7f1ff1b796 am: 4ec1953a82 am: 80f4582723

2022-06-10 03:05:58 +00:00

tests

Merge "Notify about brightness change when screen turns on" into tm-dev am: 7d634de3ea am: 8bfab753c1 am: 6dac1ca43d

2022-06-09 10:35:14 +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

…

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%