app_Settings

Go to file

Oli Lan 93e71dbcc2 [automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 819430ed60 -s ours am: d3938dfc4c -s ours am: da927d5a6b -s ours am: 4d00a7174b -s ours

am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.

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

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

2022-08-22 17:11:07 +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 media on lock screen setting" into tm-qpr-dev am: c77ab55735

2022-08-22 15:04:04 +00:00

src/com/android/settings

Merge "Add media on lock screen setting" into tm-qpr-dev am: c77ab55735