Xin Li dd82ecbf93 [automerger skipped] Merge Android 12 QPR 3 am: d6c80bd8e3 -s ours am: 8d42cc939b -s ours am: a073091919 -s ours am: 51b8b7df31 -s ours am: 6fe70cb193 -s ours ...

am skip reason: Merged-In Ie1e14a6b697af624854a9360a60383fac63bb02c with SHA-1 a5a729f523 is already in history

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

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

2022-06-17 21:33:30 +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 "AOD" into searching keywords"

2022-06-16 09:43:03 +00:00

src/com/android/settings

Added face unicorn strings am: 66211d15bf am: 909913ffc1 am: 4be235f6a8

2022-06-16 03:43:37 +00:00

tests

Merge "Restrict WifiSlice functionality for guest user" into tm-qpr-dev am: 1c25ce1937 am: cf7d2ef87c

2022-06-15 16:54:32 +00:00

.gitignore

…

Android.bp

Enable Kotlin for Settings App

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

AndroidManifest.xml

Merge "Add "smallestScreenSize" into homepage activities" into tm-dev am: e058aae3cd am: a0ebaf2b57 am: 9d882fbb81 am: 4bdd4359dc

2022-06-13 20:07:28 +00:00

CleanSpec.mk

…

color-check-baseline.xml

Clean up unused string resource sync_plug

2022-06-01 18:43:10 +08:00

NOTICE

…

OWNERS

Update owner list

2022-05-30 01:11:08 +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

Change test case name

2020-02-03 01:03:46 +00:00

wrap_alpha.py

…

Description

No description provided

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%