Chris Göllner
7477fccd0a
Add foldable related controllers to exempt_slice_controller_not_in_xml
...
These controllers cannot be added in XML, as we don't know at compile
time how many there will be.
Fixes: 289967395
Test: N/A
Change-Id: I5b0f6e38937aa6c7d96ac88b6d4cd46c39323ce2
2023-07-07 10:13:15 +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
Chaohui Wang
8c37af5ed1
Merge "Use DataUsageLib in DataUsagePreferenceController"
2023-07-05 15:24:45 +00:00
Treehugger Robot
bc47f1aac5
Merge "Fix test case failure." into udc-qpr-dev am: b2f436f310
am: 721efc0ed5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23902483
Change-Id: I504ea6842af716ef73468b7e7789c983f5e3a540
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 10:17:37 +00:00
Treehugger Robot
721efc0ed5
Merge "Fix test case failure." into udc-qpr-dev am: b2f436f310
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23902483
Change-Id: I7e3bcef9a4dc00d76c934ce2c55759089179f99a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 09:35:31 +00:00
Treehugger Robot
b2f436f310
Merge "Fix test case failure." into udc-qpr-dev
2023-07-05 08:44:06 +00:00
Yi-Ling Chuang
434a04b32c
Fix test case failure.
...
Fix the test failure of BatterySettingsFeatureProviderImplTest. The
actual method call can't be passed with an argument matcher. Use the
real object instead.
Fixes: 289737082
Test: robotests
Change-Id: Ia48e7b67ba94a8bb67ac1d26c502894a664c2b70
2023-07-05 15:43:34 +08:00
Jason Chiu
8ecbe486f8
Merge "Do not finish activity when the input account doesn't exist"
2023-07-05 07:15:22 +00: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
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
Michael Mikhail
c156b6c427
Merge changes from topic "cherrypick-volume-gar-chain-" into udc-qpr-dev
...
* changes:
Trigger talkback for notification volume change
Add content description to volume title in settings.
2023-06-30 12:56:45 +00:00
Treehugger Robot
90325d87cb
Merge "[Settings] Fix inactive SIM show display name with subectiption id." into udc-qpr-dev am: 369a1097c8
am: 063ba027f7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23844846
Change-Id: Idbedec3b88650b6a64c944bc6d62d2c1124dbb7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-30 08:15:39 +00:00
Treehugger Robot
063ba027f7
Merge "[Settings] Fix inactive SIM show display name with subectiption id." into udc-qpr-dev am: 369a1097c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23844846
Change-Id: Icbb09dc1917780104f35e797bffd5b2c51f6ec5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-30 07:34:05 +00:00
tom hsu
0b3da89a91
[Settings] Fix inactive SIM show display name with subectiption id.
...
- Cached active SIM' display name with last 4 digits phone number to
avoid that this active SIM change to inactive SIM then show the
display name with subscription id.
Bug: 271567615
Test: Manual test passed
Test: atest passed
Change-Id: I119d60ab4e92b1f04fb42f96df10bc81aa378a7c
2023-06-30 05:51:40 +00:00
Quang Anh Luong
36d71f8785
Check P2P channel before requesting network info
...
WifiP2pSettings requests network info from WifiP2pManager whenever it
gets onDeviceInfoAvailable, but sChannel may be null causing an
IllegalArgumentException. Check that sChannel is not null before
requesting network info.
Bug: 289004627
Test: atest WifiP2pSettingsTest
Change-Id: Ied8c3f8a894683d7b8e368e5c52343adb7d05e4b
2023-06-30 12:21:30 +09:00
Hao Dong
b911186928
Merge "Fix pattern rotation header text." into udc-d1-dev am: 04b1932b25
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23833033
Change-Id: Icf5479eba2dd94fa40c41cdea7ae4d86e9f58a25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-30 00:07:43 +00:00
Hao Dong
55ec9b88d6
Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-d1-dev am: 72f2058d3e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830605
Change-Id: I0411207e8f9a2c955c268b456b83f0b9c871dbb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-30 00:06:58 +00:00
Hao Dong
04b1932b25
Merge "Fix pattern rotation header text." into udc-d1-dev
2023-06-29 23:52:00 +00:00
Hao Dong
72f2058d3e
Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-d1-dev
2023-06-29 23:51:50 +00:00
Daniel Norman
8f5c6d06b5
Stop asserting on internal PackageMonitor details.
...
Fix: 289324081
Test: SettingsRoboTests
Change-Id: Ia4cdd3b4e994786ba2cbc3045c181eb9339f12d7
2023-06-29 19:15:25 +00:00
Joshua Mccloskey
cde233abf0
Merge "Moving FingerprintSettings to Kotlin"
2023-06-29 12:31:22 +00:00
Chaohui Wang
99457e53a8
Clean up assist gesture from Settings
...
This one is replaced by "Press & hold power button".
Bug: 287566056
Test: m Settings
Change-Id: Ic9fe8ab29a0b72f1a47f05b18da99ccf68a7f766
2023-06-29 18:17:10 +08:00