TreeHugger Robot
f38e8e6194
Merge "RESTRICT AUTOMERGE Implement advanced vpn ui in vpn settings" into tm-qpr-dev
2022-07-11 22:50:58 +00:00
ykhung
764d513d00
Support multi-user privacy for battery usage chart
...
When there are multiple accounts in the devices, the battery usage list
is shared in the current design. We will aggregate other users usage
data into a single item to support multi-user privacy requirements
Screenshot: https://screenshot.googleplex.com/AkFTUtNvnoxcuGR
Bug: 202119550
Test: make RunSettingsRoboTests
Change-Id: I6cb55f0d50a4caca83212a0a54410530a032c089
2022-07-12 00:17:43 +08:00
Weng Su
be23c28ff2
Prevent leaking Wi-Fi dialog on lock screen
...
- The Wi-Fi dialog is designed to be displayed on the system UI
- Dismiss Wi-Fi dialog to prevent leaking user data on lock screen
Bug: 231583603
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDialogActivityTest
Change-Id: Ie67ff1138ffeddd3e358331d8cef61e0629173e2
2022-07-08 05:43:10 +08:00
TreeHugger Robot
7bdfb34b7b
Merge "Ignore CRLF strings in display SSIDs to avoid display errors" into tm-qpr-dev am: 9447ec6d81
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19168028
Change-Id: I37125c165dbb9d48d672666512faec8248bce5d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-06 19:49:52 +00:00
Weng Su
08adf4c2ed
Ignore CRLF strings in display SSIDs to avoid display errors
...
- Keep user-entered SSIDs in Wi-Fi Configuration
- Ignore CRLF strings in display SSIDs only
Bug: 224545390
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=AddAppNetworksFragmentTest
Change-Id: Ifc081f9c5c02b2d70412f296688b88e44e893add
2022-07-05 03:18:26 +08:00
Xin Li
b8d6e73355
Merge tm-dev-plus-aosp-without-vendor@8763363
...
Bug: 236760014
Merged-In: Ifcb9d4c564839199d998bd503f390f021c6bf3ad
Change-Id: I9d69bcbc6916176beece2616f152ebd3d74fc0f8
2022-06-28 21:23:28 +00:00
SongFerng Wang
f0973dfa33
Merge changes from topic "cherrypick-LE_summary_active-smt2rklmox" am: e27d1790f8 am: 2225b7058b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2138453
Change-Id: Iecbe5647bbe469a0239b594692f66c0226e16df8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 11:45:09 +00:00
SongFerngWang
7c173b36f8
The UI only shows the active LE device am: 7f6fcce1d5 am: 787a0e0249
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2138452
Change-Id: I6e57db85b4d10586d111e39dcd7ee77e67fd9d74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 11:45:05 +00:00
SongFerngWang
30a312975c
Fix the testcase error
...
The BluetoothDeviceUdater added the checking whether the item is in the
list. It caused this testcase failed.
Add more mocks for this testcase.
Bug: 237223797
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDevicesSliceTest
Change-Id: Idb746e42480f99846efb5d1e4d4a411a5a9ca296
Merged-In: Idb746e42480f99846efb5d1e4d4a411a5a9ca296
2022-06-28 15:18:39 +08:00
SongFerngWang
7f6fcce1d5
The UI only shows the active LE device
...
At the media device, it only shows the active LE device which is
connected.
Bug: 232892046
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AvailableMediaBluetoothDeviceUpdaterTest
make RunSettingsRoboTests ROBOTEST_FILTER=ConnectedBluetoothDeviceUpdaterTest
make RunSettingsRoboTests ROBOTEST_FILTER=SavedBluetoothDeviceUpdaterTest
Change-Id: Iac661206def4d43bc40ab9bb1938f084926899c2
Merged-In: Iac661206def4d43bc40ab9bb1938f084926899c2
2022-06-28 15:03:07 +08:00
SongFerng Wang
8a00f325f4
Merge "Fix the testcase error" into tm-d1-dev am: 602fe375d9 am: c150fe528d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19083766
Change-Id: Icfcdf386740d4ad79d45923a9a0fce5c4306a5e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 06:35:52 +00:00
SongFerng Wang
2bcd1f3897
Merge "Fix the testcase error" into tm-d1-dev am: 602fe375d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19083766
Change-Id: Ic44ab60d81ed96478ace362f50df8919fcfa52cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 06:20:38 +00:00
SongFerng Wang
c150fe528d
Merge "Fix the testcase error" into tm-d1-dev am: 602fe375d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19083766
Change-Id: I2e79ea4100840627a21bd8797c9f1875b09c9161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 06:20:37 +00:00
SongFerng Wang
602fe375d9
Merge "Fix the testcase error" into tm-d1-dev
2022-06-28 05:57:21 +00:00
SongFerngWang
cefad1e4b7
Fix the testcase error
...
The BluetoothDeviceUdater added the checking whether the item is in the
list. It caused this testcase failed.
Add more mocks for this testcase.
Bug: 237223797
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDevicesSliceTest
Change-Id: Idb746e42480f99846efb5d1e4d4a411a5a9ca296
2022-06-27 20:42:31 +08:00
SongFerng Wang
6293d2a103
Merge "The UI only shows the active LE device" into tm-d1-dev am: dc72a4a14f am: 0018589f09
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18910989
Change-Id: Ifb31acb46471b17244ad806986be4ba6c0bed56b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-26 17:24:01 +00:00
SongFerng Wang
7b3320804e
Merge "The UI only shows the active LE device" into tm-d1-dev am: dc72a4a14f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18910989
Change-Id: I8aa0a982af28ba1a4f8386027ce0382d6b582bbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-26 17:02:19 +00:00
SongFerng Wang
0018589f09
Merge "The UI only shows the active LE device" into tm-d1-dev am: dc72a4a14f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18910989
Change-Id: I43380dd3e84f63925c494038f9bb1c84207f2faa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-26 17:02:16 +00:00
SongFerng Wang
dc72a4a14f
Merge "The UI only shows the active LE device" into tm-d1-dev
2022-06-26 16:38:24 +00:00
Evan Chen
fc86787927
Merge "Update AssociationIno creation for Bluetooth test" into tm-qpr-dev am: bd2b5e7bfb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18744660
Change-Id: I45cdf05096add05a6702a703fc9287f0237bb8c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 04:52:37 +00:00
Evan Chen
bd2b5e7bfb
Merge "Update AssociationIno creation for Bluetooth test" into tm-qpr-dev
2022-06-24 04:25:49 +00:00
Oriol Prieto Gascó
7e7df0d9b5
Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: d6166e42a0 am: 0dfc94f668 am: 95d32d678c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18981799
Change-Id: Idae7664b658f8057b30b9bcc50379d0cb11845fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 18:38:06 +00:00
Oriol Prieto Gascó
95d32d678c
Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: d6166e42a0 am: 0dfc94f668
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18981799
Change-Id: I94c1735bc1da2157654340fb809b0e7f273a804b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 18:12:29 +00:00
Oriol Prieto Gascó
50911db0c3
Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: d6166e42a0 am: 10e5657a39
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18981799
Change-Id: Ia608719d3aa47159c80dd303bcc11360c000ee0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 18:02:01 +00:00
Oriol Prieto Gascó
0dfc94f668
Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: d6166e42a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18981799
Change-Id: I0af1ada1c42fe907243bcde356f51d8302bfb5c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 17:45:17 +00:00
Oriol Prieto Gascó
10e5657a39
Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: d6166e42a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18981799
Change-Id: I7fcfd55573d121122867893a5624c297a1f18653
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 17:43:23 +00:00
TreeHugger Robot
3997ccc2ee
Merge "Restrict AddAppNetworksActivity for guest user" into tm-qpr-dev am: 2d0e1dc725
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18910990
Change-Id: Iac11c8a9834528d81cb757a85a5bcaed7c8b8035
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-21 17:06:42 +00:00
TreeHugger Robot
2d0e1dc725
Merge "Restrict AddAppNetworksActivity for guest user" into tm-qpr-dev
2022-06-21 17:04:33 +00:00
SongFerngWang
6426382e90
The UI only shows the active LE device
...
At the media device, it only shows the active LE device which is
connected.
Bug: 232892046
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AvailableMediaBluetoothDeviceUpdaterTest
make RunSettingsRoboTests ROBOTEST_FILTER=ConnectedBluetoothDeviceUpdaterTest
make RunSettingsRoboTests ROBOTEST_FILTER=SavedBluetoothDeviceUpdaterTest
Change-Id: Iac661206def4d43bc40ab9bb1938f084926899c2
2022-06-20 21:30:34 +08:00
Zaiyue Xue
6470ada117
Merge "Move battery usage files to a separate folder." into tm-qpr-dev am: 3b7953eac2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18797446
Change-Id: I3e0ae9d1922b8d6f55721ec3357d529a58a56dc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-20 09:32:47 +00:00
Zaiyue Xue
3b7953eac2
Merge "Move battery usage files to a separate folder." into tm-qpr-dev
2022-06-20 09:12:04 +00:00
Oriol Prieto Gasco
f528e7de49
Use com.android.bluetooth as the BT stack APK
...
Test: TH
Bug: 236187653, 236192423
Change-Id: Ia86d195780a4994607b5533420cb72bd458d4f9a
2022-06-19 23:06:06 +00:00
xuezaiyue
ac7318419a
Move battery usage files to a separate folder.
...
Bug: 202118250
Test: presubmit
Change-Id: I21aa58ebc02327849ed2161dbbafcdc806c007f2
2022-06-19 05:59:35 +00:00
Weng Su
cf7d2ef87c
Merge "Restrict WifiSlice functionality for guest user" into tm-qpr-dev am: 1c25ce1937
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802566
Change-Id: Iaa2b5a26a3ee2b8490e116c5148a371651d32ee4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 16:54:00 +00:00
Weng Su
1c25ce1937
Merge "Restrict WifiSlice functionality for guest user" into tm-qpr-dev
2022-06-15 16:40:03 +00:00
TreeHugger Robot
6da32e8c5c
Merge "Restrict guest user to configure WiFi by QR code" into tm-qpr-dev am: cc0754b416
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869535
Change-Id: Ic0544cd42cf28b12f8ae470c67363b8683aec6b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 16:34:21 +00:00
Weng Su
f53f3e6e41
Restrict AddAppNetworksActivity for guest user
...
- Don't show AddAppNetworksActivity if the user is a guest.
Bug: 224772678
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=AddAppNetworksActivityTest
Change-Id: I17571905f1c4a38db884e6d0523b7f8d668df607
2022-06-16 00:33:07 +08: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
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
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