app_Settings

Go to file

Automerger Merge Worker b01a99bf23 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c -s ours am: f46213941c -s ours am: 7a2a5bd916 -s ours am: 1df006f84c -s ours am: 9f888216b4 -s ours am: 99e94c9e83 -s ours" into tm-d1-dev-plus-aosp am: 11f8d65f89 -s ours am: f59e6fb967 -s ours

am skip reason: subject contains skip directive

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

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

2022-05-03 02:22:28 +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