app_Settings

Go to file

Bill Yi 6c24a77a6a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6d15f05d2 -s ours

am skip reason: subject contains skip directive

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

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

2022-04-21 20:17:34 +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 am: 8242402834

2022-04-21 16:42:53 +00:00

src/com/android/settings

Merge "Fix Live Caption does not follow caption size if caption is not enabled" into tm-dev am: 1ce6beb80f am: d14121e919