Commit Graph

50158 Commits

Author SHA1 Message Date
Treehugger Robot
3943e14eff Merge "Fix do not disturb bypass user restriction" into main 2023-07-10 02:44:53 +00:00
Treehugger Robot
6a12444366 Merge "Restrict ApnEditor settings" into main 2023-07-07 13:50:42 +00:00
Mill Chen
45d9e390b2 Fix do not disturb bypass user restriction
Do not disturb search result can still switch on/off when users are
restricted by DISALLOW_ADJUST_VOLUME. The DND search result is presented
by slice and there was no user restriction check when creating DND
slice, which caused DND search result can access. To prevent DND from
being access if user restriction is enabled, adding user restriction
check during creating the DND slice.

Bug: 242846154
Test: robotest pass and manual test
Change-Id: I897a99e9dda2f9f84365d96841a4c4f4cf975331
2023-07-07 20:25:18 +08:00
Treehugger Robot
89889d73d4 Merge "Do not show LE audio toggle in Device Detail by default" into udc-d1-dev am: 1f9f114495 am: 20b82c3646 am: 07678daaf7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23898723

Change-Id: I8d284b59c2d74a91e58d1e47eddc86f16ea5ed49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 12:05:39 +00:00
Weng Su
4e18e7414c Restrict ApnEditor settings
- Finish ApnEditor settings if user is not an admin

- Finish ApnEditor settings if user has DISALLOW_CONFIG_MOBILE_NETWORKS restriction

Bug: 279902472
Test: manual test
atest -c ApnEditorTest

Change-Id: Iecdbbff7e21dfb11e3ba385858747a220cfd3e04
2023-07-07 20:01:04 +08:00
Treehugger Robot
07678daaf7 Merge "Do not show LE audio toggle in Device Detail by default" into udc-d1-dev am: 1f9f114495 am: 20b82c3646
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23898723

Change-Id: I302b91cd8502cca57a28e74cbbf72cf962d6468f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 11:21:28 +00:00
Treehugger Robot
20b82c3646 Merge "Do not show LE audio toggle in Device Detail by default" into udc-d1-dev am: 1f9f114495
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23898723

Change-Id: I3536f29c771b9233790e6852ab6dc4cb0b58b531
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 10:38:02 +00:00
Treehugger Robot
1f9f114495 Merge "Do not show LE audio toggle in Device Detail by default" into udc-d1-dev 2023-07-07 10:02:51 +00:00
Hao Dong
069c7ec1a9 Merge "Add super call in FingerprintEnrollEnrolling onConfigurationChanged." into udc-qpr-dev am: bee02bbbe7 am: d4f621f613
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23881042

Change-Id: I62010625ecb3be7b3d6d76c79b0f051cc91a2357
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 20:18:47 +00:00
Hao Dong
d4f621f613 Merge "Add super call in FingerprintEnrollEnrolling onConfigurationChanged." into udc-qpr-dev am: bee02bbbe7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23881042

Change-Id: I8a065cfc1717fbc5036573c8c46cb8eee01c0e4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 19:40:14 +00:00
Hao Dong
bee02bbbe7 Merge "Add super call in FingerprintEnrollEnrolling onConfigurationChanged." into udc-qpr-dev 2023-07-06 18:45:27 +00:00
Chun-Ku Lin
79ffa2a45f Merge "use L10n-friendly runtime number formatting based on locale" into main 2023-07-06 17:09:25 +00:00
Tetiana Meronyk
de9efe778b Merge "Fix "Allow guest to use telephony" toggle not updating its value" into udc-qpr-dev am: 8141b10269 am: 70bdc38d4a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23899169

Change-Id: Ifccee75d893bba0de3814a18b68eb0f32d6d0da6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 14:41:45 +00:00
Tetiana Meronyk
70bdc38d4a Merge "Fix "Allow guest to use telephony" toggle not updating its value" into udc-qpr-dev am: 8141b10269
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23899169

Change-Id: I44ca0e373d432ab38e8a3fe8a19a4676ca31a771
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 14:01:26 +00:00
Tetiana Meronyk
8141b10269 Merge "Fix "Allow guest to use telephony" toggle not updating its value" into udc-qpr-dev 2023-07-06 13:17:36 +00:00
Treehugger Robot
b3b27451a3 Merge "Make wifi calling slice consistent" into main 2023-07-06 05:45:18 +00:00
Treehugger Robot
e761690e08 Merge "Clean up assist gesture from Settings" into main 2023-07-06 05:42:20 +00:00
Quang Luong
42f6baa67a Merge "Use speed string from WifiEntry" into udc-qpr-dev am: 062c4b634d am: e90bb0aedc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23783053

