app_Settings

Go to file

Automerger Merge Worker 9df288c63c Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6 -s ours am: 223d9c81f2 -s ours am: a509cd4695 -s ours am: 0b07e79cc1 -s ours am: 365338b6d0 -s ours am: ec31d2697d -s ours am: 5568a2692b -s ours" into tm-d1-dev-plus-aosp am: d5c1675c8d -s ours am: 44f70bbc3c -s ours

am skip reason: subject contains skip directive

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

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

2022-05-03 02:22:47 +00:00

libs

Use androidx.window from prebuilt.

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

protos

[Settings] Code refactor - NetworkModePreference

2022-03-19 10:46:06 +08:00

res

Merge "Update the SafetyCenter icon" into tm-dev am: 297028ea69 am: 7393c50941

2022-05-02 08:32:10 +00:00

src/com/android/settings

Merge "Update dream settings logic to keep the customize button unselected." into tm-dev am: dc44eb1feb am: b0bd5b21e3