SongFerng Wang
3d14d61621
Merge changes Idf0ce198,Ibd324b78,I6daa38f5,I242402e4 am: 8be3ebd163
am: a5a729f523
am: 95f153642c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121199
Change-Id: I1418690d52c1e74f74f5d2bbf731ab5170e2c101
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-14 07:44:37 +00:00
SongFerng Wang
95f153642c
Merge changes Idf0ce198,Ibd324b78,I6daa38f5,I242402e4 am: 8be3ebd163
am: a5a729f523
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121199
Change-Id: I2ed62ef98c1e81d6549ba1eb0c271ef3bf61d168
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-14 07:27:08 +00:00
SongFerng Wang
a5a729f523
Merge changes Idf0ce198,Ibd324b78,I6daa38f5,I242402e4 am: 8be3ebd163
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121199
Change-Id: Ie1e14a6b697af624854a9360a60383fac63bb02c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-14 06:59:22 +00:00
SongFerngWang
fbfaa331d2
Unable to enable the removable esim am: 56e1297abe
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121195
Change-Id: I02f2599c790c90a0b602b84bc8b511f521a7e906
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-14 06:59:21 +00:00
Weng Su
a8ccc3456c
Restrict guest user to configure WiFi by QR code
...
- Don't show WifiDppConfiguratorActivity if the user is a guest.
Bug: 224772890
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDppConfiguratorActivityTest
Change-Id: I160761edfe2893475676421ba2b59205da8d0224
2022-06-14 01:20:54 +08:00
SongFerngWang
e63dfcbd90
[MEP] Modify the comments
...
Bug: 235792308
Test: build pass
Change-Id: Idf0ce19814ce8b23bc1eea864b36815203069f87
2022-06-13 18:24:30 +08:00
SongFerngWang
56e1297abe
Unable to enable the removable esim
...
When the user enable the removable esim, the settings select wrong
slot(esim slot). The slot shold be the removable + esim slot and the
UiccCardInfo's cardId is the same as the removable esim's cardId.
Bug: 233170453
Bug: 233338345
Test: atest UiccSlotUtilTest
Change-Id: Ibd324b781c84318c994e3742bb82e1d1393b94e4
Merged-In: Ibd324b781c84318c994e3742bb82e1d1393b94e4
2022-06-13 17:49:00 +08:00
Evan Chen
61ea6782f5
Update AssociationIno creation for Bluetooth test
...
Bug: 189250370
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDetailsCompanionAppsControllerTest
Change-Id: Iebbd2ca754b20d251f7a128bc2c460b4c3093762
Merged-In: Iebbd2ca754b20d251f7a128bc2c460b4c3093762
2022-06-10 23:03:33 +00:00
Piotr Wilczyński
179f00b9ef
Merge "Notify about brightness change when screen turns on" into tm-dev am: 7d634de3ea
am: 8bfab753c1
am: 6dac1ca43d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17898014
Change-Id: I0bad5912a12ae7fb19dd84b26a8cc9328ee99e46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 10:35:14 +00:00
Piotr Wilczyński
7018bd6f69
Merge "Notify about brightness change when screen turns on" into tm-dev am: 7d634de3ea
am: 395861f79d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17898014
Change-Id: Iba1f3f42b53b58216d66747b9ccb614b9cdefd28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 08:19:39 +00:00
Piotr Wilczyński
6dac1ca43d
Merge "Notify about brightness change when screen turns on" into tm-dev am: 7d634de3ea
am: 8bfab753c1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17898014
Change-Id: I74d279c286d697f13af2059e0c93f3c3109a7f9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 08:19:37 +00:00
Piotr Wilczyński
8bfab753c1
Merge "Notify about brightness change when screen turns on" into tm-dev am: 7d634de3ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17898014
Change-Id: I00e339ffd5b02bcbfeccb512eeeedf6d6356df76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 07:59:40 +00:00
Piotr Wilczyński
395861f79d
Merge "Notify about brightness change when screen turns on" into tm-dev am: 7d634de3ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17898014
Change-Id: Ib7e8232d1f4dafa6418363e629ba228d1eb217e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 07:58:03 +00:00
Piotr Wilczyński
7d634de3ea
Merge "Notify about brightness change when screen turns on" into tm-dev
2022-06-09 07:39:07 +00:00
SongFerng Wang
1ff89ae4bf
Merge "Unable to enable the removable esim" into tm-dev am: be1b37ae2b
am: 8425062cef
am: cac60c3548
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18714967
Change-Id: I8d00c2b3133c33fcaf7df2d4756a31f057b4b122
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 02:59:06 +00:00
SongFerng Wang
506f08b469
Merge "Unable to enable the removable esim" into tm-dev am: be1b37ae2b
am: 8425062cef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18714967
Change-Id: Ie02de937a62231f6bf41218ded791204046c59ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 02:43:01 +00:00
SongFerng Wang
cac60c3548
Merge "Unable to enable the removable esim" into tm-dev am: be1b37ae2b
am: 8425062cef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18714967
Change-Id: Iaf160129453409905112ff321ab35694c3383b07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 02:42:56 +00:00
SongFerng Wang
8425062cef
Merge "Unable to enable the removable esim" into tm-dev am: be1b37ae2b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18714967
Change-Id: Ic113ffc982f64c332b5269275e47941d6d5c2245
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 02:07:10 +00:00
SongFerng Wang
40379dd9d4
Merge "Unable to enable the removable esim" into tm-dev am: be1b37ae2b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18714967
Change-Id: I6120361d42db676e02991dafd707dfa1b4188777
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 02:05:41 +00:00
Weng Su
5f421125ab
Restrict WifiSlice functionality for guest user
...
- Hide Wi-Fi toggle and show Wi-Fi status only if the user is a guest.
Bug: 232798363
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiSliceTest
Change-Id: I35418477808eb5082f4651f5689f018dbb8e42ac
2022-06-09 06:07:55 +08:00
Avinash Vadlamudi
1ed3556c63
Merge changes from topic "avivadla-ephemeral-guest-ui-fixes-tm-qpr-dev" into tm-qpr-dev am: 26e3744221
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18751036
Change-Id: I1a0e8f88302132e700c9f07b802f44e412ceae1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 04:12:18 +00:00
Avinash Vadlamudi
26e3744221
Merge changes from topic "avivadla-ephemeral-guest-ui-fixes-tm-qpr-dev" into tm-qpr-dev
...
* changes:
Rename method for better readability
Fix the Ephemeral guest mode UI bugs
2022-06-08 04:03:11 +00:00
TreeHugger Robot
0b79b0831d
Merge "Restrict guest user to configure WiFi access points" into tm-qpr-dev am: 909b62ffa4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18740330
Change-Id: Ida08053974615bb1200e20b6f90ca0adbc79d4a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 18:36:21 +00:00
TreeHugger Robot
909b62ffa4
Merge "Restrict guest user to configure WiFi access points" into tm-qpr-dev
2022-06-07 18:16:32 +00:00
Alice Kuo
b045c57fe6
Add LE Audio feature switcher in the developer option menu am: 948b7cb959
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18740331
Change-Id: Ia0fa92a5061bdb75a648dbb3d8db9fd2bcbdb1a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 04:00:22 +00:00
Alice Kuo
948b7cb959
Add LE Audio feature switcher in the developer option menu
...
Add a switcher to enable/disable LE audio feature. The switcher could be
enabled by setprop ro.bluetooth.leaudio_offload.supported=true
screenshot: https://screenshot.googleplex.com/6aGP664S9PX5EMS
Bug: 233018305
Bug: 233005340
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioPreferenceControllerTest
Test: switch LE audio feature, and check LE audio functionality status
Change-Id: I8adcf27edd1438df445d32fca93f35ff5020a3b3
Merged-In: I8adcf27edd1438df445d32fca93f35ff5020a3b3
(cherry picked from commit 0d11fd07e7
)
2022-06-07 09:36:15 +08:00
TreeHugger Robot
2f7607e362
Merge "Restrict network preferences settings" into tm-qpr-dev am: 5afb322f3a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18702206
Change-Id: I6ab51f8b19893985160d0f46978199293fc52cdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 22:00:03 +00:00
TreeHugger Robot
5afb322f3a
Merge "Restrict network preferences settings" into tm-qpr-dev
2022-06-06 21:42:30 +00:00
Weng Su
a09c33f49c
Restrict guest user to configure WiFi access points
...
- If the user is not allowed to configure Wi-Fi access points, close WifiDialogActivity.
Bug: 226133034
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDialogActivityTest
Change-Id: I32d0c5beceb8a140a98636a5a0af97790495620d
2022-06-07 03:30:01 +08:00
SongFerngWang
64430ba2d2
Unable to enable the removable esim
...
When the user enable the removable esim, the settings select wrong
slot(esim slot). The slot shold be the removable + esim slot and the
UiccCardInfo's cardId is the same as the removable esim's cardId.
Bug: 233170453
Bug: 233338345
Test: atest UiccSlotUtilTest
Change-Id: Ibd324b781c84318c994e3742bb82e1d1393b94e4
2022-06-06 17:56:25 +08:00
Treehugger Robot
b7cb8d2e21
Merge changes I0ea498d2,I2d650eb3,I8adcf27e am: 2bec16eda0
am: 4494e0fcfe
am: 0570287625
am: c5c6474b70
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2115174
Change-Id: Ia4544fef9ee7d7428d9c430da2b68fb2c820538d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 08:07:06 +00:00
Treehugger Robot
c5c6474b70
Merge changes I0ea498d2,I2d650eb3,I8adcf27e am: 2bec16eda0
am: 4494e0fcfe
am: 0570287625
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2115174
Change-Id: I9381f259b1956819177266a2073d711bf6bcb260
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 07:53:07 +00:00
Treehugger Robot
0570287625
Merge changes I0ea498d2,I2d650eb3,I8adcf27e am: 2bec16eda0
am: 4494e0fcfe
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2115174
Change-Id: I29df0438b0286cd08ecf714585d60bf234985321
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 07:38:18 +00:00
Hugh Chen
f5166f46e8
RESTRICT AUTOMERGE Make VPN by Google One always appear in VPN settings
...
Bug: 233559781
Test: manually test
Change-Id: I175ab126ff92f773ab25a1fa64e4262b324fd353
2022-06-06 07:09:06 +00:00
Treehugger Robot
4494e0fcfe
Merge changes I0ea498d2,I2d650eb3,I8adcf27e am: 2bec16eda0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2115174
Change-Id: Ia42f377f4688deb033a87d7ea47e9c4194980517
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 06:52:27 +00:00
Hugh Chen
858e6ff3d5
RESTRICT AUTOMERGE Implement advanced vpn ui in vpn settings
...
Bug: 220684478
Test: atest -c VpnSettingsTest
Change-Id: If89de16d02cb8b1f387b8f388f8fcf82ad39066b
2022-06-06 06:37:26 +00:00
Treehugger Robot
2bec16eda0
Merge changes I0ea498d2,I2d650eb3,I8adcf27e
...
* changes:
Grey out LE audio offload switcher as LE audio isn't enabled/supported
Unify the LE audio string and refine the layout to put LE audio switch together
Add LE Audio feature switcher in the developer option menu
2022-06-06 06:37:11 +00:00
Avinash Vadlamudi
d23aba7042
Fix the Ephemeral guest mode UI bugs
...
- Update the user-icon size to 40dp to align with add-icon size
- Remove the guestInfo preference and add the infoText as the summary for the guestExit preference and fix UserSettingsTest
Bug: 231592331
Test: Manual test, atest SettingsRoboTests
Change-Id: I2591bc19a7b2381d1842f0b28ab8fa19c15c19b8
(cherry picked from commit 9cf1d188a2
)
2022-06-03 10:58:54 +00:00
Tsung-Mao Fang
90968c8437
[DO NOT MERGE] Fix can't change notification sound for work profile.
...
Use correct user id context to query the type,
so we won't get empty result unexpectedly.
If we get the null result, then we won't set sound sucessfully.
Bug: 233580016
Bug: 221041256
Test: Manual test and set work profile sound works.
Change-Id: I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad
Merged-In: I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad
2022-06-02 10:20:38 +08:00
Weng Su
1f0689f73c
Restrict network preferences settings
...
- Show a restriction message if the malware enforces the network preference settings
- Remove settings search index if the network preference settings is restricted
Bug: 231987122
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=ConfigureWifiSettingsTest
Change-Id: I998aa084d47d556d1eeddcec8c6bb5f1d9a8f6e7
2022-06-02 04:50:33 +08:00
Chaohui Wang
6c090486a0
Merge "Clean up DarkUIInfoDialogFragment" into tm-dev am: 9ada0accef
am: 7c74b9ba19
am: c47291950d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18669107
Change-Id: I4d3edbf2d143de3bd7f37203438542389b72fb23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 13:24:00 +00:00
Chaohui Wang
c47291950d
Merge "Clean up DarkUIInfoDialogFragment" into tm-dev am: 9ada0accef
am: 7c74b9ba19
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18669107
Change-Id: I9d987aa0747b3b5079a64623ee187a0398a4e84e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 13:02:56 +00:00
Chaohui Wang
0480f2f311
Merge "Clean up DarkUIInfoDialogFragment" into tm-dev am: 9ada0accef
am: c308cad5c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18669107
Change-Id: If9f224daecaa5a10d250656880f68bab30b8f537
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 13:02:51 +00:00
Chaohui Wang
7c74b9ba19
Merge "Clean up DarkUIInfoDialogFragment" into tm-dev am: 9ada0accef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18669107
Change-Id: I493a08683c8f5ae0998f04fdcb987aead4d3fe5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 12:39:08 +00:00
Chaohui Wang
c308cad5c4
Merge "Clean up DarkUIInfoDialogFragment" into tm-dev am: 9ada0accef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18669107
Change-Id: I2b28f1f5052b553accc273ac356bd47ea832e805
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 12:37:45 +00:00
Chaohui Wang
9ada0accef
Merge "Clean up DarkUIInfoDialogFragment" into tm-dev
2022-06-01 12:24:24 +00:00
Chaohui Wang
7cebd7959d
Merge "Fix flicker in Dark theme" into tm-dev am: 71fe20ea8b
am: 596644171b
am: f34bac0ee6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18659336
Change-Id: I2d90540595b155fd0299725334c6179c6dc2d2ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 03:29:13 +00:00
Chaohui Wang
f34bac0ee6
Merge "Fix flicker in Dark theme" into tm-dev am: 71fe20ea8b
am: 596644171b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18659336
Change-Id: I70b1572efb652df90ddaaa633e34cc8fad0e543b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 03:06:41 +00:00
Chaohui Wang
f519eb1c05
Merge "Fix flicker in Dark theme" into tm-dev am: 71fe20ea8b
am: 596644171b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18659336
Change-Id: Ia5dbd8fa8e67fce3b8d20f6cedbb983e65650650
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 03:06:41 +00:00
Chaohui Wang
596644171b
Merge "Fix flicker in Dark theme" into tm-dev am: 71fe20ea8b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18659336
Change-Id: I9c4aed2bb375a2b8b7836a139b1b01f64d235dce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 02:51:43 +00:00