app_Settings

Go to file

Automerger Merge Worker dfe03e2703 Merge changes from topic "am-5e89edc40b6a4945b5ec9d7a583855ca"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: dff3f7f106 -s ours am: 2257809a29 -s ours am: 78aed2586c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6503ce14a7 -s ours am: ecd69b95e3 -s ours am: 6bbca58575 -s ours

2022-05-11 02:59: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 "Remove "Remove animation" assistive technologies in setup" into tm-dev am: f7b967ffd4 am: 347aa6f934 am: 56665fb64f

2022-05-10 21:19:34 +00:00

src/com/android/settings

Merge "Disable "SIM card lock" when the SIM card is PUK-blocked" am: ab8bdb2bdb am: 4a0d0f29f3 am: 9bd8bec2df am: 1543eff3c2 am: 976d920650