Chun-Ku Lin
0aea3ddb33
Fix AccessibilityHearingAidPreferenceControllerTest
...
**Root cause**
When adding a feature flag on showing different hearing aid page on
click, the tests were not executed because they were marked as @Ignore.
In order to execute the test, we need to turn the feature flag off, so that the test run in the same scenario where the feature flag was not introduced.
Bug: 279082331
Test: atest AccessibilityHearingAidPreferenceControllerTest
Change-Id: If11ac40a7ea3926578992f7c0577e7cbb1bb3273
2023-06-02 06:47:38 +00:00
Treehugger Robot
da647c56cf
Merge "Skip Wi-Fi hotspot in Settings Widgets" into udc-dev am: 47d3cfe635
am: 91737c0b3b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517077
Change-Id: Ie80f779283a48571a5169b7c408bc5a300640866
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 05:07:08 +00:00
Treehugger Robot
91737c0b3b
Merge "Skip Wi-Fi hotspot in Settings Widgets" into udc-dev am: 47d3cfe635
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517077
Change-Id: I272844e63ff78dc9ef730c04b768ee2dc1634e73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 04:24:57 +00:00
Treehugger Robot
47d3cfe635
Merge "Skip Wi-Fi hotspot in Settings Widgets" into udc-dev
2023-06-02 04:19:22 +00:00
Chun-Ku Lin
c8c67d731f
Fix ToggleScreenMagnificationPreferenceFragmentTest
...
- Prevent mocking ToggleScreenMagnificationPreferenceFragment for test
- Use Robolectric's way to launch the fragment so that the fragment
contains necessary setup
**Root cause**
- We called onCreateView directly in the test without the necessary setup
in onCreate, which causes the FooterPreferenceController not being
initialized.
- We created a spyContext that returns a mock PackageManager, however,
in the test execution, we didn't mock the context used by the fragment
under test. Hence, the fragment didn't use the mock PackageManager in
test.
Bug: 284209879
Test: atest ToggleScreenMagnificationPreferenceFragmentTest --iterations
5
Change-Id: I7e71a03177526f5bb0c20a58855a7dfdffc2a22f
2023-06-02 03:04:37 +00:00
YK Hung
9ec0a502ac
Merge "Update incompatible charger checking rule" into udc-dev am: bfc4637d09
am: 4eabcdea6d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484351
Change-Id: Ia022e43707b71187ac98c2a9aea6d6f772cab162
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 01:43:57 +00:00
YK Hung
4eabcdea6d
Merge "Update incompatible charger checking rule" into udc-dev am: bfc4637d09
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484351
Change-Id: I7a3133f83570a82bb5e87dd1096d5d47f85f3390
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 01:22:21 +00:00
YK Hung
bfc4637d09
Merge "Update incompatible charger checking rule" into udc-dev
2023-06-02 00:50:17 +00:00
Weng Su
ef81179538
Skip Wi-Fi hotspot in Settings Widgets
...
- Do not show Wi-Fi hotspots in Settings Widgets if the config is not set to show
Bug: 275268676
Test: Manual test
atest -c CreateShortcutPreferenceControllerTest
Change-Id: I5d86a78c9d48c9b63faff50d46f1254dbefd94cf
2023-06-02 04:54:59 +08:00
Treehugger Robot
0a9fe7a3ab
Merge "Adding ShadowBluetoothAdapter for the test"
2023-06-01 18:52:02 +00:00
Prabir Pradhan
edbc95e817
Merge "Add "Show key presses" to input developer options" into udc-qpr-dev am: 8fca8a72dc
am: 753647d584
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23356796
Change-Id: I9c43018307252742022d19443c3423fa4ee05550
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 18:24:09 +00:00
Prabir Pradhan
753647d584
Merge "Add "Show key presses" to input developer options" into udc-qpr-dev am: 8fca8a72dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23356796
Change-Id: Icc77794741fcbeb32726dddc972d75819b77428a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 18:18:33 +00:00
Chun-Ku Lin
b34dcecc58
Adding ShadowBluetoothAdapter for the test
...
Many robotests that touches BluetoothAdapter might need to use our own
ShadowBluetoothAdapter which implements a "fake" getSupportedProfiles
call, so that the test won't trying to execute the android framework's getSupportedProfiles method.
Bug: 285235777
Test: atest AccessibilitySettingsTest
Change-Id: I5b3b2f4528a2b32aff22928653c57576981c0ff9
2023-06-01 17:50:10 +00:00
Prabir Pradhan
8fca8a72dc
Merge "Add "Show key presses" to input developer options" into udc-qpr-dev
2023-06-01 17:37:44 +00:00
Pavel Grafov
81e7bac047
Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0
am: 4c5394afb3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320
Change-Id: I8ce1a31df186ab0a396c8b0858286fd1cc53f740
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 17:35:41 +00:00
Pavel Grafov
fe800cc8a1
Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0
am: 4aef4043aa
am: fa0a6b46dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320
Change-Id: Ice3fb038905d559362ebcbcf66bdb9a047e93e2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 17:26:37 +00:00
Pavel Grafov
fa0a6b46dc
Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0
am: 4aef4043aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320
Change-Id: Ibec147373fadf2c5a8a7550b541b75961fb41a3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 16:46:35 +00:00
Pavel Grafov
40897d4bec
Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0
am: fb15f59582
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320
Change-Id: I3411ef7f49b9327690c07e5413ba3dbaf95064a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 16:41:23 +00:00
Pavel Grafov
4c5394afb3
Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320
Change-Id: I6a82013b578378facf575a6daa9070ff337d0fc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 16:38:28 +00:00
Pavel Grafov
4aef4043aa
Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320
Change-Id: I9eaafcb4e1ce813e8775cbce0c6eda5137e922fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 15:57:28 +00:00
Pavel Grafov
8e13abebc0
Merge "Avoid double quiet mode requests" into udc-dev
2023-06-01 15:31:13 +00:00
Angela Wang
6451a35d3e
Merge "Shouldn't show pair another ear dialog if hearing aid supports CSIP" into udc-qpr-dev am: d91da4f4ca
am: 4560d2f83b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23412076
Change-Id: I782742799c995339e9f00ba2265acd84fb2ee3a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 12:24:00 +00:00
Angela Wang
4560d2f83b
Merge "Shouldn't show pair another ear dialog if hearing aid supports CSIP" into udc-qpr-dev am: d91da4f4ca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23412076
Change-Id: I3e99952c7148cffd16d87487733fcc12731a3211
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 11:41:38 +00:00
Angela Wang
d91da4f4ca
Merge "Shouldn't show pair another ear dialog if hearing aid supports CSIP" into udc-qpr-dev
2023-06-01 11:04:31 +00:00
Angela Wang
1bc59caf13
Shouldn't show pair another ear dialog if hearing aid supports CSIP
...
Some devices may supports both ASHA and CSIP. If the device supports
CSIP, it'll automatically pair the other ear and thus no need to pop up
the pair another ear dialog which is specially for ASHA device.
Bug: 283269736
Test: make RunSettingsRoboTests ROBOTEST_FILTER=HearingAidUtilsTest
Change-Id: I9a8e3876e2905b18b1c63e74f47c6877504ebdc8
2023-06-01 09:54:35 +00:00
TreeHugger Robot
f8d5aca736
Merge "Fix TetherSettings crash issue" into udc-dev am: f65da39f37
am: 9f831a600b
am: 60de9941fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23485222
Change-Id: I8a4dfd2c636be1359f91dd907aec371749ed839a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 07:30:07 +00:00
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
b2905ee16b
Merge "Fix TetherSettings crash issue" into udc-dev am: f65da39f37
am: ee4a8af972
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23485222
Change-Id: I84d3cb1f5f2f2139fe080b630205819f00aaca0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 05:42:14 +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
412f5fad85
Merge "Make Hearing devices preference always visible" into udc-qpr-dev am: 7df08d69be
am: 5176db8a71
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429459
Change-Id: I6e5e91d3bbc44f3973fc021a94cde5d0accb5ce0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 03:36:35 +00: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
TreeHugger Robot
d9d3a5d05a
Merge "Fix HearingDeviceCallRoutingPreferenceControllerTest failure due to NPE"
2023-05-31 22:18:49 +00:00
Chun-Ku Lin
a4e5f38002
Fix HearingDeviceCallRoutingPreferenceControllerTest failure due to NPE
...
Bug: 284209879
Test: atest HearingDeviceCallRoutingPreferenceControllerTest
Change-Id: I36e6fed02ef989c6c7fea4a53b992ac3863aca4d
2023-05-31 19:59:29 +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
Edgar Wang
47991c7267
Merge "Move UpdatableListPreferenceDialogFragment to Settings"
2023-05-31 08:16:11 +00:00
Edgar Wang
2b9a16876e
Move UpdatableListPreferenceDialogFragment to Settings
...
Fixes: 283233688
Test: robotest
Change-Id: Ia2b460f8804d4a84c730f7e8d39449999e3d00cd
2023-05-31 02:59:00 +00: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
7ced7a7cbd
Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-qpr-dev am: 6cb1f9401d
am: 81587b1864
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23418521
Change-Id: I47013f77ec1436048a41afbba34bdb4eeaa6ac6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-27 00:32:26 +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
eff0680f84
Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc
am: 24db1f3393
am: f483a19888
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956
Change-Id: Ib4a95a02a1ab9dae837d795c3721f0357746a395
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 20:17:44 +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