Chaohui Wang
04d431cd8e
Fix SettingsRoboTests am: 36dfb5ac0b
am: 5ec794285e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23696638
Change-Id: I7df4baf13f7c275c782b1181383d3a53aaa5e4cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 10:38:57 +00:00
Chaohui Wang
5ec794285e
Fix SettingsRoboTests am: 36dfb5ac0b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23696638
Change-Id: I13783f780c085e99536da114500733b54568227b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 10:16:32 +00:00
Chaohui Wang
36dfb5ac0b
Fix SettingsRoboTests
...
Mock the getViewLifecycleOwner in test to fix.
Fix: 287387514
Test: m RunSettingsRoboTests
Change-Id: I346930e9655e4f78227276aee4c2a4e5ae6962e0
2023-06-15 16:33:05 +08:00
Treehugger Robot
0f2e581635
Merge "[Settings] Imporve MMS message UI state update" into udc-d1-dev am: 8182348d5c
am: d4aa1b65a5
am: 0b25525328
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23669450
Change-Id: I78f6be87145c2320113e6d10733d96a14dec59f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 04:47:52 +00:00
Treehugger Robot
0b25525328
Merge "[Settings] Imporve MMS message UI state update" into udc-d1-dev am: 8182348d5c
am: d4aa1b65a5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23669450
Change-Id: I403765aae030e5b1aea4482fc161a43932148b30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 04:38:06 +00:00
Treehugger Robot
d4aa1b65a5
Merge "[Settings] Imporve MMS message UI state update" into udc-d1-dev am: 8182348d5c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23669450
Change-Id: I159952074306255db4397de180ee4b49eb78613b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 03:53:50 +00:00
Treehugger Robot
8182348d5c
Merge "[Settings] Imporve MMS message UI state update" into udc-d1-dev
2023-06-15 03:02:41 +00:00
Hao Dong
9e1435a0dc
Merge "Wait for systemui udfps overlay ready to show settings udfps enroll view." into udc-qpr-dev am: 61659799de
am: a9f1ed3501
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23595181
Change-Id: I88d843e5c1164e054d4cb48e3f953618e63e2e64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 01:46:36 +00:00
Hao Dong
a9f1ed3501
Merge "Wait for systemui udfps overlay ready to show settings udfps enroll view." into udc-qpr-dev am: 61659799de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23595181
Change-Id: Ia545f7902df20a47c6dc154cfb3d781541bb25ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 01:45:55 +00:00
Hao Dong
61659799de
Merge "Wait for systemui udfps overlay ready to show settings udfps enroll view." into udc-qpr-dev
2023-06-15 01:22:22 +00:00
Treehugger Robot
e133e733ae
Merge "Fix Hotspot & tethering settings crash" into udc-d1-dev am: 3494d09de4
am: 03b39bc5d3
am: 1772660414
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691725
Change-Id: I67c72c08388c71765320f3d2b2e87369bdc275f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 20:09:47 +00:00
Matías Hernández
88bfc017fa
Don't hide approved NLSes in Settings am: ff255c6eda
am: 50df60c93c
am: a49e14f8ff
am: 0aa241be99
am: 2b1faa0aea
am: dcbe38baa9
am: e8cfc9cb3d
am: 4c941d3a97
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: Ic16366122cb83cc770254a12a49a1f22370260da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 19:11:37 +00:00
Treehugger Robot
1772660414
Merge "Fix Hotspot & tethering settings crash" into udc-d1-dev am: 3494d09de4
am: 03b39bc5d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691725
Change-Id: I04e22d89b03c0e0b303357d5495db85343e4911f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 19:10:58 +00:00
Matías Hernández
7e6819735f
Don't hide approved NLSes in Settings am: ff255c6eda
am: 50df60c93c
am: a49e14f8ff
am: 0aa241be99
am: 2b1faa0aea
am: dcbe38baa9
am: 0bb6ddf0b6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: If67948d9e0c95b74dd05a77a13f31822ce358f2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 17:23:53 +00:00
Matías Hernández
4c941d3a97
Don't hide approved NLSes in Settings am: ff255c6eda
am: 50df60c93c
am: a49e14f8ff
am: 0aa241be99
am: 2b1faa0aea
am: dcbe38baa9
am: e8cfc9cb3d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: I1a2c78f743615bdc351061846fd65f4e23777c6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 17:21:49 +00:00
Matías Hernández
e8cfc9cb3d
Don't hide approved NLSes in Settings am: ff255c6eda
am: 50df60c93c
am: a49e14f8ff
am: 0aa241be99
am: 2b1faa0aea
am: dcbe38baa9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: Ic1d0d1cda4e35705215fe4268974f304350cfbc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 16:37:43 +00:00
Matías Hernández
dcbe38baa9
Don't hide approved NLSes in Settings am: ff255c6eda
am: 50df60c93c
am: a49e14f8ff
am: 0aa241be99
am: 2b1faa0aea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: I69d2ef43afb54ce3b9d141d4f676b688dd1c5c59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 15:52:58 +00:00
Matías Hernández
2b1faa0aea
Don't hide approved NLSes in Settings am: ff255c6eda
am: 50df60c93c
am: a49e14f8ff
am: 0aa241be99
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: I715da9406bd9d3fe88ff7b5353db1780109880e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 15:09:53 +00:00
Matías Hernández
0aa241be99
Don't hide approved NLSes in Settings am: ff255c6eda
am: 50df60c93c
am: a49e14f8ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: I8cd7cc9605b3728f9f96c3479d17aa1b362d9cda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 14:22:10 +00:00
Matías Hernández
a49e14f8ff
Don't hide approved NLSes in Settings am: ff255c6eda
am: 50df60c93c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: I840d7836ae899bcd40eafc772b96c9460c3f8a02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 13:42:07 +00:00
Matías Hernández
50df60c93c
Don't hide approved NLSes in Settings am: ff255c6eda
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: I42099e38ef7b479b9339b545fe8d12d3bbe95112
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 12:57:15 +00:00
Treehugger Robot
03b39bc5d3
Merge "Fix Hotspot & tethering settings crash" into udc-d1-dev am: 3494d09de4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691725
Change-Id: I6e8bb778a0c9a7e45965bebe6605bac76915aad4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 12:28:49 +00:00
Treehugger Robot
3494d09de4
Merge "Fix Hotspot & tethering settings crash" into udc-d1-dev
2023-06-14 12:00:21 +00:00
Weng Su
6a20a8c5df
Fix Hotspot & tethering settings crash
...
- Cannot omit addPreferencesFromResource even if UI is restricted
Bug: 287172382
Test: manual test
atest -c WifiTetherSettingsTest
Change-Id: I1f5c0215a635fddefe7eaa20c1d765634b505121
2023-06-14 18:59:30 +08:00
Treehugger Robot
12deec820f
Merge "[BiometricsV2] Refactor model code to kotlin"
2023-06-14 06:39:01 +00:00
Treehugger Robot
48ed243614
Merge "Shutdown secondary SAP automatically" into udc-d1-dev am: 57522f0fcc
am: f47dbe3bae
am: 2179e44ebe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23680143
Change-Id: I47739ae6931f396fb8ad2986647905088b29b911
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 05:54:45 +00:00
Treehugger Robot
2179e44ebe
Merge "Shutdown secondary SAP automatically" into udc-d1-dev am: 57522f0fcc
am: f47dbe3bae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23680143
Change-Id: I37b5082e932c4141dcb3b277c84b096d93ffb3db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 04:51:15 +00:00
tom hsu
0a4458a9d1
[Settings] Imporve MMS message UI state update
...
- When activity entered from outside, the MMS message is not udpated.
Therefore, add a update behavior to onStart()
Bug: 281566495#5
Test: Manual test passed
Test: atest passed.
Change-Id: I3e5994ad0dbcdd1b78ae3e10e3cb564ce210e93e
2023-06-14 12:28:59 +08:00
Treehugger Robot
f47dbe3bae
Merge "Shutdown secondary SAP automatically" into udc-d1-dev am: 57522f0fcc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23680143
Change-Id: I2b65e858794346e3231bb7fdb0a013a2d4934677
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 04:24:10 +00:00
Weng Su
20fd4a46c8
Shutdown secondary SAP automatically
...
- If the "Extend compatibility" preference is not supported, then set to shutdown secondary SAP automatically within the "Turn off hotspot automatically" preference.
Bug: 285914977
Test: manual test
atest -c WifiTetherAutoOffPreferenceControllerTest
Change-Id: I405107a4782a6f023442d196d0fca27515aab00e
2023-06-14 05:51:43 +08:00
Milton Wu
aadecbaf34
[BiometricsV2] Refactor model code to kotlin
...
Bug: 286196884
Test: atest FingerprintEnrollmentActivityTest CredentialModelTest
EnrollmentRequestTest FingerprintEnrollIntroViewModelTest
FingerprintEnrollmentViewModelTest
Test: atest biometrics-enrollment-test
Change-Id: I2bdae4d2dd052d3664a790cd982edf51fcebec09
2023-06-13 10:29:16 +00:00
Wenhui Yang
52d5bdc0c1
Merge "Fix fingerprint unlock stuck after renaming" into udc-qpr-dev am: bfa2feb316
am: 9ed0cee15f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23574345
Change-Id: Ib9580f0420fc4bd0de6b06234294af5c2feb8e59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 02:59:29 +00:00
Wenhui Yang
4e059e6f4b
Merge "Fix face re-enroll stuck for work profile" into udc-qpr-dev am: 14b115177c
am: afa7bcb2e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23591204
Change-Id: I953acbc10670453878669fc3912c98bba4850470
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 02:57:50 +00:00
Wenhui Yang
9ed0cee15f
Merge "Fix fingerprint unlock stuck after renaming" into udc-qpr-dev am: bfa2feb316
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23574345
Change-Id: I1d258a5f739e9ed033bce431e6ea636f3772910a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 01:49:53 +00:00
Wenhui Yang
afa7bcb2e5
Merge "Fix face re-enroll stuck for work profile" into udc-qpr-dev am: 14b115177c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23591204
Change-Id: I6b745a87a4a20ca01bb55cc0a5e921c12f1fcc23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-13 01:48:41 +00:00
Wenhui Yang
bfa2feb316
Merge "Fix fingerprint unlock stuck after renaming" into udc-qpr-dev
2023-06-13 01:02:42 +00:00
Wenhui Yang
14b115177c
Merge "Fix face re-enroll stuck for work profile" into udc-qpr-dev
2023-06-13 01:02:08 +00:00
Wenhui Yang
7e6443e025
Fix face re-enroll stuck for work profile
...
Call super.onCreate(savedInstanceState) first to pass the correct userId
in maxFacesEnrolled.
Test: Manual - delete face unlock for work and re-enroll and observe
face unlock can be enrolled successfully
Test: atest FaceEnrollIntroductionTest
Fixes: 284819031
Change-Id: Ic1620c0ca3ca9adc61f5281abd34471f0c1b3f97
2023-06-12 20:06:01 +00:00
Han Xu
fc05f6766e
Add manufactured year into hardware info page am: b452bc9f9d
am: 15da26329f
am: 24fc0d6744
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342
Change-Id: Idb39c3d58e9e90f03ec329ab72b772ab705ef7de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 18:53:23 +00:00
Han Xu
e319c686e7
Add manufactured year into hardware info page am: b452bc9f9d
am: 15da26329f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342
Change-Id: I29b80b692bc97132b5cc7eac3d3a153d0f93d238
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 18:08:24 +00:00
Han Xu
24fc0d6744
Add manufactured year into hardware info page am: b452bc9f9d
am: 15da26329f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342
Change-Id: Ia99e7b22230a44bbe5c70bcac17b64cd5536e4f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 18:06:18 +00:00
Han Xu
1a9a892ff3
Add manufactured year into hardware info page am: b452bc9f9d
am: eefb4e777d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342
Change-Id: Id5c47cbcbefad23dc81eb4e597aed8a21a36affc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 18:06:10 +00:00
Han Xu
15da26329f
Add manufactured year into hardware info page am: b452bc9f9d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342
Change-Id: I53f6c06271bb862cd16e2f3cb48886f764686d40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 17:43:44 +00:00
Treehugger Robot
f572bed648
Merge "Remove redundant methods and refactor" into udc-qpr-dev am: 55774422b1
am: 6fb7cb85fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23634999
Change-Id: I31ff110702752ffcd819e94106a1434963ef6e1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 10:37:10 +00:00
Treehugger Robot
6fb7cb85fd
Merge "Remove redundant methods and refactor" into udc-qpr-dev am: 55774422b1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23634999
Change-Id: I33ea753d6fcf8ced79a315652134513b40b0cfb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 09:55:15 +00:00
Han Xu
b452bc9f9d
Add manufactured year into hardware info page
...
Bug: 285471557
Test: manual visually
Change-Id: Iaab254ac6ee77217e29d89524d782577f44119cb
2023-06-12 17:43:55 +08:00
Treehugger Robot
55774422b1
Merge "Remove redundant methods and refactor" into udc-qpr-dev
2023-06-12 09:05:05 +00:00
Yi-Ling Chuang
f148baa372
Remove redundant methods and refactor
...
Remove the summary method and write the code in AOSP directly instead to
force string consistency. Also refactor a bit after the modification.
Fixes: 276399056
Test: robotests
Change-Id: I76ad740b694363a3cdfb3748e41c840fb678b93d
2023-06-12 16:11:49 +08:00
Wenhui Yang
98744f1a8e
Fix fingerprint unlock stuck after renaming
...
FingerprintAuthenticationClient wasn't cancelled successfully because cancelletion signal was set to null.
Test: Manual - rename an existing fingerprint and observe fingerprint unlock can be entered again
Test: atest FingerprintSettingsFragmentTest
Fixes: 283926104
Change-Id: Id33cc3d3e8052f5cc39eddac26a75047d3139633
2023-06-09 17:55:48 +00:00
Treehugger Robot
bae3bf9b63
Merge "Show "Not available" summary when hotspot speed is unavailable" into udc-d1-dev am: a99c52e160
am: 34a254fc0c
am: cc4410e536
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601566
Change-Id: Idfc98b457000a4968a47651b35f271e3bc20c3bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-09 06:33:29 +00:00