app_Settings

Go to file

Automerger Merge Worker daf56b0dd5 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3466df0415 -s ours am: 6620ba750b -s ours am: f32a1310e8 -s ours" into tm-d1-dev-plus-aosp am: 7061016303 -s ours am: 30ff5d39d5 -s ours

am skip reason: subject contains skip directive

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

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

2022-06-02 00:32:24 +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 "Ensure lottie animations are not empty." into tm-dev am: 14a5aded8f am: 63074bf020

2022-06-01 19:41:43 +00:00

src/com/android/settings

Merge "Fix the preview section incorrectly ordered of the display size and text."