Jason Chiu
ed07da032a
Revert "Do not show the redundant RemoveAccountFailureDialog" am: 7f1ff1b796 am: 4ec1953a82 am: 80f4582723
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802568
Change-Id: I64e5ba41e0bb3deec4607b6642e0f640a8e29f8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 03:05:58 +00:00
Jason Chiu
80f4582723
Revert "Do not show the redundant RemoveAccountFailureDialog" am: 7f1ff1b796 am: 4ec1953a82
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802568
Change-Id: I46c865b8c61b359254ea8e971c26b0faf09a8dcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 02:51:11 +00:00
Jason Chiu
4ec1953a82
Revert "Do not show the redundant RemoveAccountFailureDialog" am: 7f1ff1b796
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802568
Change-Id: Idf47ad68dd184cf45ce467eeb6be12a30e8c3057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 02:34:59 +00:00
Joshua Mccloskey
71ca81a039
Merge "Clear FP error only on progress." into tm-qpr-dev am: 6947d508e8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18721503
Change-Id: Ie7ca8f13d8f644ea03ff90a5c5a05f41f4536a84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 16:09:38 +00:00
Joshua Mccloskey
0295bc2285
Merge "Add functionality to restart fp enrollment." into tm-qpr-dev am: 81224f09e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18788040
Change-Id: I0188ab24c487cc569645d1b07dbb25c94024df4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 16:09:27 +00:00
Joshua Mccloskey
6947d508e8
Merge "Clear FP error only on progress." into tm-qpr-dev
2022-06-09 15:58:45 +00:00
Joshua Mccloskey
81224f09e3
Merge "Add functionality to restart fp enrollment." into tm-qpr-dev
2022-06-09 15:37:53 +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
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
Jason Chiu
7f1ff1b796
Revert "Do not show the redundant RemoveAccountFailureDialog"
...
This reverts commit e5f1d24913 .
Reason for revert: "Remove account" does nothing and shows no errors
Fix: 232819214
Change-Id: I4a4e5084cde87ea2a9e5be1ff3ca6709e11ebc3d
2022-06-09 08:14:13 +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
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
SongFerngWang
04e6e54503
[Setting crash] The dialog is null am: 8514ff65eb am: c69ee75a64 am: d581334f58
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18792471
Change-Id: I6e2dc8f7459b56e7da7e839eeb8155787e8fabfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 02:58:51 +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
SongFerngWang
d581334f58
[Setting crash] The dialog is null am: 8514ff65eb am: c69ee75a64
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18792471
Change-Id: Iba704f625707a2eb9e6ae90f648ce335c9201e2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 02:42:49 +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
SongFerngWang
c69ee75a64
[Setting crash] The dialog is null am: 8514ff65eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18792471
Change-Id: Ib697f1fddcb8b77b36d2dc95cfa34331ded9bf14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-09 02:06:56 +00:00
SongFerng Wang
be1b37ae2b
Merge "Unable to enable the removable esim" into tm-dev
2022-06-09 01:30:44 +00:00
Joshua McCloskey
548f6f36c1
Add functionality to restart fp enrollment.
...
Test: Tested manually via SUW that restarting enrollment works
as expected.
Test: Tested manually via settings that restarting enrollment
works as expected.
Fixes: 234887288
Change-Id: I815392269da786d2dfd157267919a09281af6277
2022-06-08 21:00:59 +00:00
SongFerngWang
8514ff65eb
[Setting crash] The dialog is null
...
Add the null protection.
Bug: 235267673
Test: build pass
Change-Id: Ib9308d152ddc233354d89166b8d79fcec81d8c19
2022-06-08 08:32:05 +00: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
Edgar Wang
94a7906033
Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f am: 47b4c86524 am: 7ab5a44498
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509
Change-Id: I957fd8fde3ae1865148de0fdd7c6d32b9bb79217
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 05:12:17 +00:00
Edgar Wang
7ab5a44498
Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f am: 47b4c86524
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509
Change-Id: I3d2bdadb80d2a1189e8e7e69d883ac2f4763bbd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 04:58:36 +00:00
Edgar Wang
47b4c86524
Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509
Change-Id: I0f6f87246effdc808b77726a0519d4b063ef4fba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 04:41:48 +00:00
Edgar Wang
1f6334825f
Merge "Recalculate view's height when tab is selected" into tm-dev
2022-06-07 04:17:39 +00:00
TreeHugger Robot
303c6f3cac
Merge changes I0ea498d2,I2d650eb3,I8adcf27e into tm-d1-dev am: 671c65235c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18740333
Change-Id: I30105608cf552ec60582cb296179b9cd94b6d66b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 04:00:25 +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
b51ae97810
Grey out LE audio offload switcher as LE audio isn't enabled/supported
...
Screenshot: https://screenshot.googleplex.com/C6pRBzLh7CtNeXr
Bug: 233018305
Bug: 233005340
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioHwOffloadPreferenceControllerTest
Change-Id: I0ea498d2fa191f9b9352b37500a5d2c348b36ce0
Merged-In: I0ea498d2fa191f9b9352b37500a5d2c348b36ce0
(cherry picked from commit f71b2ea56e )
2022-06-07 09:43:08 +08: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
Avinash Vadlamudi
5bf8cd7a09
Rename method for better readability
...
- Rename encircle to encircleUserIcon for proper readability
Bug: 231592331
Test: build, manual check
Change-Id: If9e829372834d8a5f43e4cce358e8c0975fa30eb
(cherry picked from commit 1b7e411315 )
2022-06-06 10:03:05 +00: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
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
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
Joshua McCloskey
28c0d90491
Clear FP error only on progress.
...
Test: Manually verified progress is cleared only
when the user makes progress on fp enrollment.
Fixes: 234094887
Change-Id: I173d2edb94132a4f68e0ef90aa9fa8008a25236f
2022-06-03 19:07:07 +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
Alice Kuo
f71b2ea56e
Grey out LE audio offload switcher as LE audio isn't enabled/supported
...
Screenshot: https://screenshot.googleplex.com/C6pRBzLh7CtNeXr
Bug: 233018305
Bug: 233005340
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioHwOffloadPreferenceControllerTest
Change-Id: I0ea498d2fa191f9b9352b37500a5d2c348b36ce0
2022-06-03 11:53:33 +08:00
Lin Yuan
1577081f44
Merge "Fix: policy enforcement for location wifi scanning" into tm-dev am: 6ffe64a0a9 am: 86c609fc27 am: d207ad5b48
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670858
Change-Id: I416b58f263fbef13f71cf26905d4fdd27d1b5f53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 21:14:53 +00:00
Lin Yuan
d207ad5b48
Merge "Fix: policy enforcement for location wifi scanning" into tm-dev am: 6ffe64a0a9 am: 86c609fc27
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670858
Change-Id: I8f27d54b9b621968ad7e09916a42d028473cb68f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 20:53:24 +00:00
Lin Yuan
3a5519c641
Merge "Fix: policy enforcement for location wifi scanning" into tm-dev am: 6ffe64a0a9 am: 86c609fc27
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670858
Change-Id: I6781439a7517adeaaddbc0b8d22fbd74c4f984aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 20:53:05 +00:00
Lin Yuan
86c609fc27
Merge "Fix: policy enforcement for location wifi scanning" into tm-dev am: 6ffe64a0a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670858
Change-Id: Id0b3a441f5b7cad917f73076a57c15d775496862
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 20:35:01 +00:00