Automerger Merge Worker bec9ddb5ad [automerger skipped] Merge changes from topic "am-ec3a0df1a3ad4988a88c684ab54bac09" into tm-d1-dev-plus-aosp am: 4d20ef334a -s ours am: 5198582cf1 -s ours ...

am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 0d8d05a221 is already in history

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

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

2022-06-04 02:19:22 +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 "Fix the Ephemeral guest mode UI bugs"

2022-06-03 02:44:34 +00:00

src/com/android/settings

Rename method for better readability

2022-06-03 10:22:31 +00:00

tests

Fix the Ephemeral guest mode UI bugs

2022-06-02 15:38:46 +00:00

.gitignore

…

Android.bp

Enable Kotlin for Settings App

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

AndroidManifest.xml

Merge "Fix the intent<->activity mapping for wallpaper intent"

2022-05-27 23:54:24 +00:00

CleanSpec.mk

Move the app to /system_ext

2019-11-25 20:28:35 +09:00

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

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%