Bill Yi
5db711f977
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 948e9dd4e3
-s ours am: f859b36ddb
-s ours am: 2de76698bd
-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: I0395fa9f6f653926e47b1a1af13d78a64e575db3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 05:49:49 +00:00
Treehugger Robot
ef957eda5a
Merge "[BiometricsV2] Refactor EnrollingRfpsFragment"
2023-06-21 04:55:47 +00:00
Treehugger Robot
2c75f0e207
Merge "[BiometricsV2] Refactor FindSfpsFragment"
2023-06-21 04:55:43 +00:00
Treehugger Robot
a9aca48fcf
Merge "[BiometricsV2] Refactor FindRfpsFragment"
2023-06-21 04:55:36 +00:00
Milton Wu
75450f7973
[BiometricsV2] Refactor FindSfpsFragment
...
Refactor FingerprintEnrollFindSfpsFragment to kotlin and add bindView()
method for it
Bug: 286197831
Test: atest FingerprintEnrollmentActivityTest
Test: Manually test enrollment as Side fingerpint device
Change-Id: If1c7d95e78c5be237f05209afa3ffc0b4c444c61
2023-06-21 09:56:32 +08:00
Milton Wu
00bafe9f64
[BiometricsV2] Refactor EnrollingRfpsFragment
...
Refactor FingerprintEnrollEnrollingRfpsFragment to kotlin and add
bindView() method for it.
Bug: 286198028
Test: atest FingerprintEnrollmentActivityTest
Test: Manually test enrollment as Rear fingerpint device
Change-Id: Ie271386f305003a89d7e545c289e47bbafb14a90
2023-06-21 09:54:55 +08:00
Milton Wu
ada229b409
[BiometricsV2] Refactor FindRfpsFragment
...
Refactor FingerprintEnrollFindRfpsFragment to kotlin and add bindView()
method for it
Bug: 286197313
Test: atest FingerprintEnrollmentActivityTest
Test: Manually test enrollment as Rear fingerpint device
Change-Id: Ifa11888f3e848fb7127e14ddcc41d02277163a1a
2023-06-21 09:52:35 +08:00
Julia Tuttle
d68cf98dc7
Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e
am: 4e6fecc6d7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613
Change-Id: I19e4f1cd8664cb6483110b8373d68f4a73977e93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 17:51:38 +00:00
Julia Tuttle
1ddbbd4542
Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e
am: 2390428dd8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613
Change-Id: I62ce7d8d02d54605e3115ed3abd7583ad05010be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 17:48:39 +00:00
Julia Tuttle
2390428dd8
Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613
Change-Id: Iaf0c32fc2ff4450dadc2256601d6966e5bd73d76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 17:06:19 +00:00
Julia Tuttle
4e6fecc6d7
Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613
Change-Id: I70c6b9024fe1cbb7cf37bfea71225a8bebe5df50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 17:06:04 +00:00
Julia Tuttle
bd74e47e5e
Merge "Fix colors in importance and conversation priority preferences" into udc-dev
2023-06-20 16:21:01 +00:00
Automerger Merge Worker
cea910f8ae
Merge "Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8
am: 0d8db71d44"
2023-06-20 07:46:48 +00:00
YK Hung
3a04e20f39
Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8
am: 94f5c7a913
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285
Change-Id: I825b76d4c744ed5edc2ce4732d120f44b40fb0d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 07:46:39 +00:00
YK Hung
fdfce46f25
Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8
am: 0d8db71d44
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285
Change-Id: Ia1122a31159b6a3fe6613ba39c575598635a5e39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 07:46:39 +00:00
YK Hung
0d8db71d44
Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285
Change-Id: I3158ea89ef2804c5a9878ff27db5b9b4466e0644
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 07:05:48 +00:00
YK Hung
94f5c7a913
Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285
Change-Id: I3b226770289800cec4196a6b34ceb05f090a6d69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 07:05:34 +00:00
YK Hung
a4f67e02c8
Merge "Update tablet help article link (1/2)" into udc-dev
2023-06-20 06:34:46 +00:00
TreeHugger Robot
7f45861797
Merge "Fix Settings app ANR due to blocking IDumpstateDevice IPC call"
2023-06-19 05:20:22 +00:00
TreeHugger Robot
bf296dc1bd
Merge "[BiometricsV2] Refactor Fingerprint intro fragment"
2023-06-19 02:16:22 +00:00
Chaohui Wang
af3f8ce6dd
Merge "Clean up Settings_srcs & Settings_manifest"
2023-06-18 04:07:47 +00:00
Milton Wu
8e42d7c85a
[BiometricsV2] Refactor Fingerprint intro fragment
...
Refactor FingerprintEnrollIntroFragment to kotlin and add bindView()
method for it.
Bug: 286197823
Test: atest FingerprintEnrollmentActivityTest
Change-Id: I44157bf2c2bea6f49382335438b16aae3e3e5b4c
2023-06-17 18:16:17 +08:00
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
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
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
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