Ale Nijamkin
b5dda005fd
Merge "Fixes nav stack issue." into udc-dev
2023-06-06 18:48:59 +00:00
Matías Hernández
ff255c6eda
Don't hide approved NLSes in Settings
...
Note that an NLS that shouldn't be approvable (because its name is too long) but was already approved (either before the max length check was introduced, or through other means) will disappear from the list if the user revokes its access. This might be somewhat confusing, but since this is a very-edge case already it's fine.
Bug: 282932362
Test: manual
Change-Id: I4c9faea68e6d16b1a4ec7f472b5433cac1704c06
2023-06-06 19:07:58 +02:00
Alejandro Nijamkin
6f9f3a4594
Fixes nav stack issue.
...
By marking the Intent that's being sent to WPP as "launched from
settings", the code in CustomizationPickerActivity can correctly
conclude that the multi-pane wrapper does not need to be applied to the
intent, preventing the odd "disordering" of the back stack in the bug.
Fix: 284809020
Test: manually verified, on a large screen device with a multi-pane
settings configuration, that going to Display > Lock screen > Shortcuts
and then swiping back off the left edge of the display correctly exits
settings instead of revealing an incorrect screen like it did in the
bug.
Test: also manually verified that the long-press on the home screena and
on the lock screen paths both open the right tab in WPP in settings
correctly.
Change-Id: Iac2b4e9fa5bab91b6a5251f1c51b4d21a0824f00
2023-06-05 16:02:17 -07:00
TreeHugger Robot
565f4b5730
Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0
am: f0503e2a51
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978
Change-Id: I2bc382165446ca91d4662b151174463781ae5c4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 22:21:34 +00:00
TreeHugger Robot
a7b0933819
Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978
Change-Id: Ic495c899a15cfbfaca7edb76f4be6cb79c8f8c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 21:37:08 +00:00
TreeHugger Robot
f0503e2a51
Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978
Change-Id: Ifdc153ead7f9c45046bf5df96b1d44cd576f561b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 21:36:40 +00:00
TreeHugger Robot
25d24e0cf0
Merge "Restrict SimDialogActivity" into udc-dev
2023-06-02 20:41:47 +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
3b13b37028
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: Id0a855210c55cc92571aef6cd3522116403d1aa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 04:25:39 +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
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
2bfdf17d69
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: If657a49c9a84ef7d88eec14453aae016a3e0c005
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 01:23:02 +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
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
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
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
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
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
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
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
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
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
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
tom hsu
97a1fc643e
[Settings] Use background thread to get VoNr state.
...
- TelephonyManager#isVoNrEnabled may not send back the result in time,
so use different thread and timer to prevent ANR.
Bug: 282876876
Test: atest passed
Change-Id: Ie6cc0f8a459f5ebed930e457dacb9b742df70fad
2023-05-25 10:56:03 +08:00
Chaohui Wang
ce56dcc30b
Fix crash of PictureInPicture
...
This follows change I3115cf1b99a305efef192a0dcf3e809eb7903d0a
PackageManager.getPackageInfoAsUser() will throw exceptions when the
package is too large which is a known issue to PackageManager but very
low priority given resourcing constraints. As per the PackageManager
team suggestion, catch the exception on the app side to alleviate the
impact to the PictureInPicture & App info page.
Fix: 283076353
Fix: 283354211
Test: Unit test
Change-Id: Iad2bf9fbfca6ee7f604fec1c4afa1b9382f6ec7e
2023-05-24 19:41:20 +08:00
SongFerng Wang
29c01f1357
Merge "The BluetoothDevicePreference register the MetadataChanged" into udc-dev am: 71a5715e3e
am: 75dd8a0a91
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405361
Change-Id: I00756b8f15758d3c6217114036cf14d9d1eaf3d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 10:36:00 +00:00