Xin Li b7dacb658f [automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: 99d834b0b8 -s ours am: 024fe4b39a -s ours am: 39e1357748 -s ours am: f6cf1a9647 -s ours ...

am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840 is already in history

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

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

2022-04-20 13:49:46 +00:00

libs

Use androidx.window from prebuilt.

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

protos

[Settings] Code refactor - NetworkModePreference

2022-03-19 10:46:06 +08:00

res

Merge "Fix wrong glifLayout padding for tablet resolution" into tm-dev am: 4d1e327457 am: 88f77b41a0

2022-04-20 04:32:02 +00:00

src/com/android/settings

Merge "[Settings] Code refactor for async Lifecycle listening"

2022-04-20 12:26:17 +00:00

tests

Merge "[Settings] Code refactor for async Lifecycle listening"

2022-04-20 12:26:17 +00:00

.gitignore

…

Android.bp

Use androidx.window from prebuilt.

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

AndroidManifest.xml

Merge "Not relaunch BiometricEnrollActivity durng SUW" into tm-dev am: cc27e34330 am: 527f4141a4

2022-04-19 17:51:13 +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

Remove myself from OWNERS.

2022-03-22 17:29:48 +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%