app_Settings

Go to file

Kevin Liu 15ef36bc54 resolve merge conflicts of 521278a00d to tm-d1-dev

Test: I solemnly swear I tested this conflict resolution.
Bug: b/264918004
Change-Id: I6125be25233ffb33e10cc98444017b3d3a99f1f9
Merged-In: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b

2023-01-10 15:42:02 +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 "Remove the fallback AddSupervisedUserActivity." into tm-dev am: 15a89a60ac

2023-01-03 12:53:48 +00:00

src/com/android/settings

[RESTRICT AUTOMERGE] Change the intent flag to immutable am: 0dcd6a5492

2023-01-07 08:01:18 +00:00

tests

resolve merge conflicts of 521278a00d to tm-d1-dev

2023-01-10 15:42:02 +00:00

.gitignore

…

Android.bp

Use androidx.window from prebuilt.

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

AndroidManifest.xml

Remove the fallback AddSupervisedUserActivity.

2022-12-07 15:23:37 +00:00

CleanSpec.mk

Move the app to /system_ext

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

color-check-baseline.xml

Use Mockito 4.6.1 API

2022-12-29 00:47:06 +00: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

…