Commit Graph

134496 Commits

Author SHA1 Message Date
Chaohui Wang
a9a819a5d7 Merge "Remove duplicated metered & privacy spinner" into main 2023-09-04 11:04:46 +00:00
Chaohui Wang
0d129f77f0 Remove duplicated metered & privacy spinner
From Wi-Fi dialog when there are already same settings in the Wi-Fi
detail page.
This makes simpler for the user and help fix the inconsistent issue.

Fix: 297036035
Test: manual - open Wi-Fi dialog from Wi-Fi detail page
Test: robo test
Change-Id: Ic02658d91938db78b91e867a923260aa2610ae49
2023-09-04 17:10:17 +08:00
Yiyi Shen
a82c257002 Merge "Add a new section to show eligible Fast Pair devices." into main 2023-09-04 08:25:11 +00:00
Kean Mariotti
4ed4885aa8 Merge "Revert^2 Remove Winscope tracing QS development tile" into main 2023-09-04 07:50:36 +00:00
SongFerng Wang
3750ebfef1 Merge "To Add try-catch for MetadataChangedListener to handle the Exception" into main 2023-09-04 05:56:24 +00:00
Chaohui Wang
0802d31f85 Merge "Fix references to preference_widget_radiobutton" into main 2023-09-04 05:52:54 +00:00
Yiyi Shen
71d9c21856 Add a new section to show eligible Fast Pair devices.
The section only show at most 3 devices. If the device list size is
greater than 3, we will show a "See all".
The device Preference is ordered. FastPairDeviceUpdater will handle the
order logic.
Bug: 296507968
Test: FastPairDevicePreferenceControllerTest

Change-Id: I9692d5740dbc31ff50db0ebbf2c5535b726277c9
2023-09-04 11:32:32 +08:00
Holly Jiuyu Sun
b61225a7a5 Merge "Add feature flag as a device_config flag for LPH to search." into udc-qpr-dev am: a5027a20ff am: b64f278e48
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24544150

Change-Id: Icfee3c88c4d8c6bcead7772b1bd817e77f7588d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 17:22:48 +00:00
Holly Jiuyu Sun
b64f278e48 Merge "Add feature flag as a device_config flag for LPH to search." into udc-qpr-dev am: a5027a20ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24544150

Change-Id: I96427f5c65e502207e384b2eb9edf9649b32f885
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 16:30:10 +00:00
Holly Jiuyu Sun
a5027a20ff Merge "Add feature flag as a device_config flag for LPH to search." into udc-qpr-dev 2023-09-01 15:32:40 +00:00
Holly Jiuyu Sun
80e4a5134a Merge "Move ShadownDeviceConfig.java to tests/robotests/testutils." into main 2023-09-01 15:32:36 +00:00
Justin McClain
b675bb6d3a Merge "Remote authenticator enrollment navigation." into main 2023-09-01 11:48:35 +00:00
Chaohui Wang
83cf8dbadc Merge "Clean up deprecated WifiSettings" into main 2023-09-01 10:49:03 +00:00
Kean Mariotti
95b375e2b4 Revert^2 Remove Winscope tracing QS development tile
This commit removes the obsolete QS development tile for Winscope
tracing as now Winscope traces can be collected via Traceur.

Bug: 295816837
Test: N/A
Change-Id: I7658537579cd054af092945aab553a4e17997273
2023-09-01 10:36:29 +00:00
Treehugger Robot
38bb07beb7 Merge "Fix b/298551473: Battery usage robotest failed in main branch" into main 2023-09-01 10:06:47 +00:00
Xinyi Mao
5bad30b3db Merge "Impl app anomlay preference" into udc-qpr-dev am: c51a3da148 am: 428b124bea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24404174

Change-Id: I147d8496db00a770d8de45229813ae146e1e87cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 09:54:53 +00:00
SongFerng Wang
0f253cd7e5 Merge "ListPreference setEnable as defualt disable at network and sim page" into main 2023-09-01 09:19:54 +00:00
Xinyi Mao
428b124bea Merge "Impl app anomlay preference" into udc-qpr-dev am: c51a3da148
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24404174

Change-Id: I7068d880ab644f01dba523132dbccd2cc6ceff60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 08:59:18 +00:00
Xinyi Mao
c51a3da148 Merge "Impl app anomlay preference" into udc-qpr-dev 2023-09-01 07:53:09 +00:00
mxyyiyi
c4fb17d740 Impl app anomlay preference
[ScreenShot]: https://screenshot.googleplex.com/BBrHTQbwbFHxZE9

