Commit Graph

49943 Commits

Author SHA1 Message Date
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
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
TreeHugger Robot
7f45861797 Merge "Fix Settings app ANR due to blocking IDumpstateDevice IPC call" 2023-06-19 05:20:22 +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
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
2f87be66ce 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: I6b737218b4bec1500ea31218c0b7d13fb0a57f42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 22:15:59 +00:00
Yanli Wan
2445e98020 Merge "Hide Device Lock settings screen if device lock manager is not available" into udc-devicelock-prod am: 2db0f47240
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23684870

Change-Id: Ie16f3870f7e6d5f0939c762f7be2be2b9a8f1f22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 21:09:44 +00:00
Grace Cheng
71a57d8cec Merge "Fix NPE in updateAddPreference" into udc-d1-dev am: 8ba960014c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23672674

Change-Id: Ibde63cfed809364db4fdebdc97b45b7dadce5912
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 20:50:58 +00:00
Yanli Wan
2db0f47240 Merge "Hide Device Lock settings screen if device lock manager is not available" into udc-devicelock-prod 2023-06-15 20:34:59 +00:00
Chun-Ku Lin
802978fd80 Use FakeTimer in test to avoid flakiness.
**Root cause**
ScreenFlashNotificationColorDialogFragment creates Timer which spawns
unmanageable threads for tests. Also, the test itself uses Thread.sleep
which makes it non-destermistic.

Bug: 279082331
Test: atest ScreenFlashNotificationColorDialogFragmentTest --iteration
20

Change-Id: Id49c8d402a0578f8297ca12fe49da304c7a988d8
2023-06-15 18:20:23 +00:00
Treehugger Robot
0700358e5d Merge "'Mobile plan' is searchable even if it is unavailable" am: a3f9f42b71 am: 2c73cc8ca8 am: 2010c175a6 am: 2d23561a25 am: c68d307ca8 am: 89639372d5
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2625935

Change-Id: I1075b8cbccae3b80445713e3765307fabeeb12ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 13:59:35 +00:00
Tetiana Meronyk
4899e50224 Add padding to dialog
Bug: 287265141
Test: on device with multiple admins enabled (default for HSUM) create a new
user and open User details view. Toggle Make this user an admin on/off.
Observe increased padding.

Change-Id: I216a91c4685eb12986cc4c61ae7be439358f55b2
2023-06-15 13:20:17 +00:00
Treehugger Robot
89639372d5 Merge "'Mobile plan' is searchable even if it is unavailable" am: a3f9f42b71 am: 2c73cc8ca8 am: 2010c175a6 am: 2d23561a25 am: c68d307ca8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2625935

Change-Id: I7b52296963a9e838863808db52675f454951ace3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 13:09:53 +00:00
Treehugger Robot
c68d307ca8 Merge "'Mobile plan' is searchable even if it is unavailable" am: a3f9f42b71 am: 2c73cc8ca8 am: 2010c175a6 am: 2d23561a25
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2625935

Change-Id: I7f514c59303087a72787d6c0814ede0ecdf0743d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 12:31:02 +00:00
Treehugger Robot
2d23561a25 Merge "'Mobile plan' is searchable even if it is unavailable" am: a3f9f42b71 am: 2c73cc8ca8 am: 2010c175a6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2625935

Change-Id: I575d1fc77fefd4bd5b441403f0bc88cf7ede8b5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 11:44:07 +00:00
TreeHugger Robot
5cc530b6d5 Merge "Fix bluetooth settings pairing page stuck" into udc-qpr-dev am: a1fd330fb5 am: 32c150e8ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23657645

Change-Id: I049280a8d5c6654098feace48138e424dde8d040
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 11:02:53 +00:00
Chaohui Wang
782df5c6bf Merge "Remove primaryUserOnly param from UsageStats" into udc-qpr-dev am: 9aa7466cf2 am: afab1d4250
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467963

Change-Id: I772a13b9d70d253c3e63b05bb25b0619823d811c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 10:39:10 +00:00
Treehugger Robot
2010c175a6 Merge "'Mobile plan' is searchable even if it is unavailable" am: a3f9f42b71 am: 2c73cc8ca8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2625935

Change-Id: I9c423f5290eec4f6a8ac68aca4ece6b6675e7a5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 10:33:50 +00:00
TreeHugger Robot
32c150e8ea Merge "Fix bluetooth settings pairing page stuck" into udc-qpr-dev am: a1fd330fb5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23657645

