app_Settings

Go to file

Bill Yi f1bbf9ff75 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3158f2f365 -s ours

am skip reason: subject contains skip directive

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

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

2022-04-14 18:08:16 +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 "Add 2 pixels to top of Advanced Options component" into tm-dev am: 37c2ac2c6a am: d23bd16dd7

2022-04-14 16:52:33 +00:00

src/com/android/settings

Merge "Use WifiEntry.getStandardString() for Wi-Fi Type summary" into tm-dev am: 93ae7acbf4 am: 6f7a9b88ba