app_Settings

Go to file

Xin Li c59d502f3b [automerger skipped] Merge SP2A.220505.002 am: c3a9ea7443 -s ours am: 90645fb925 -s ours am: 6c49c6dbcd -s ours am: 92e90faa5c -s ours am: 14807f68b6 -s ours

am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history

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

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

2022-05-04 22:07:59 +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 "Fix a11y label for LE Audio Battery" into tm-dev am: 22cda47705 am: 5f99fad806 am: 58b70b17f7 am: 705c447e92

2022-05-04 11:06:22 +00:00

src/com/android/settings

Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev am: 3fb9c1a24b am: 5a138163b4 am: 4c10d54239 am: 66262e1052