Bug: 291689623
Bug: 291689643
Test: manual
Change-Id: Ia257f3ace4a2d71b2221f861be3e1238de6d791e
2023-09-01 06:40:36 +00:00
Allen Su
f8be5736a8 Merge "Add feature flag for LocaleNotification" into main 2023-09-01 05:30:03 +00:00
Chaohui Wang
6e7b06f18e Clean up deprecated WifiSettings
Replace all references to NetworkProviderSettings.

Bug: 297036035
Test: robo test
Test: manual - on internet settings
Change-Id: I2a5ae5644042c982c2a284a303257896c20b7714
2023-09-01 13:24:29 +08:00
Chaohui Wang
ca4e47c348 Merge "Migrate WifiDialog2 to Kotlin" into main 2023-09-01 05:19:39 +00:00
Treehugger Robot
cde63d5ae2 Merge "[Regional preference] Add Regional Preference into the summary" into udc-qpr-dev am: c7ea783c78 am: f92766e74a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613092

Change-Id: I457ac375fe49a9eb16d232075056077c466920d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 04:07:50 +00:00
Aleksandr Lukin
fdf79d8e23 Merge "Update the API usage to get total size of devices" into udc-d1-dev am: d1373d4a1a am: 7aa48f70f1 am: 5e99db152b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24603347

Change-Id: I05488b89dbd4f40b6c9eee8a8f9a6cda73dad4f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 04:07:11 +00:00
Aleksandr Lukin
23064e1589 Merge "Update the API usage to get total size of devices" into udc-d1-dev am: d1373d4a1a am: 7888dfd518 am: 1d94371c6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24603347

Change-Id: Ifc6e084ed97fdc196117256127ce7ccaeacfedb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 04:05:41 +00:00
Allen Su
ac54b70c85 Add feature flag for LocaleNotification
Bug: 248514263
Test: atest AppLocalePickerActivityTest LocaleListEditorTest
Change-Id: I0e2160d75bbac83a161c73c90624b0e7af5b0a8e
2023-09-01 03:24:58 +00:00
Chaohui Wang
b1ecd0e392 Migrate WifiDialog2 to Kotlin
Bug: 297036035
Test: unit test
Test: manual - on wifi dialog
Change-Id: I5bcd636705b8514fe3fd784ef380f55e079c6ce7
2023-09-01 11:15:14 +08:00
Priyanka Advani
7b4cfbca95 Merge "Revert "Remove Winscope tracing QS development tile"" into main 2023-09-01 03:14:34 +00:00
Treehugger Robot
f92766e74a Merge "[Regional preference] Add Regional Preference into the summary" into udc-qpr-dev am: c7ea783c78
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613092

Change-Id: Ide98533ea70e94fad2a679d68936076dc85e1e96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 03:13:03 +00:00
Aleksandr Lukin
5e99db152b Merge "Update the API usage to get total size of devices" into udc-d1-dev am: d1373d4a1a am: 7aa48f70f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24603347

Change-Id: I4ae2ebe6541d606d164b66d3bac748c85eba5024
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 03:11:25 +00:00
Zaiyue Xue
30141ada64 Fix b/298551473: Battery usage robotest failed in main branch
Bug: 298551473
Fix: 298551473
Test: presubmit
Change-Id: I37a990003293bdfa0eb97e79c0ce7af2069d10bb
2023-09-01 11:11:17 +08:00
Aleksandr Lukin
1d94371c6c Merge "Update the API usage to get total size of devices" into udc-d1-dev am: d1373d4a1a am: 7888dfd518
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24603347

Change-Id: Ia83e8da0b6f425d92d7eca8d565819ade3c6fe21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 03:04:53 +00:00
Treehugger Robot
c7ea783c78 Merge "[Regional preference] Add Regional Preference into the summary" into udc-qpr-dev 2023-09-01 02:29:00 +00:00
Aleksandr Lukin
7888dfd518 Merge "Update the API usage to get total size of devices" into udc-d1-dev am: d1373d4a1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24603347

Change-Id: I92f3ad3e76029f5f0f2caff4e5016a2475decaf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 02:27:28 +00:00
Aleksandr Lukin
7aa48f70f1 Merge "Update the API usage to get total size of devices" into udc-d1-dev am: d1373d4a1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24603347

