Commit Graph

19684 Commits

Author SHA1 Message Date
TreeHugger Robot
c57d3de706 Merge "Fix TetherSettings crash issue" into udc-dev am: f65da39f37 am: 9f831a600b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23485222

Change-Id: I15e5a054a77aafd21dcedea9b6a96a5b05b21e03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 05:46:26 +00:00
TreeHugger Robot
60de9941fb Merge "Fix TetherSettings crash issue" into udc-dev am: f65da39f37 am: 9f831a600b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23485222

Change-Id: If6b861c8c84aafae60c2d74a86f5bf4c276462eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 05:43:22 +00:00
TreeHugger Robot
9f831a600b Merge "Fix TetherSettings crash issue" into udc-dev am: f65da39f37
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23485222

Change-Id: Ia75886edc6211a05645e047bc627a95f923cd6ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 05:02:59 +00:00
TreeHugger Robot
28c9000bb7 Merge "Fix TetherSettings crash issue" into udc-dev am: f65da39f37
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23485222

Change-Id: I8d186dbc0615dd277d6bd2ffd0272beac0280a2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 04:57:15 +00:00
ykhung
e2f19b7de9 Update incompatible charger checking rule
Bug: 278316711
Test: make test RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge
Change-Id: I8f720bcdf7c0efabc8278913ccf1c0427c857fac
2023-06-01 12:50:47 +08:00
Angela Wang
5176db8a71 Merge "Make Hearing devices preference always visible" into udc-qpr-dev am: 7df08d69be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429459

Change-Id: I3e7126da14c0882753a6edb69d4455a4d3db5030
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 02:51:06 +00:00
Angela Wang
7df08d69be Merge "Make Hearing devices preference always visible" into udc-qpr-dev 2023-06-01 02:04:50 +00:00
Pavel Grafov
8112fb3828 Avoid double quiet mode requests
Currently when "Work apps" the toggle is tapped in Settings it leads to
UM.requestQuietMode() being called twice via different routes.

Bug: 284915370
Test: atest WorkModePreferenceControllerTest
Change-Id: I5eeb7ecdb10245a32d947ae2430a865bd7a5a60a
2023-05-31 13:56:42 +01:00
Weng Su
086d062cb2 Fix TetherSettings crash issue
- When the user is a guest user, the UI will remove all preferences to restrict setting changes. If the ViewModel updates the UI in this situation, it will cause Settings to crash.
  - Avoid to setup ViewModel when UI is restricted

Bug: 284435378
Test: Manual test
atest -c TetherSettingsTest

Change-Id: I52d4ea717c34eacc9cc2321e3950dc89408049f8
2023-05-31 20:38:36 +08:00
danielwbhuang
19a5e212de Use custom action key icon
1. get icon from getKeyboardSettingsFeatureProvider
2. set color for it

Bug: 269214138
Test: manual, atest KeyboardSettingsFeatureProviderImplTest
Change-Id: I3a2d47e8230aec1404300b000e8b1fcf221e2a65
2023-05-29 15:38:55 +08:00
Weng Su
25d259e3e2 Restrict SimDialogActivity
- Restrict UI if user is a guest

- Restrict UI if user has DISALLOW_CONFIG_MOBILE_NETWORKS

Bug: 262242946
Bug: 271849181
Test: manual test
atest -c SimDialogActivityTest

Change-Id: I227400aa71880895d8356f3d2961cb610ad2a357
2023-05-29 07:03:19 +00:00
Hao Dong
81587b1864 Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-qpr-dev am: 6cb1f9401d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23418521

Change-Id: Ifd0ca0b6881b2e8d0ff8f57e9fa4876208f9e520
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 23:05:55 +00:00
Treehugger Robot
0934c3e881 Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc am: 24db1f3393 am: 424440670d am: 9abd002f0c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956

Change-Id: I38e0b893872feca32d26aa62f48b2f1e69f8e9cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 23:02:22 +00:00
Hao Dong
6cb1f9401d Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-qpr-dev 2023-05-26 20:35:34 +00:00
Treehugger Robot
67b9234806 Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc am: 24db1f3393 am: 424440670d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956

Change-Id: Ib5975d1e338250b7468f3e37650094eeb5244bad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 20:20:34 +00:00
Treehugger Robot
9abd002f0c Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc am: 24db1f3393 am: 424440670d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956

Change-Id: I0cd780aed67bbe0560f5057fc430fc144b9f1f35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 20:17:32 +00:00
Treehugger Robot
424440670d Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc am: 24db1f3393
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956

Change-Id: I9d29601614b0f166afc898f99e3ee87df974abf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 18:52:36 +00:00
Treehugger Robot
f8b14c6049 Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc am: 24db1f3393
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956

