Michael Mikhail
3411c09fa9
Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563
am: 7c53d299a2
am: 8f88d32f18
am: 1ccbd3966b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044
Change-Id: Ib2b30c78237f0484a6d2c30f92c7cf9100f2c372
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 01:15:15 +00:00
Michael Mikhail
804c6233b5
Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563
am: f7b82efb83
am: c2ddd3e581
am: b1c8541600
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044
Change-Id: I26abbaae0e04a29e21b77873eb6dab2c39876f81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 01:05:46 +00:00
Michael Mikhail
9d65dffe80
Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563
am: 7c53d299a2
am: 1db4bc3676
am: 5e9026aa80
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044
Change-Id: I4427ef728c7210ffd6c837a696f54e75737cb6f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 00:30:15 +00:00
Michael Mikhail
1ccbd3966b
Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563
am: 7c53d299a2
am: 8f88d32f18
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044
Change-Id: Iedb8ee79c516ebb582c27f3b6584782c6887fa2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 17:16:59 +00:00
Michael Mikhail
b1c8541600
Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563
am: f7b82efb83
am: c2ddd3e581
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044
Change-Id: I6648eb8daf07a81653d7e5be316239a1e8cec4ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 17:11:39 +00:00
Michael Mikhail
5e9026aa80
Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563
am: 7c53d299a2
am: 1db4bc3676
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044
Change-Id: Ie88d511f8c1fb4047a62425e49cd2b120062b5f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 17:11:30 +00:00
Michael Mikhail
c2ddd3e581
Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563
am: f7b82efb83
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044
Change-Id: I4a9b2877ea13e7bd6ce6d187d416d233141560a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 16:34:28 +00:00
Michael Mikhail
8f88d32f18
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: Ia4c82cc1a96ab511fe58aa3747082931304fc68d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 16:33:59 +00:00
Michael Mikhail
3e124e4137
Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563
am: 4396612e11
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044
Change-Id: Ia56bdb9a1f9d9acdc078e8068ca5585a68f6bb64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 16:30:05 +00:00
Michael Mikhail
4cd35efb10
Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563
am: baf891b44b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044
Change-Id: I4921ba145ce81a7e39378af619f0e7c15e8ae4b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 16:29:55 +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
Michael Mikhail
4396612e11
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: I383efa35bb4abf9f4527a812c2c97c940185f5f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 15:51:23 +00:00
Michael Mikhail
baf891b44b
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: If5494bc98dc2acc69c2de7045e1763c2228f5286
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 15:51:08 +00:00
Michael Mikhail
f7b82efb83
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: If9ced263d3b60723d39ec471d1e32f800334c046
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 15:47:08 +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
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
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
c4ffa7d504
Fix DataUsagePreferenceController ANR am: d42cc8e5e2
am: a51e013746
am: d4b80ec424
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23896225
Change-Id: I9b1adbc162f2cef84ef161d7fef9e462ef86829b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-04 10:29:08 +00: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
d4b80ec424
Fix DataUsagePreferenceController ANR am: d42cc8e5e2
am: a51e013746
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23896225
Change-Id: Ibcb0a2bc04b0c19f036bcb2039cfa93663b1ec6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-04 09:46:48 +00:00
Rhed Jao
6c7e4560a2
Update strings for the repair mode lock password screen
...
Bug: 289325981
Test: build
Change-Id: I347397fa0445436a231bc82529215c6031e4d80d
2023-07-04 09:44:50 +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
ceb95b1dce
[automerger skipped] Merge "[Panlingual]Log metrics for App's locale from the suggested" into udc-qpr-dev am: 5d207a7b4b
am: 477102b991
-s ours
...
am skip reason: Merged-In I007c0e76d8b88f08518ba2696d42bd1db194f5b7 with SHA-1 e93f6cd9e6
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23832124
Change-Id: I8ca6a7f8e751b0444e1b4b6efbee8f208007da66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-30 17:22:27 +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