Automerger Merge Worker dfbaf8a22a Merge changes from topic "am-4d4933939782434894ecfea9a8939979" into tm-d1-dev-plus-aosp am: 9ffd7ecd8f -s ours ...

am skip reason: Merged-In Ib507352107c0d825b8c7a9605713bc9083259fbd with SHA-1 0167a4d8a6 is already in history

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

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

2022-05-23 15:23:11 +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

Import translations. DO NOT MERGE ANYWHERE

2022-05-21 09:20:58 -07:00

src/com/android/settings

Merge "Call CardDatabaseHelper.getInstance() when used and not in onCreate" am: 97b4621c68 am: 2b7eb9eff6 am: 38f8c61722 am: fe16309442

2022-05-23 11:31:04 +00:00

tests

Merge "Update learn more string of FooterPrefernce" into tm-dev am: 24654a3d61 am: eaa0a1cf5c am: 21ddf79998

2022-05-21 00:02:22 +00:00

.gitignore

…

Android.bp

Use androidx.window from prebuilt.

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

AndroidManifest.xml

Fix incorrect battery icon showing on the recent apps

2022-05-18 12:18:15 +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

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%