Change-Id: Ib173215d93105852a2d611eae76d0eafb7e34b78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 18:48:13 +00:00
Treehugger Robot
24db1f3393 Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956

Change-Id: Ifa1155d2a3ae19ff743b29b47e088d5d42724f70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 17:44:20 +00:00
Chaohui Wang
6a6e3b848b Merge "Move unrestricted data summary to DataSaverController" into udc-qpr-dev am: 97963e8389
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442437

Change-Id: Ic6338fc2c629944f4c8baf560becec13e63db03f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 07:55:20 +00:00
Chaohui Wang
97963e8389 Merge "Move unrestricted data summary to DataSaverController" into udc-qpr-dev 2023-05-26 07:50:45 +00:00
TreeHugger Robot
0c0333b091 Merge "Fixed unable to enable hotspot with Security None" into udc-dev am: 52d2daf3b3 am: 89b497a051 am: b02de2eb5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442438

Change-Id: I0874437f53a0eea3b5c588f6e6c33b76dd3cbead
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 07:49:06 +00:00
TreeHugger Robot
bf08be55a0 Merge "Fixed unable to enable hotspot with Security None" into udc-dev am: 52d2daf3b3 am: 89b497a051
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442438

Change-Id: I1c9beadacb0731dfb425932a077cb7354d924cd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 07:09:34 +00:00
TreeHugger Robot
b02de2eb5c Merge "Fixed unable to enable hotspot with Security None" into udc-dev am: 52d2daf3b3 am: 89b497a051
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442438

Change-Id: I11844659c7c294c3bcbb99df425c02db747a6df3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 07:05:26 +00:00
TreeHugger Robot
89b497a051 Merge "Fixed unable to enable hotspot with Security None" into udc-dev am: 52d2daf3b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442438

Change-Id: I46d36e32cdb36b47eaa3c62005e65666c9fe94bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 06:26:29 +00:00
TreeHugger Robot
3a5719aae0 Merge "Fixed unable to enable hotspot with Security None" into udc-dev am: 52d2daf3b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442438

Change-Id: I9cd1fcc11e76da716b44faf5994b61eda78f0a0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 06:22:10 +00:00
TreeHugger Robot
52d2daf3b3 Merge "Fixed unable to enable hotspot with Security None" into udc-dev 2023-05-26 05:43:02 +00:00
Chaohui Wang
3e35cff7ba Move unrestricted data summary to DataSaverController
DataSaverController currently used in 2 pages,
- Network & internet > Data Saver
- Apps > Special app access

This helps unify the logic, and instead of showing on "Special app
access", this summary shows on "Unrestricted data" is make more sense.

Bug: 280280596
Test: Manually on above pages
Test: Unit test
Change-Id: Ia151ed8179a250f8f20cc5041f9383fffebdab10
2023-05-26 13:05:48 +08:00
Weng Su
f7d8f0481d Fixed unable to enable hotspot with Security None
- Due to the design adjustment, the default value of SoftApConfiguration is not Security None, so the update of Security None cannot be omitted.

Bug: 283762826
Test: Manual test
atest -c WifiTetherSettingsTest

Change-Id: I07d18b8f73ab8190152332c01814a4bd72cf28d6
2023-05-26 12:26:31 +08:00
Hao Dong
2eadf68438 Fix Fingerprint enrollment UI when display size is largest.
1. Remove land/udfps_enroll_enrolling and use the default land layout
instead. Swap header and content when necessary to avoid overlap.
2. Add UdfpsEnrollEnrollingView.java

Test: manual test - 1. Set system display and font size largest
	            2. Launch fingerprint enrollment and check UI.
Test: atest FingerprintEnrollEnrollingTest
Bug: 269060514
Bug: 283169056
Change-Id: Ifbe6c92c4213979952f2f89a1cd595c9c4bff6ec
2023-05-25 21:54:07 +00:00
Yuxin Hu
59af6df619 Merge "Fix "Enable ANGLE" switch behavior when Developer Option Switch is off" into udc-dev am: 67c72c01cb am: f783947615 am: 1af33f713b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23360519

Change-Id: Ib0f282be3b9f96abeff70eba344e63ab1c6b8c06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 20:37:38 +00:00
Yuxin Hu
d8fbd089d8 Merge "Fix "Enable ANGLE" switch behavior when Developer Option Switch is off" into udc-dev am: 67c72c01cb am: f783947615
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23360519

Change-Id: I7d2cfa1bb297eab9ff0b06ed10d628153ae1c40c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 19:48:28 +00:00
Yuxin Hu
1af33f713b Merge "Fix "Enable ANGLE" switch behavior when Developer Option Switch is off" into udc-dev am: 67c72c01cb am: f783947615
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23360519