Change-Id: I7bb7e5fd8e647e2f99532ef56effcf9b1f10587d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 10:18:04 +00:00
Chaohui Wang
afab1d4250 Merge "Remove primaryUserOnly param from UsageStats" into udc-qpr-dev am: 9aa7466cf2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467963

Change-Id: I7d4f1d5299aebc1bc01da4def39703a28d7a5fb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 10:16:53 +00:00
Treehugger Robot
2c73cc8ca8 Merge "'Mobile plan' is searchable even if it is unavailable" am: a3f9f42b71
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2625935

Change-Id: Id3c8af985ccaaa05e29238bc3c0bcda257fe132e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 09:50:45 +00:00
TreeHugger Robot
a1fd330fb5 Merge "Fix bluetooth settings pairing page stuck" into udc-qpr-dev 2023-06-15 09:42:19 +00:00
Chaohui Wang
ed6d6c9e0f Migrate PlatformCompat App List to SPA
So hidden modules are not shown in the list.

This will also improve the developer experience.

Bug: 273913035
Test: Manually with App Compatibility Changes
Test: Unit test
Change-Id: Ic78a51819159a0f848db6173f751b1be8c6b1e70
2023-06-15 09:37:11 +00:00
Chaohui Wang
9aa7466cf2 Merge "Remove primaryUserOnly param from UsageStats" into udc-qpr-dev 2023-06-15 09:29:39 +00:00
Chaohui Wang
bb47f32011 Fix bluetooth settings pairing page stuck
There is heavy work to do when add device to list in the
DeviceListPreferenceFragment, off load these work from main thread
to solve the issue.

Make devicePreferenceMap a ConcurrentHashMap to avoid potential race
condition.

Also no longer use getCachedPreference(key) since we not put anything
into the cache, the fallback flow is always used.

Also in BluetoothDevicePreference.onPreferenceAttributesChanged(), move
more heavy work to background thread.

Using System.currentTimeMillis() to sort devices could cause flaky
because System.currentTimeMillis() could be same for different device,
use AtomicInteger instead.

Fix: 286628533
Test: Following the step in bug
Change-Id: Ia9750adb6b4c1424d084381e9d7c2ca8e7912391
2023-06-15 08:43:17 +00:00
Rhed Jao
07f9d1ccbe Merge "[Settings] Add a verification flow for exiting repair mode" into udc-qpr-dev am: e1c9d65cda am: 721a7bacaa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629341

Change-Id: If01a1c5c13433e85f9b91790375dc2f297777dd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 07:19:57 +00:00
TreeHugger Robot
784119340b Merge "[Settings] Avoid NPE when user enter WifiCallingSettings back and forth" into udc-d1-dev am: 1765c1dc6e am: ee77d651fa am: f5acc230b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695884

Change-Id: Ibfbd74b4c9f2298fe210b22dccf36acb71f3c99c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 07:17:44 +00:00
Rhed Jao
721a7bacaa Merge "[Settings] Add a verification flow for exiting repair mode" into udc-qpr-dev am: e1c9d65cda
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629341

Change-Id: I58bc332082495cf4451228aa8179f6d2e6a2c73b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 06:34:53 +00:00
TreeHugger Robot
f5acc230b3 Merge "[Settings] Avoid NPE when user enter WifiCallingSettings back and forth" into udc-d1-dev am: 1765c1dc6e am: ee77d651fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695884

Change-Id: I70bef64fcefc75fc3d3496c76d4af9c85efdd9c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 06:31:38 +00:00
Mill Chen
d4eecf6132 Guard slices from being requested by guest user
According to patch of A-231987122, AOSP restricts app to modify relevant
mobile settings when user is a guest. This change intends to prevent the
slices related to mobile settings from being requested by guest user.

Bug: 278616139
Bug: 277333776
Bug: 262244832
Bug: 278616520
Bug: 278615120
Test: robotests
Change-Id: I4dc4bbfdb5cf76e188e6f62ebfd74ef6fa2fe33b
2023-06-15 14:29:01 +08:00
TreeHugger Robot
ee77d651fa Merge "[Settings] Avoid NPE when user enter WifiCallingSettings back and forth" into udc-d1-dev am: 1765c1dc6e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695884

Change-Id: I8bbc5d48e272ab0a5b7880f1ee3b99043df64665
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 05:00:40 +00:00
Rhed Jao
e1c9d65cda Merge "[Settings] Add a verification flow for exiting repair mode" into udc-qpr-dev 2023-06-15 04:55:45 +00:00