Change-Id: I816aff6dab9ac5f3ef72f0f110087650125797bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 02:18:08 +00:00
Aleksandr Lukin
d1373d4a1a Merge "Update the API usage to get total size of devices" into udc-d1-dev 2023-09-01 01:41:27 +00:00
Vlad Popa
2df0b3bf6f [automerger skipped] Merge "Disable the spatializer options for device categories" into udc-qpr-dev am: 4010b222f8 am: 4ee43c40e9 -s ours
am skip reason: Merged-In I7f044d40afadec6ccf659ae4969c0d6e2dc8c79e with SHA-1 92fb7bddbf is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24531690

Change-Id: I632593e4b0e8c730f590282d5cb951001b843448
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 00:55:14 +00:00
Vlad Popa
4ee43c40e9 Merge "Disable the spatializer options for device categories" into udc-qpr-dev am: 4010b222f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24531690

Change-Id: I134714c9a5cb03c06d6dbee2256d7630554c37c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 00:44:41 +00:00
Diwas Sharma
e08ceb575c Revert "Remove Winscope tracing QS development tile"
This reverts commit 513e014963.

Reason for revert: 298512106

Change-Id: I5efa947b17b8d33cfe8ca3350c2279903e5239af
2023-09-01 00:41:22 +00:00
Vlad Popa
4010b222f8 Merge "Disable the spatializer options for device categories" into udc-qpr-dev 2023-09-01 00:33:47 +00:00
Automerger Merge Worker
bf371c9abe Merge changes from topic "am-119eb3c6021b40a4899c09f8bfb8bf1c" into udc-d1-dev-plus-aosp am: 7ca1b2fec0 am: 675d84de56
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613441

Change-Id: Ie7723b14d29b2357d384d9ac7828bc760278f2ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31 23:15:40 +00:00
Bill Yi
7826c84f0c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44ba06430a -s ours am: 14b51e0e37 -s ours am: 8dd6eb5801 -s ours am: 4f80e2f41b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613441

Change-Id: I1baddfca7fe2314ac339e3d00fd107d72d29e10f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31 23:15:26 +00:00
Automerger Merge Worker
6ee222f59e Merge changes from topic "am-ade9939dcc86447b9557decc69f1b2a9" into udc-d1-dev-plus-aosp am: 80cc76eda4 am: c809a3a9f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613441

Change-Id: Ic9ab88fcc35b090160563f5ac3600ea56195d078
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31 23:09:24 +00:00
Bill Yi
bb508ed01b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44ba06430a -s ours am: f3392e54a5 -s ours am: 56d5a70aa0 -s ours am: 6c43cdc8fe -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613441

Change-Id: Id88118b995912edd9d46025ee76ea3a8248a004e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31 23:09:12 +00:00
Bill Yi
28d492ee43 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 5a3df756ce -s ours am: d1616c60a3 -s ours am: a63c9b0a73 -s ours am: af119807cf -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613430

Change-Id: I3f94c7f641de2efb2347e22f0fafb77b11a40a74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31 23:07:55 +00:00
Bill Yi
8e811d4eca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb9037e6fe -s ours am: eaa92efd07 -s ours am: 0cc3b9a425 -s ours am: 410d0c42d2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613430

Change-Id: Ie264fac347b6f17e0b799dcc93ec4886a8573a7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31 23:07:49 +00:00
Bill Yi
3ef382b381 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: d3e67b615d -s ours am: 14442ba7c3 -s ours am: ef8d4e5e6b -s ours am: 699d23a505 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613429

Change-Id: I5ea7c61d3775c79c5bd6900603a3bf0b9a8e05b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31 23:07:45 +00:00
Bill Yi
30f0f5bbc4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2a5e445593 -s ours am: 9725cfd44b -s ours am: 42d9975494 -s ours am: 60a51495f5 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613429

Change-Id: Id1d6ecbffe836807f95b0c228558c2a97b0e5a00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31 23:07:34 +00:00
Bill Yi
f8fc54e471 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8f8a434c4d -s ours am: 34d81dca78 -s ours am: 0b92155672 -s ours am: edaf97d7bf -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24613427

Change-Id: I49c680f1e6a73202eb5fb01a95ffdbd9f9350796
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31 23:07:12 +00:00