Automerger Merge Worker 4f3d8e074c Merge changes from topic "am-07edb1ab4d2e477bb281d5830839cc6d" into tm-qpr-dev-plus-aosp ...

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 49a681bb37 -s ours am: 83da805299 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 382bed292d -s ours am: d7343cd35b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f08bf7780a -s ours am: 4f950cb0f2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2714015bac -s ours am: 968957026f -s ours

2022-06-23 12:10:26 +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 "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7 am: b88828b155 am: 4e2c3689e3

2022-06-23 05:00:56 +00:00

tests

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

2022-06-22 19:59:10 +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

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

Wrap tintable icons with correctly tinted drawable XML

2015-04-10 15:46:18 -07:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%