Change-Id: Ifdca402cee4f367a73952887663685478bcffabb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 19:46:15 +00:00
Yuxin Hu
75b784fcd0 Merge "Fix "Enable ANGLE" switch behavior when Developer Option Switch is off" into udc-dev am: 67c72c01cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23360519

Change-Id: I9f456a0b676c188c61e0ae4002d57a0d7f6c3dc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 19:03:06 +00:00
Yuxin Hu
f783947615 Merge "Fix "Enable ANGLE" switch behavior when Developer Option Switch is off" into udc-dev am: 67c72c01cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23360519

Change-Id: I55082fed74d343f8c1daab93e7fb73d093853d68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 19:02:31 +00:00
Yuxin Hu
67c72c01cb Merge "Fix "Enable ANGLE" switch behavior when Developer Option Switch is off" into udc-dev 2023-05-25 18:08:10 +00:00
Angela Wang
abebbfc4b3 Make Hearing devices preference always visible
Previously we hide the preference when Bluetooth is off since it's only used for showing connected hearing aids and acting as a shortcut to device detail page.

However, the preference is now a new page of multiple controls, we probably shouldn't hide the preference the Bluetooth is off. Those controls should be accessible even if the Bluetooth is off.

Bug: 284092084
Test: make RunSettingsRoboTests ROBOTEST_FILTER=HearingAidHelperTest
Change-Id: I647a187d73bd673c8ac8ab366579ba92c22ce1dc
2023-05-25 11:20:11 +00:00
Chaohui Wang
aac2015cc7 Merge "Improve the loading time of DataSaverSummary" into udc-qpr-dev am: b04b977cac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405371

Change-Id: I1ffdee026aa86e7b31b963d8d7ef62613df4fb6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 10:10:40 +00:00
Chaohui Wang
b04b977cac Merge "Improve the loading time of DataSaverSummary" into udc-qpr-dev 2023-05-25 09:38:35 +00:00
Treehugger Robot
22acfebdb9 Merge "[Settings] Use background thread to get VoNr state." into udc-dev am: 1fd77775cb am: 0d065f7913 am: 2299f35385
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405373

Change-Id: Ifb5a172d9977287ab725510a0b2faa4fae33c7a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 08:11:53 +00:00
Chaohui Wang
3ca754c35c Merge "Fix crash of PictureInPicture" into udc-dev am: 5b042e2feb am: a9a229665b am: 85365bf381
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23408018

Change-Id: I33a4bfa4535cfe87156b77b7f58fb54ad5e34ba2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 08:11:18 +00:00
Treehugger Robot
506b8af1b1 Merge "[Settings] Use background thread to get VoNr state." into udc-dev am: 1fd77775cb am: 0d065f7913
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405373

Change-Id: I0ba5cc6eb2112440a4b2063f1347fed9406f5ad5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 07:33:25 +00:00
Chaohui Wang
516503df0a Merge "Fix crash of PictureInPicture" into udc-dev am: 5b042e2feb am: a9a229665b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23408018

Change-Id: Ia5aaf1c116abef625c43a63619636b18cfe6515f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 07:31:52 +00:00
Treehugger Robot
2299f35385 Merge "[Settings] Use background thread to get VoNr state." into udc-dev am: 1fd77775cb am: 0d065f7913
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405373

Change-Id: Ied812c9a81d5945d7a1c3157ef345e359b8c0c88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 07:27:45 +00:00
Chaohui Wang
85365bf381 Merge "Fix crash of PictureInPicture" into udc-dev am: 5b042e2feb am: a9a229665b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23408018

Change-Id: Ic4f862141920da6b3d392c48158fd94eadf1758e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 07:27:38 +00:00
Treehugger Robot
0d065f7913 Merge "[Settings] Use background thread to get VoNr state." into udc-dev am: 1fd77775cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405373

Change-Id: I46331c040344bcf47c7ce59f37a8ce5378eee961
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 06:45:29 +00:00
Chaohui Wang
a9a229665b Merge "Fix crash of PictureInPicture" into udc-dev am: 5b042e2feb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23408018

Change-Id: Ieb36ee51360a0406d62fa500e518be0b4e6dddd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 06:45:21 +00:00
Treehugger Robot
48355b8b24 Merge "[Settings] Use background thread to get VoNr state." into udc-dev am: 1fd77775cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405373

Change-Id: I68dd6ae9bd91519b126cbacb8cba1fb4909524a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 06:41:09 +00:00
Chaohui Wang
f976ff3f06 Merge "Fix crash of PictureInPicture" into udc-dev am: 5b042e2feb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23408018

Change-Id: I271981812af20ac9d666465edea064fba0a2642e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 06:40:44 +00:00
Treehugger Robot
1fd77775cb Merge "[Settings] Use background thread to get VoNr state." into udc-dev 2023-05-25 06:25:55 +00:00