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
SongFerng Wang
535a91afff
Merge "The BluetoothDevicePreference register the MetadataChanged" into udc-dev am: 71a5715e3e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405361
Change-Id: I5480462b9262f5d8ee51f23a97d3bde7ab39082c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 10:14:58 +00:00
SongFerng Wang
75dd8a0a91
Merge "The BluetoothDevicePreference register the MetadataChanged" into udc-dev am: 71a5715e3e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405361
Change-Id: I1f0f8264b33b5b826d54da4adca8c2c4409af79b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 10:10:09 +00:00
SongFerngWang
1872151b4f
The BluetoothDevicePreference register the MetadataChanged
...
The bluetooth device preference needs to refresh UI after MetadataChanged
Fix: 282877247
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDevicePreferenceTest
Change-Id: I02cb07a6b255242e4877089ce2f3b7559ce02362
2023-05-24 04:49:41 +00:00
Yuxin Hu
0183cfd816
Fix "Enable ANGLE" switch behavior when Developer Option Switch is off
...
Fix below bugs:
1) When developer option switch is turned off,
"Enable ANGLE" switch is not disabled. Fixed it in
GraphicsDriverEnableAngleAsSystemDriverController::update().
2) When user turns off developer option switch,
a restart is not always mandatory. However, we should ask
user to restart the device is "Enable ANGLE" is forced to
change due to developer option switch turning off.
Fixed it in DevelopmentSettingsDashboardFragment::onSwitchChanged().
3) When user turns off developer option switch and
the reboot dialog pops up, user can dismiss the dialog by
not clicking either POSITIVE_BUTTON or NEGATIVE_BUTTON.
We should enforce user to click the button and disallow the
option to dimiss the dialog by touching screen areas
outside the window's bounds.
Fixed it in DisableDevSettingsDialogFragment.java.
Did a few clean-up and in
GraphicsDriverEnableAngleAsSystemDriverController.java, and updated
unit test to reflect new code behavior.
Bug: b/270994705
Test: m; flash and device can boot.
Test: atest -c GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest
Test: atest GraphicsDriverEnableAngleAsSystemDriverControllerTest
Test: atest SettingsRoboTests:FreeformWindowsPreferenceControllerTest
Test: atest SettingsRoboTests:DesktopModePreferenceControllerTest
Change-Id: I199b2fe59b6ad948b753793254c822a293d8b40d
2023-05-24 01:37:35 +00:00
Lucas Silva
308d4f1e46
Merge "Disable dreams home controls button when disabled on lockscreen." into udc-dev am: 5bce93eb17
am: 2611253691
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23321459
Change-Id: Idf7390468792fca7dd34d53efd964580ec5c4567
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-22 21:47:12 +00:00
Lucas Silva
2611253691
Merge "Disable dreams home controls button when disabled on lockscreen." into udc-dev am: 5bce93eb17
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23321459
Change-Id: I05815946cd5be092dbba4767bb9e855e81060ccd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-22 21:08:59 +00:00
Lucas Silva
975b03405f
Merge "Disable dreams home controls button when disabled on lockscreen." into udc-dev am: 5bce93eb17
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23321459
Change-Id: Ibd8e11b0cd11ff6ecb17a5b71ae8895e850d5b12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-22 21:04:21 +00:00
Lucas Silva
5bce93eb17
Merge "Disable dreams home controls button when disabled on lockscreen." into udc-dev
2023-05-22 20:35:16 +00:00
Behnam Heydarshahi
66dd57ea6e
Merge "Remove volume_separate_notification flag" into udc-dev am: 7aa8424cc0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23244447
Change-Id: Ie146780b807211d786039a5d022d3be8246616e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-22 14:49:15 +00:00
Behnam Heydarshahi
ffbc25e249
Merge "Remove volume_separate_notification flag" into udc-dev am: 7aa8424cc0
am: 2aecb2f1ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23244447
Change-Id: I70ddbb0ecd7a1553a8d07b3ee47c305399edeb58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-22 14:48:56 +00:00
Behnam Heydarshahi
2aecb2f1ea
Merge "Remove volume_separate_notification flag" into udc-dev am: 7aa8424cc0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23244447
Change-Id: I6798c7a2e2020eb1ca4dbe6dbf1cb7ccc50a76b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-22 14:21:55 +00:00
Behnam Heydarshahi
7aa8424cc0
Merge "Remove volume_separate_notification flag" into udc-dev
2023-05-22 14:09:22 +00:00
Lucas Silva
9872f4322b
Disable dreams home controls button when disabled on lockscreen.
...
When home controls are disable on lockscreen, we should also disable
them on dreams.
Bug: 282680621
Test: flashed device, disabled/enabled home controls on lockscreen and
verified that dreams home controls button was hidden/shown correctly
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.dream.DreamHomeControlsPreferenceControllerTest"
Change-Id: I535b079cabc2838e77f3afc74bb8f8730b850653
2023-05-19 11:46:39 -04:00
TreeHugger Robot
1566527a10
Merge "Avoid hotspot band updates when country code is inactive" into udc-dev am: f6c0e2d4dd
am: b381ab48fc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23341837
Change-Id: Ife422b79a3daf07bdc083730d890873340d42f8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-19 08:35:34 +00:00
TreeHugger Robot
6a6b25ae1a
Merge "Avoid hotspot band updates when country code is inactive" into udc-dev am: f6c0e2d4dd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23341837
Change-Id: I851808ff2a967ab1c55b1186fdba7a2badabdb5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-19 08:13:17 +00:00
TreeHugger Robot
b381ab48fc
Merge "Avoid hotspot band updates when country code is inactive" into udc-dev am: f6c0e2d4dd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23341837
Change-Id: Ib085e91a027746460b1d49928e1e40c5ac17d166
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-19 08:12:31 +00:00
TreeHugger Robot
f6c0e2d4dd
Merge "Avoid hotspot band updates when country code is inactive" into udc-dev
2023-05-19 07:40:54 +00:00
Weng Su
8b7e0d7c88
Avoid hotspot band updates when country code is inactive
...
- The SAP usable channels cannot be queried when the country code is not activated, causing UI to display wrong design
Bug: 280554293
Test: Manual test
atest -c WifiHotspotRepositoryTest
Change-Id: I58e8879438d7a630808aa2c4b69f21eb19968ab1
2023-05-19 12:51:50 +08:00
Weng Su
4c1dd91695
Restrict Printing Settings
...
- Don't show Printing Settings if the user is restricted by UserManager.DISALLOW_PRINTING
Bug: 269122009
Test: manual test
atest -c PrintSettingsFragmentTest
Change-Id: I15db778ebc4de3c8a76505043fab1ee02db3f290
2023-05-18 18:40:48 +08:00
Julia Tuttle
7034984e19
Merge "Add FSI toggle to per-app notification settings" into udc-dev am: 28edfb8df9
am: 2474419ac8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899254
Change-Id: I88fe8929dc6cebc76430d1d810b8714c619d94e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 16:33:28 +00:00
Julia Tuttle
2474419ac8
Merge "Add FSI toggle to per-app notification settings" into udc-dev am: 28edfb8df9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899254
Change-Id: I2ec0a0f37d2d25c82da35689c2c4af3efcdc7f9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 15:35:26 +00:00
Julia Tuttle
35dae4aefd
Merge "Add FSI toggle to per-app notification settings" into udc-dev am: 28edfb8df9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899254
Change-Id: Ia5524ccfb7d3eac04f5aa780494f35650824faec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 15:31:12 +00:00
Julia Tuttle
28edfb8df9
Merge "Add FSI toggle to per-app notification settings" into udc-dev
2023-05-17 14:48:50 +00:00
Julia Tuttle
6630c852d9
Add FSI toggle to per-app notification settings
...
Bug: 277938609
Test: atest FullScreenIntentPermissionPreferenceControllerTest
Test: # manual, verifying against "Special app access" screen
Change-Id: I9cb0d9bc99ce59a7b0ff6bcd2cab7a3c2d63f45f
2023-05-17 14:30:49 +00:00
Zoey Chen
dfe8a48cab
Merge "[Regional Preference] Set numbering system when select it" into udc-dev am: 74ab90bb53
am: 9752a7be52
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23258700
Change-Id: Ie95a9350cc910aba431e4803b16f063fc32ac8fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 11:21:05 +00:00
Zoey Chen
9752a7be52
Merge "[Regional Preference] Set numbering system when select it" into udc-dev am: 74ab90bb53
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23258700
Change-Id: I5d3cda5ac33f624a54ae3c1535575c7b56793e62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 10:43:04 +00:00
Zoey Chen
3ea5aa92d8
Merge "[Regional Preference] Set numbering system when select it" into udc-dev am: 74ab90bb53
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23258700
Change-Id: I359dba215d9ea74e39b528e041c34a2a90d18d05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 10:38:45 +00:00
Zoey Chen
74ab90bb53
Merge "[Regional Preference] Set numbering system when select it" into udc-dev
2023-05-17 09:44:45 +00:00
Zoey Chen
14c81c17ce
[Regional Preference] Set numbering system when select it
...
Should not return original locale, return the locale which is set unicodeLocaleKeyword instead
Bug: 282879594
Bug: 283036197
Test: atest NumberingSystemItemControllerTest
Change-Id: Ic572f20175ea0428be98f30fe865d826b61dcca6
2023-05-17 05:47:53 +00:00
Yanli Wan
98c03bb946
Merge "Start activity from Device Lock APEX if device is provisioned by Device Lock" into udc-dev am: f5ce620937
am: 433d934b89
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23087508
Change-Id: I96a6dfc9fa2697965d3fb1eb1187645283b31fdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 00:21:51 +00:00
Yanli Wan
29a97efcf9
Merge "Start activity from Device Lock APEX if device is provisioned by Device Lock" into udc-dev am: f5ce620937
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23087508
Change-Id: I4e11dc29b4e12e42de3cb55452902224a771c3f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 00:19:01 +00:00
Yanli Wan
433d934b89
Merge "Start activity from Device Lock APEX if device is provisioned by Device Lock" into udc-dev am: f5ce620937
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23087508
Change-Id: I05e673c9f6e1db8aabef3a66e9f8c569e96e5850
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 23:57:53 +00:00
Yanli Wan
f5ce620937
Merge "Start activity from Device Lock APEX if device is provisioned by Device Lock" into udc-dev
2023-05-16 23:47:46 +00:00
Yuxin Hu
f28b2b4b83
Merge "Toggle switch back when user dismisses dialog by tapping screen" into udc-dev am: 174bd2ab74
am: 0b7a88282d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23220112
Change-Id: Iaa26c0dc435ab9b6f32daa9ce49f88234f349162
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 20:08:07 +00:00
Yuxin Hu
9fcd85c5f8
Merge "Toggle switch back when user dismisses dialog by tapping screen" into udc-dev am: 174bd2ab74
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23220112
Change-Id: I6fcae10eabb687454e4611cd29087917c781048e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 19:05:13 +00:00
Yuxin Hu
0b7a88282d
Merge "Toggle switch back when user dismisses dialog by tapping screen" into udc-dev am: 174bd2ab74
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23220112
Change-Id: I211c5ae0aa764a885957573622af13be0e288206
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 19:04:08 +00:00