app_Settings

Go to file

Automerger Merge Worker f59e6fb967 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 skip reason: subject contains skip directive

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

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

2022-05-03 00:32:21 +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 "Update the SafetyCenter icon" into tm-dev am: 297028ea69 am: d1d0f0a88e am: fb6771d939

2022-04-30 00:01:39 +00:00

src/com/android/settings

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