Change-Id: Ia136e2a699a32d55a7566bc8143ed7396e848326
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 03:08:39 +00:00
Mill Chen
fbe8e9f571 Make wifi calling slice consistent
The wifi calling search result is grayed out if it is not using
carrier WFC. In order to ensure the search result is aligned with the
corresponding settings, the checker of wifi calling slice will be the
same with wifi calling preference.

Bug: 285594611
Test: manual test
Change-Id: I22d794332a0cc2ecbcb8b5e8836364e926400cbf
2023-07-06 02:41:02 +00:00
Quang Luong
e90bb0aedc Merge "Use speed string from WifiEntry" into udc-qpr-dev am: 062c4b634d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23783053

Change-Id: Ica238c0140af95a1fc3a42a6ded4838bd03d7412
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 02:28:36 +00:00
Quang Luong
062c4b634d Merge "Use speed string from WifiEntry" into udc-qpr-dev 2023-07-06 01:49:56 +00:00
Michael Mikhail
1db4bc3676 Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563 am: 7c53d299a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044

Change-Id: I95fc65d5a3fd0ef2962742769927deacfd92620d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05 16:29:52 +00:00
Michael Mikhail
7c53d299a2 Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044

Change-Id: I978498d9acbb734534bf2ad1dad7e5cfb2434237
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05 15:51:23 +00:00
Chaohui Wang
8c37af5ed1 Merge "Use DataUsageLib in DataUsagePreferenceController" 2023-07-05 15:24:45 +00:00
Michael Mikhail
83c13d6563 Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev
* changes:
  Trigger talkback for notification volume change
  Add content description to volume title in settings.
2023-07-05 15:11:09 +00:00
Jason Chiu
8ecbe486f8 Merge "Do not finish activity when the input account doesn't exist" 2023-07-05 07:15:22 +00:00
Patty Huang
627a584f39 Do not show LE audio toggle in Device Detail by default
Bug: 289884263
Bug: 289957406

Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioDeviceDetailsPreferenceControllerTest
Test: Checks the LE Audio toggle is not shown in Device Detail by default
Change-Id: I2c6430c791dd852d238d7122a72f218f395c4a0b
2023-07-05 11:51:50 +08:00
Chaohui Wang
225af2b43f Merge "Remove context from getSupportFeatureProvider" 2023-07-05 03:37:55 +00:00
Tetiana Meronyk
b88bad678d Fix "Allow guest to use telephony" toggle not updating its value
Bug: 283004333
Test: atest GuestTelephonyPreferenceControllerTest
Change-Id: I2f13a989bbe6a925c0e88350dbc215f6f188fe17
2023-07-04 15:32:14 +00:00
Chaohui Wang
77fd6aa117 Use DataUsageLib in DataUsagePreferenceController
DataUsagePreferenceController use DataUsageLib before, and DataUsageLib
and com.android.settingslib.net.DataUsageUtils has same functionality.

com.android.settingslib.net.DataUsageUtils will be clean up, so use
DataUsageLib again.

Bug: 286082055
Test: m Settings
Change-Id: I6227f973ec38e5b0520f54a41ac2ede2929a1bcc
2023-07-04 19:08:46 +08:00
Chaohui Wang
47ff48b831 Fix DataUsagePreferenceController ANR am: d42cc8e5e2 am: eb8948e309 am: e76ff6ffa5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23896225

Change-Id: I2b24b59f1d0bcd2b02359128d474f36a74eb367e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-04 10:28:19 +00:00
Chaohui Wang
e76ff6ffa5 Fix DataUsagePreferenceController ANR am: d42cc8e5e2 am: eb8948e309
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23896225

Change-Id: I3e6b70cb33a51348b9504226787de2e149af5870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-04 09:41:58 +00:00
Jason Chiu
e01a9b6039 Do not finish activity when the input account doesn't exist
This is to avoid the caller getting the existing account list because
the prompt respond reveals that the input account does not exist.

