app_Settings

Go to file

Automerger Merge Worker aa2ed50e34 Merge changes from topic "am-0af370f6b33542b09d673716bbc90c20" into tm-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 226baf6f25 -s ours am: 7d5cc42c81 -s ours am: 5c7d0155a8 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af08983841 -s ours am: f1b797ac9b -s ours am: e74c40fc84 -s ours

2022-04-22 08:30:32 +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 "Fine-tune the location and style of the reset button in the “Display size and text” page." into tm-dev am: 8c78bad4e6

2022-04-21 16:20:14 +00:00

src/com/android/settings

Merge "[Settings] Code refactor for async Lifecycle listening" into tm-dev am: 49cc66afd3