Automerger Merge Worker f47a8322ee Merge changes from topic "am-8f638df199f049eaa67710c826969673" into tm-d1-dev-plus-aosp ...

* changes:
  [automerger skipped] Merge "Validate config activities with their rule owners" into rvc-dev am: 316cd96b28 -s ours am: 25aa1f617d -s ours am: 32e60479ca -s ours am: d1c0e2151c -s ours am: 1d2a59d59c -s ours am: b93ced51af -s ours am: fb4dc0b110 -s ours
  [automerger skipped] Validate config activities with their rule owners am: b161a3b850 -s ours am: 812e171b1f -s ours am: fbcc4a9e52 -s ours am: 8e4337e37c -s ours am: 85e39e8997 -s ours am: 250f8e731b -s ours am: af8d9636a4 -s ours

2022-08-11 04:42:46 +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

resolve merge conflicts of 81d1cd0871 to stage-aosp-master am: 4ec8323bad am: 244f21d9d7

2022-07-29 10:27:37 +00:00

src/com/android/settings

Merge "Fix SIM name in Network Details to show the selected SIM." am: 3bd3f983bf am: 4967e754eb am: f6e91b15da

2022-08-10 18:16:29 +00:00

tests

Use Mockito 4.6.1 API

2022-07-19 09:07:28 +00:00

.gitignore

…

Android.bp

Use androidx.window from prebuilt.

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

AndroidManifest.xml

[Settings] Adjusted the API of Settings app

2022-06-22 07:51:47 +08: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

Migrate stringslint.py to AyeAye.

2022-08-03 13:52:10 -06:00

proguard.flags

Import the window extension libary in the Settings app

2021-08-24 12:01:35 +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%