PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
131,150 Commits 1 Branch 0 Tags
2e4141e4ab6094c22a31bf8fedaef4cb4a5a690c
Commit Graph

131150 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
2de76698bd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 948e9dd4e3 -s ours am: f859b36ddb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib999ca4907180fef9b1947bdc0c0714b0d1f8a64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-17 06:39:32 +00:00
TreeHugger Robot
1bc160c342 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 90cf6e8a3c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7a65d2d7176fa864f1133165680d64c6424f3747
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-17 06:03:03 +00:00
Bill Yi
48534e61a8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: db8e6f51ff -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2ab2b12c9e803664792e848a06c706255df36362
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-17 06:02:58 +00:00
TreeHugger Robot
636c7ba7c1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 9d38813d4b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2d790bcc16451d6774c135fa36c99a79a7304313
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-17 06:02:52 +00:00
Bill Yi
133e504b7e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b47c44e4dd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I589fbeeaf83e149aea616634f01d0c81e2321826
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-17 06:02:20 +00:00
TreeHugger Robot
9d9a674b40 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: c937ce7a22 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I937087f8bd1fd457a00ade60bf0734aad317e2a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-17 06:02:01 +00:00
Bill Yi
f859b36ddb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 948e9dd4e3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I136aeaefefff80d8a6ee29236d0f5b623d50a446
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-17 06:01:45 +00:00
Yi-Ling Chuang
2a9b9cfd4c Update BatterySettingsFeatureProvider interface 
Added context to each method for more flexibility.

Bug: 276399056
Test: robotests
Change-Id: I0bbf8841775bc2f584d66c59c2c78ed4e5c951c2
 2023-06-17 12:49:46 +08:00
Treehugger Robot
aa3dbf52e2 Merge "[BiometricsV2] Rewrite Activity to Kotlin" 2023-06-17 02:36:17 +00:00
Julia Tuttle
b23136041d Fix colors in importance and conversation priority preferences 
This would have been simpler and faster, but the ChannelPanelActivity
was giving me a context where Material colors always inflated in light
theme even if the device was in dark theme, so I had to work around it.

On the plus side, whoever next needs to change these colors will find
them neatly organized in themes.xml!

Bug: 284380876
Test: manual
Change-Id: I2eee877fe44d307a96d60168d0317444ff002669
 2023-06-16 19:17:09 +00:00
Rambo Wang
f7b8d687bf Fix Settings app ANR due to blocking IDumpstateDevice IPC call 
This CL fixes the ANR by moving possible blocking IDumpstateDevice
IPC call from main thread to background thread.

Settings develop options depends on IDumpstateDevice IPC call to
set and get Vendor Verbose Logging feature. The IPC may occasionally
get blocked in system_server which is extremely busy (e.g. during
bugreport generating). This may cause Settings app crashing with ANR.

Bug: 287126040
Bug: 280015761
Test: atest EnableVerboseVendorLoggingPreferenceControllerTest
Test: Verbose Vendor Logging regression
Test: Stress test (heavily trigger on/off during BR generating)
Change-Id: I0b88ef089097930b62dcb1cb7d6fe9990356ab5d
 2023-06-16 17:05:10 +00:00
Chaohui Wang
c91d017080 [LE Broadcast] Fix crash when scan QR code 
Crash happens when rotated screen.

QrCodeScanModeFragment should only have default constructor.

Remove unused params to fix.

To start this page,
adb shell am start \
    -a android.settings.BLUETOOTH_LE_AUDIO_QR_CODE_SCANNER

Fix: 287363885
Test: Manually
Change-Id: I3c4bcfdb8ae6ddf750e16d8e7565cb9d45d11788
 2023-06-16 16:10:53 +00:00
Tetiana Meronyk
21e17b746a Merge "Add padding to dialog" into udc-qpr-dev am: e992927655 am: 5aca5fbecd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23710326

Change-Id: If3efd96d1b9fcfbffddae5b1fb83f0c961aa73b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-16 13:12:25 +00:00
Milton Wu
940e5d04a6 [BiometricsV2] Rewrite Activity to Kotlin 
Refactor FingerprintEnrollmentActivity as kotlin

Bug: 286197261
Test: atest FingerprintEnrollmentActivity
Test: atest biometrics-enrollment-test
Change-Id: I45d2db832b0111cb865b657aee56f84b0b295efa
 2023-06-16 20:36:37 +08:00
Tetiana Meronyk
5aca5fbecd Merge "Add padding to dialog" into udc-qpr-dev am: e992927655 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23710326

Change-Id: Ide345f8e12db9dec8c2eadc7b7680ca14d8f4106
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-16 12:25:13 +00:00
Tetiana Meronyk
e992927655 Merge "Add padding to dialog" into udc-qpr-dev 2023-06-16 11:56:04 +00:00
Chaohui Wang
f355bc2e01 Merge "Migrate PlatformCompat App List to SPA" into udc-qpr-dev am: 879ff5f271 am: 78981afdc2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23410196