Bug: 249981091
Test: robotest
Change-Id: I4bb8ecead8233780443b1cd1a8780983b7e4d5de
2023-07-04 17:31:13 +08:00
Chaohui Wang
a51e013746 Fix DataUsagePreferenceController ANR am: d42cc8e5e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23896225

Change-Id: Ia0463b25a848a1b65f10bfb3950b7875bc3498b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-04 09:03:56 +00:00
Chaohui Wang
eb8948e309 Fix DataUsagePreferenceController ANR am: d42cc8e5e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23896225

Change-Id: I6893681f93746af66e6566d2a642c2e1a93aef51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-04 08:59:57 +00:00
Chaohui Wang
da796d80f1 Remove context from getSupportFeatureProvider
Bug: 286764889
Test: m Settings
Change-Id: I5635c7a809fd24d59da377993c7d1435d0c839e3
2023-07-04 13:22:48 +08:00
Daniel Huang
47262484c9 Merge "Log metrics for PK settings topics" into udc-qpr-dev am: 114d068fbb am: 0b95f9562a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23593768

Change-Id: I2bf912114ace589032df9d08b4d11e57be1a736e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-04 04:10:38 +00:00
Chaohui Wang
d42cc8e5e2 Fix DataUsagePreferenceController ANR
Offload calculation work from main thread to fix.

Fix: 286082055
Test: manual - on Mobile Settings page
Test: unit test
Change-Id: I7865823d6af2c812afa35d047bd79b60ae4b0fb7
2023-07-04 12:06:53 +08:00
Daniel Huang
0b95f9562a Merge "Log metrics for PK settings topics" into udc-qpr-dev am: 114d068fbb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23593768

Change-Id: I6360dd0b9ced21331d5e04a54ef91b7612d35c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-04 03:29:21 +00:00
Daniel Huang
114d068fbb Merge "Log metrics for PK settings topics" into udc-qpr-dev 2023-07-04 02:26:13 +00:00
Chaohui Wang
778c2dc3d5 Remove context from applicationFeatureProvider
ApplicationFeatureProvider is created by using application context,
no need pass context in when get.

Bug: 286764889
Test: m Settings
Change-Id: I7f8dfe5716b7b55e0ff984f7603875d7896e2313
2023-07-03 13:54:26 +08:00
Hao Dong
fefda226f7 Add super call in FingerprintEnrollEnrolling onConfigurationChanged.
Test: N/A - fix a crash
Bug: 289458339

Change-Id: Id34b1036fe12079b14cd3aaa0a85eecc138e6b17
2023-06-30 21:29:07 +00:00
Yuyang Huang
de771725c4 Merge "Enable/Disable ASHA profile with LE audio toggle" 2023-06-30 18:16:28 +00:00
Allen Su
477102b991 Merge "[Panlingual]Log metrics for App's locale from the suggested" into udc-qpr-dev am: 5d207a7b4b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23832124

Change-Id: Ied97c0d79cbea42830b43b6a2240ac9e5b376f0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 16:41:03 +00:00
Treehugger Robot
b57e265116 Merge "Check P2P channel before requesting network info" into udc-qpr-dev am: dc98948cc1 am: fedd6b35a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23869864

Change-Id: I96bde9d35a3299555fafbbcffefe5722b99d5787
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 16:18:52 +00:00
Allen Su
5d207a7b4b Merge "[Panlingual]Log metrics for App's locale from the suggested" into udc-qpr-dev 2023-06-30 16:08:25 +00:00
Treehugger Robot
fedd6b35a4 Merge "Check P2P channel before requesting network info" into udc-qpr-dev am: dc98948cc1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23869864

Change-Id: I661f8298b34ef531038006e4881b7caf984bd4d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 15:36:49 +00:00
Treehugger Robot
dc98948cc1 Merge "Check P2P channel before requesting network info" into udc-qpr-dev 2023-06-30 14:48:12 +00:00
Michael Mikhail
48faaab788 Merge changes from topic "cherrypick-volume-gar-chain-" into udc-qpr-dev am: c156b6c427 am: 0d1b67b73e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830401

Change-Id: I5793b74a6737ad920bbdf1dd49667adf231b2e5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 14:34:07 +00:00
Michael Mikhail
0d1b67b73e Merge changes from topic "cherrypick-volume-gar-chain-" into udc-qpr-dev am: c156b6c427
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830401

Change-Id: Ied51926e720f598bceb21bae336d77d4313b6724
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 13:52:36 +00:00