app_Settings

Go to file

Taran Singh 4a95efc3bc [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0976cd789d am: eda2ffbeca -s ours

am skip reason: skipped by user tarandeep

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

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

2023-07-06 23:21:41 +00:00

libs

Use androidx.window from prebuilt.

2022-04-14 09:55:36 +00:00

protos

Add a config to hide the 3G option at preferred network mode UI

2023-02-08 07:41:13 +00:00

res

Import translations. DO NOT MERGE ANYWHERE

2023-06-22 22:06:04 -07:00

src/com/android/settings

Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-qpr-dev