app_Settings

Go to file

Automerger Merge Worker d6f76e0081 [automerger skipped] Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into stage-aosp-master am: b54c768b90 -s ours am: 99c0b8baf6 -s ours

am skip reason: Merged-In I937a4acf0917a16660ff237d0511a5883864a1b9 with SHA-1 a3c97876bb is already in history

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

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

2022-12-12 13:50:04 +00:00

libs

Use androidx.window from prebuilt.

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

protos

Move fuelgauge_usage_state.proto into fuelgauge folder.

2022-12-02 15:00:58 +08:00

res

Merge "[Settings] Add QR code for EID and enable text copy"

2022-12-12 12:50:51 +00:00

res-export

Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"