Bill Yi 3e95b42bec [automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 35525a5617 -s ours am: ee5c8c915e -s ours am: fdcf2eed39 -s ours am: 4dd803da1d -s ours ...

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2059150

Change-Id: I7f862634a2cebfda51de21a9a7df5df368ab25b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2022-04-08 19:57:21 +00:00

libs

Update new API for checking the embedding status

2022-01-12 15:00:07 +08: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-04-07 18:34:45 +00:00

src/com/android/settings

Merge "Always set the customize button in dream settings to not selected." into tm-dev am: 8604694b24

2022-04-08 19:15:39 +00:00

tests

Merge "Add cache mechanism for secondary users in Storage" into tm-dev am: 34eecaad79

2022-04-08 06:13:01 +00:00

.gitignore

…

Android.bp

[Settings] Code refactor - NetworkModePreference

2022-03-21 00:18:55 +00:00

AndroidManifest.xml

Merge "[Panlingual] Revamp the panlingual UI in Settings." into tm-dev

2022-03-31 08:32:52 +00:00

CleanSpec.mk

…

color-check-baseline.xml

Fine tune background color for dual pane in homepage

2022-04-01 13:35:17 +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-24 12:01:35 +08:00

TEST_MAPPING

…

wrap_alpha.py

…

Description

No description provided

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%