Change-Id: I09189fc2dfe6789db9c7745dd43cf5168c2e9dfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-16 09:24:26 +00:00
Chaohui Wang
78981afdc2 Merge "Migrate PlatformCompat App List to SPA" into udc-qpr-dev am: 879ff5f271 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23410196

Change-Id: I8746fd67255bd0799307f403f132e5a1692e41b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-16 08:40:02 +00:00
Chaohui Wang
879ff5f271 Merge "Migrate PlatformCompat App List to SPA" into udc-qpr-dev 2023-06-16 07:59:01 +00:00
Treehugger Robot
67a6f4bada Merge "Guard slices from being requested by guest user" into udc-qpr-dev am: 9718f0e04f am: 068edcc9ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23578868

Change-Id: I2f514b0c50f853e0ab83104c6abe1add06b7790a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-16 02:47:37 +00:00
Treehugger Robot
068edcc9ec Merge "Guard slices from being requested by guest user" into udc-qpr-dev am: 9718f0e04f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23578868

Change-Id: I0f964c6032f300a82a8873453c78060e131e455e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-16 02:05:03 +00:00
Treehugger Robot
9718f0e04f Merge "Guard slices from being requested by guest user" into udc-qpr-dev 2023-06-16 01:14:40 +00:00
Treehugger Robot
1d070021c0 Merge "Use FakeTimer in test to avoid flakiness." 2023-06-16 00:10:11 +00:00
Treehugger Robot
67abf64ea1 Merge "Update location settings status text to use slash" 2023-06-15 23:51:01 +00:00
Treehugger Robot
f78f9c6848 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b8ddf4126c -s ours am: ee8cd42af0 -s ours am: 2f6b7bea9b -s ours am: 474a9393c8 -s ours am: d918700749 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I37e3c68e4e308adcf4bb945b9bffd8d985494863
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 23:50:04 +00:00
Bill Yi
c63cb879cc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49d00437a6 -s ours am: 4368d3a79a -s ours am: 39dbfc2e78 -s ours am: 042c7ca3f3 -s ours am: 20ff3de948 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I970abe8b2d17cda47c0105e0f6a7b6a4d3cdd600
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 23:50:01 +00:00
Treehugger Robot
b67eb8e3dc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a505517090 -s ours am: a7bcd85abc -s ours am: 36f6b1720a -s ours am: 26f930e91f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id3636444b36267744ca52e03b94979313d1f9de2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 23:49:07 +00:00
Bill Yi
19dec73724 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 58628e0170 -s ours am: ee15b19128 -s ours am: 51f878871b -s ours am: ea545a70a1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6c94693417d8525d162a677e8db20d1f10f9cf08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 23:49:00 +00:00
Treehugger Robot
578373a457 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c706f8544d -s ours am: 3ea3bb83ae -s ours am: a68566dd5c -s ours am: 297f578098 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If2bb4858fb017f050a5d01089a9a457a2f1ff72b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 23:48:56 +00:00
Bill Yi
e58dda4110 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23819646e2 -s ours am: 0138ef4a5e -s ours am: f8cbacdd78 -s ours am: f2da605d4c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id04f1e48ba627ba30278bce36ad8d7ddcbdc7c4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 23:48:38 +00:00
Treehugger Robot
09403a3de1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 958690e3a5 -s ours am: 41bd0f8ae1 -s ours am: 2760803621 -s ours am: a16ec14f18 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I92be07c22051c236923b614809f977c76bd9b2b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 23:48:17 +00:00
Bill Yi
3de3b5fb3c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b86bd3cfe3 -s ours am: bd6c412717 -s ours am: b7628ea90a -s ours am: 469b01963a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie4603f0a55e49d32f94616ec8a2ea27d482a0e74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 23:47:59 +00:00
Zaiyue Xue
edcfe47afd [automerger skipped] Merge "Don't load battery entry names and icons in offline job to improve memory usage." into udc-dev am: 8c25fe4c60 -s ours am: 8cbeaf6a74 -s ours am: a6c104de54 -s ours am: f727ada668 -s ours 
am skip reason: Merged-In I86f50e953ffd4910acbf9f318e1cc1caa3a7a232 with SHA-1 65cb6ef230 is already in history

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

Change-Id: I9617bf51894d4efa3b9a16dcc1582d7a72fb8987
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 23:46:38 +00:00
Zaiyue Xue
1bf16cc252 [automerger skipped] Don't load battery entry names and icons in offline job to improve memory usage. am: ec032710dc -s ours am: d593cb5284 -s ours am: fb9bc753fe -s ours am: 5d9c185f32 -s ours 
am skip reason: Merged-In I86f50e953ffd4910acbf9f318e1cc1caa3a7a232 with SHA-1 65cb6ef230 is already in history

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

