Commit Graph

19874 Commits

Author SHA1 Message Date
TreeHugger Robot
3924138fb7 Merge "Update BatterySettingsFeatureProvider interface" into udc-qpr-dev am: fcd80ade3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23729063

Change-Id: Ic6a9df6ddf6ca3c0cd5f8501f95cf4684a9d43a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 02:59:40 +00:00
TreeHugger Robot
fcd80ade3b Merge "Update BatterySettingsFeatureProvider interface" into udc-qpr-dev 2023-06-20 02:08:25 +00:00
Chaohui Wang
68159be3ee [lint] Fix Wrong Resource Type am: 7aaceaa782
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23734154

Change-Id: If50e377055875ff4814e6b479ba9e474cf62b91c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-19 05:55:25 +00:00
Chaohui Wang
7aaceaa782 [lint] Fix Wrong Resource Type
Bug: 285231003
Test: m Settings
Change-Id: I8dfbaf1342f014af35cd08906ac3f498b6c8c11a
2023-06-19 10:17:35 +08:00
Treehugger Robot
7d837a745a Merge "[Settings] Fix roboletric test fail and add new test case." into udc-dev am: 08366227b5 am: 44fddb456e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691723

Change-Id: Ia18d8a3915dbea04de48d6306f12ce81a361dc5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-17 07:06:17 +00:00
Treehugger Robot
d9c0cf79e8 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: Ic3a17c6731869827bfff43d8a5de227ea0f9a657
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-17 07:05:29 +00:00
Matías Hernández
f5355dbb51 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: I152c75f7bde652a89db3780858914d31751b2ddd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-17 07:04:00 +00:00
Treehugger Robot
7abcb94693 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: I2cc82b781919c303a70bcdb39c162d5a68fa7e34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-17 07:01:44 +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
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
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
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
6a2327f7fe Merge "[Settings] Fix roboletric test fail and add new test case." into udc-dev am: 08366227b5 am: c14daa817b am: c88e678aa9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691723

Change-Id: I5a33631c2e7ea1030061e997df4eba1af9e8ecbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 13:11:06 +00:00
Treehugger Robot
a9abf5c13b Merge "[Settings] Fix roboletric test fail and add new test case." into udc-dev am: 08366227b5 am: 009c112db2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691723

Change-Id: Idf443816d43a1fe8be77e94062fafdf58d7e92c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 13:09:56 +00:00
Treehugger Robot
c88e678aa9 Merge "[Settings] Fix roboletric test fail and add new test case." into udc-dev am: 08366227b5 am: c14daa817b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691723

Change-Id: I08ed49fba3fb42bde7c8836666476091cdd1c6f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 12:32:02 +00:00
Treehugger Robot
c14daa817b Merge "[Settings] Fix roboletric test fail and add new test case." into udc-dev am: 08366227b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691723

Change-Id: I1e96376f6aec9cce89f71117474bace2d1364505
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 12:06:30 +00:00
Treehugger Robot
44fddb456e Merge "[Settings] Fix roboletric test fail and add new test case." into udc-dev am: 08366227b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691723

Change-Id: I2fe19557e53756a2e61071ae530f89756cb32eab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 12:05:57 +00:00
Treehugger Robot
08366227b5 Merge "[Settings] Fix roboletric test fail and add new test case." into udc-dev 2023-06-15 11:18:51 +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
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
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
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
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
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
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
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
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
33e5518af1 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: Ie91f13e1b27753177e9bd7f7b88e9f2821cdada1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 16:38:43 +00:00