Change-Id: I968830bbe3db5f305f4f90a387d67d9ba6aef81c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 23:46:35 +00:00
Treehugger Robot
60d5bc82ef Merge "Shutdown secondary SAP automatically" into udc-d1-dev am: 57522f0fcc am: 2f87be66ce am: 12451957a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23680143

Change-Id: I4cc7f0f4501f33fb1a554a60523b16ec04207a2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 23:46:25 +00:00
Wenhui Yang
72fb4aba05 Merge "Fix face model delete message" into udc-d1-dev am: d56f96aaba am: 8513da9a31 am: df8382905c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23677227

Change-Id: I10387f494767574d77feb19140b1392c51569fb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 23:46:14 +00:00
Treehugger Robot
d918700749 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b8ddf4126c -s ours am: ee8cd42af0 -s ours am: 2f6b7bea9b -s ours am: 474a9393c8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3a19597528011967646ef3183f8557e9ad1f8e62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 23:07:11 +00:00
Bill Yi
20ff3de948 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49d00437a6 -s ours am: 4368d3a79a -s ours am: 39dbfc2e78 -s ours am: 042c7ca3f3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I38539bec85a66c499fe265bb73962654d8d6581a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 23:07:09 +00:00
Treehugger Robot
26f930e91f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a505517090 -s ours am: a7bcd85abc -s ours am: 36f6b1720a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I43d600caa9e303cc411f6d426009ed504938ad51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 23:06:13 +00:00
Bill Yi
ea545a70a1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 58628e0170 -s ours am: ee15b19128 -s ours am: 51f878871b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7d97d5cf7144e9087aae1d9b716d1e3a81b0d10c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 23:06:06 +00:00
Treehugger Robot
297f578098 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c706f8544d -s ours am: 3ea3bb83ae -s ours am: a68566dd5c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6941d55b07d2a490819d1e81b66e925a68b71cdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 23:06:01 +00:00
Bill Yi
f2da605d4c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23819646e2 -s ours am: 0138ef4a5e -s ours am: f8cbacdd78 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie2bc4f8150770b8152ccd3d5a40594047a98ca2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 23:05:42 +00:00
Treehugger Robot
a16ec14f18 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 958690e3a5 -s ours am: 41bd0f8ae1 -s ours am: 2760803621 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3b54e4dc10760f8de3b76bb3efe1f95f22db6dfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 23:05:23 +00:00
Bill Yi
469b01963a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b86bd3cfe3 -s ours am: bd6c412717 -s ours am: b7628ea90a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaa5e3aa528774816bb8e887d76ebb91a22289e53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 23:05:05 +00:00
Zaiyue Xue
f727ada668 [automerger skipped] Merge "Don't load battery entry names and icons in offline job to improve memory usage." into udc-dev am: 8c25fe4c60 -s ours am: 8cbeaf6a74 -s ours am: a6c104de54 -s ours 
am skip reason: Merged-In I86f50e953ffd4910acbf9f318e1cc1caa3a7a232 with SHA-1 65cb6ef230 is already in history

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

Change-Id: Id82b0a154d2d8df0c327350f7d016f2c68ca1a8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 23:03:46 +00:00
Zaiyue Xue
5d9c185f32 [automerger skipped] Don't load battery entry names and icons in offline job to improve memory usage. am: ec032710dc -s ours am: d593cb5284 -s ours am: fb9bc753fe -s ours 
am skip reason: Merged-In I86f50e953ffd4910acbf9f318e1cc1caa3a7a232 with SHA-1 65cb6ef230 is already in history

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

Change-Id: I1d3820ccd0cda90a5052e9a9e891d004c0430e06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 23:03:43 +00:00
Treehugger Robot
12451957a9 Merge "Shutdown secondary SAP automatically" into udc-d1-dev am: 57522f0fcc am: 2f87be66ce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23680143

Change-Id: I31f631bb61f85d9eb5116bbee7e26c1cef936dd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 23:03:34 +00:00
Wenhui Yang
df8382905c Merge "Fix face model delete message" into udc-d1-dev am: d56f96aaba am: 8513da9a31 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23677227

Change-Id: Id73a846a03ec02db5805cc0a7b58c3768e651071
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 23:03:24 +00:00
Treehugger Robot
474a9393c8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b8ddf4126c -s ours am: ee8cd42af0 -s ours am: 2f6b7bea9b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I001e19d72c81ff2faf24d79ac7ade1899fc11b89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 22:19:25 +00:00
Bill Yi
042c7ca3f3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49d00437a6 -s ours am: 4368d3a79a -s ours am: 39dbfc2e78 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5b7fbb5b2a749ac243a6265fffed30f849558836
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 22:19:22 +00:00