Treehugger Robot
887741ee49
Merge "[Thread] fix wrong kotlin argument name" into main am: dee4388b93
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2984352
Change-Id: I309e4d56dc379680d07bf1e28648ca620b824bad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-05 15:22:33 +00:00
Treehugger Robot
dee4388b93
Merge "[Thread] fix wrong kotlin argument name" into main
2024-03-05 14:31:02 +00:00
Chaohui Wang
4dbc23ca28
Create NetworkScanRepository
...
And migrate network scan to flow for better maintenance and prevent ANR.
Fix: 323105271
Test: manual - Choose network
Test: unit test
Change-Id: I5c49d195fc202143c0131ffd78bc3adc168b119c
2024-03-05 21:45:18 +08:00
Harry Cutts
175a901f2c
Merge "Touchpad: add Framework Input team as owners" into main am: a3a04112fd
am: 3c1a5bb3c0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2982053
Change-Id: Ifae971d2fd89374e8e0c1d3a147c6390a85dee46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-05 12:45:49 +00:00
Harry Cutts
3c1a5bb3c0
Merge "Touchpad: add Framework Input team as owners" into main am: a3a04112fd
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2982053
Change-Id: Idf76ff1bf592de800d224052910927285c47c42e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-05 12:05:02 +00:00
Harry Cutts
01bd498503
Merge changes I0c0a76c7,Iccfbe842 into main
...
* changes:
Touchpad: remove icons
Touchpad: add tap dragging setting
2024-03-05 11:39:22 +00:00
Harry Cutts
a3a04112fd
Merge "Touchpad: add Framework Input team as owners" into main
2024-03-05 11:17:46 +00:00
Vaibhav Devmurari
d3dbe6ce23
Merge "Modify PK Settings page to make it more user friendly" into main
2024-03-05 10:53:48 +00:00
Anna Zhuravleva
a05ba46acd
Merge "Log change in autolock settings" into main
2024-03-05 10:18:58 +00:00
SongFerng Wang
b321e4ca34
Merge "Fix the test case failed" into main
2024-03-05 10:02:02 +00:00
Simon Wingrove
6fbec88456
Merge "Prevent full-screen face enroll on tablet" into main
2024-03-05 09:56:38 +00:00
Manish Singh
0d1d483d7c
Merge "Return true only if the userManager belongs to private profile" into main
2024-03-05 09:46:40 +00:00
Jason Chiu
25737c7e66
[automerger skipped] Replace getCallingActivity() with getLaunchedFromPackage() am: ddc11bc03a
am: 930a9f3180
am: 19ae28f1eb
-s ours
...
am skip reason: Merged-In If97018c2741caef622f0596bbfeaa42ef1788b78 with SHA-1 ddc11bc03a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26315861
Change-Id: Id28f4025a6181006202980760ee93b55c253b078
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-05 06:18:46 +00:00
Jason Chiu
19ae28f1eb
Replace getCallingActivity() with getLaunchedFromPackage() am: ddc11bc03a
am: 930a9f3180
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26315861
Change-Id: I0ef0c89fe3f3c0f9d8addef766b74f9b637eea92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-05 05:33:46 +00:00
Jason Chiu
d54848bec8
[automerger skipped] Replace getCallingActivity() with getLaunchedFromPackage() am: ddc11bc03a
am: ea126ae386
-s ours
...
am skip reason: Merged-In If97018c2741caef622f0596bbfeaa42ef1788b78 with SHA-1 901880a1d2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26315861
Change-Id: I67bc0bf500d36e989ca1f0e7194d1b9305c5995f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-05 05:33:28 +00:00
Jason Chiu
ea126ae386
Replace getCallingActivity() with getLaunchedFromPackage() am: ddc11bc03a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26315861
Change-Id: Ib4054f4a6aceb589a157eccf713a13b5abac01bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-05 04:49:40 +00:00
Jason Chiu
930a9f3180
Replace getCallingActivity() with getLaunchedFromPackage() am: ddc11bc03a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26315861
Change-Id: I01598c3f2fa5432dc27357701ddcbb29b4c97776
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-03-05 04:47:38 +00:00
Riley Jones
ee25100639
Merge "Change EditShortcutsPreferenceFragment to use a Preference for subtitle/description" into main
2024-03-05 02:53:47 +00:00
Fan Wu
739647a46d
Merge "Fix settings/widget test failures" into main
2024-03-05 02:13:10 +00:00
Roy Chou
79ee7bc941
Merge "chore(magnification): remove onResume overrides for controllers in ToggleScreenMagnificationPreferenceFragment" into main
2024-03-05 01:32:33 +00:00
Riley Jones
f8237aee94
Change EditShortcutsPreferenceFragment to use a Preference for subtitle/description
...
Replaces PreferenceCategory with unselectable Preference to better match desired visuals
Screenshot at https://x20web.corp.google.com/users/jo/jonesriley/dragToEdit/editScreenWithSubtitle.png
Flag: N/A
Test: N/A
Bug: 323388734
Change-Id: Ia1b333bc246ea4dd98070a646d5a8a1716ccbcee
2024-03-04 22:45:11 +00:00
songferngwang
29286ec8c3
Fix the test case failed
...
-Add flag FLAG_IS_DUAL_SIM_ONBOARDING_ENABLED
-Add mock for SubscriptionManager.createForAllUserProfiles
Bug: 323652989
Test: atest NetworkProviderCallsSmsFragmentTest
atest SubscriptionsPreferenceControllerTest
atest DefaultSubscriptionControllerTest
atest DisableSimFooterPreferenceControllerTest
atest MobileDataPreferenceControllerTest
atest MobileNetworkSwitchControllerTest
atest MobileNetworkUtilsTest
atest NetworkSelectSettingsTest
Change-Id: I4d473140f291daec0f8e56c01bd8f7cfa2d0c82e
2024-03-04 22:35:38 +00:00
Manish Singh
55e9f41bda
Return true only if the userManager belongs to private profile
...
The existing code asks the main user's userManager if there's a
private profile belonging to it. If a private profile exists then the
answer to that question will always be true. So, we always end up
showing the apps from the private profile for the personal case.
We should instead ask the userManager if it belongs to the private
profile or not.
Bug: 327598131
Test: manual
Change-Id: I7bc9d58c371341235579d3456b54ea85f598892b
2024-03-04 18:26:58 +00:00
Anna Zhuravleva
cbc0ec7111
Log change in autolock settings
...
Bug: 327181532
Test: statsd_testdrive https://paste.googleplex.com/4866138112000000
Change-Id: I4133e35ff343e32261cb0fc190af4a32474b69e3
2024-03-04 18:24:05 +00:00
Treehugger Robot
a6f283382a
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-03-04 17:25:26 +00:00
Treehugger Robot
fd54b422d7
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-03-04 17:25:26 +00:00
Olivier Nshimiye
b4e6f20567
Add Private Space features flag check to Settings tests
...
Adding this flag check since we are putting all the implementations of Private Space features behind this flag.
Bug: 326060689
Test: Run presubmits and verify that nothing breaks
Change-Id: I2c0e9a1afc3787232425f79d06d4aeba001283ec
2024-03-04 15:43:47 +00:00
Olivier Nshimiye
0f3799cbad
Add an additional flag guard for Private Space implementation
...
This a layer of flag guarding only for the implementation of Private Space features excluding the APIs. The MVP flag allow_private_profile still guards all the features including the APIs.
Bug: 326060689
Test: Manual - a few verifications that some feeatures are unavailable when this flag is disabled
Test: Run presubmits and verify that nothing breaks
Change-Id: I05f7e2f20c6132b33484bb133ce03a933ece485f
2024-03-04 15:43:24 +00:00
SongFerng Wang
71c6c3e557
Merge changes I96574a79,I74681222 into main
...
* changes:
Fix the testcase failed
Add the log for SidecarFragment
2024-03-04 12:27:37 +00:00
songferngwang
c9a3eeb792
Fix the testcase failed
...
Add mock for SubscriptionManager.createForAllUserProfiles
Bug: 323652989
Test: atest MobileNetworkPreferenceControllerTest
Change-Id: I96574a79eba581db95d387f0d9c9fde2e004c41c
2024-03-04 10:58:22 +00:00
Vaibhav Devmurari
8754f114ac
Modify PK Settings page to make it more user friendly
...
PK Settings page:
- Show current PK layout selected for the current user profile and current IME language instead of a list of IMEs
PK layout mapping page:
- Show IME name in header only if multiple active IMEs
- Show the PK layout selection criteria (Automatic v/s User selected)
Bug: 325925410
Bug: 326195401
Test: manual
Change-Id: I93a2e169742a800fa116fa5d55e1a91e5548cebb
2024-03-04 10:55:47 +00:00
Charlotte Lu
3b856490e8
Merge "Change WepNetworkDialogActivity exported="true"." into main
2024-03-04 10:15:53 +00:00
songferngwang
0d7d180246
Add the log for SidecarFragment
...
The system miss the SidecarFragment result, so the settings did not
active the esim.
Bug: 302505660
Test: NA
Change-Id: I746812220fed001eddc7d4aeeaf7aa0b04b86692
2024-03-04 10:10:30 +00:00
Fan Wu
8c8d310767
Fix settings/widget test failures
...
Also ignore color checker complain introduced by ag/26310215
Bug: 315133235
Test: atest SettingsRoboTests
Change-Id: I88081ab4bb1b01dfbd7b7a0045e2031e7170028a
2024-03-04 16:55:55 +08:00
SongFerng Wang
d94a556939
Merge "Fix SimDialogActivityTest" into main
2024-03-04 08:48:11 +00:00
Zaiyue Xue
62132fffb2
Merge "Update the logic for logging anomaly information to WW." into main
2024-03-04 08:00:08 +00:00
Zaiyue Xue
a399c73ba0
Merge "Fix anomaly is not logged in non-debug mode." into main
2024-03-04 07:55:18 +00:00
Chaohui Wang
66dacdf050
Merge "Create phoneNumberFlow" into main
2024-03-04 07:48:37 +00:00
Angela Wang
6089d3edd6
Merge "Replaces HearingDevicePairingDetail with HearingDevicePairingFragment" into main
2024-03-04 06:53:19 +00:00
Chaohui Wang
c8edb018a4
Create phoneNumberFlow
...
Bug: 318310357
Test: manual - on Mobile Settings
Change-Id: Ib80b6c510ebd89650557240add23d914934ba6c9
2024-03-04 13:52:18 +08:00
Zaiyue Xue
87ecb92e6e
Fix anomaly is not logged in non-debug mode.
...
Proto is not supported to fully toString() in non-debug mode.
Bug: 327978756
Fix: 327978756
Test: manual
Change-Id: I1231c40769fd345b500ec120cf9c6fca3eb7c54a
2024-03-04 13:24:13 +08:00
Jacky Wang
16a99aecae
Merge "[DataStore] Migrate BatteryBackupHelper to BackupRestoreStorage" into main
2024-03-04 03:58:29 +00:00
Weng Su
1a2d60a867
Merge "Ignore failed Wi-Fi unit tests" into main
2024-03-04 03:47:47 +00:00
Roy Chou
654e43b2e8
chore(magnification): remove onResume overrides for controllers in ToggleScreenMagnificationPreferenceFragment
...
As b/186731461, so far MagnificationModePreferenceController and other
magnification preference controllers are only used in
ToggleScreenMagnificationPreferenceFragment, which is DashboardFragment.
Since DashboardFragment already updates preference state in its
onResume, so we can remove the onResume overrides in those controllers.
Besides, we can also remove the LifeCycle dependency for the controllers
since it's not used anymore.
Bug: 186731461
Flag: NA
Test: manually
atest ToggleScreenMagnificationPreferenceFragmentTest
atest MagnificationAlwaysOnPreferenceControllerTest
atest MagnificationFollowTypingPreferenceControllerTest
atest MagnificationJoystickPreferenceControllerTest
atest MagnificationModePreferenceControllerTest
Change-Id: I379a6a3a985c9d8b7a37bbb878b84cee1bd6adfb
2024-03-04 03:44:59 +00:00
Zaiyue Xue
51740f6540
Update the logic for logging anomaly information to WW.
...
Bug: 316075226
Test: manual
Change-Id: I22198ee1ae3cedee6ee9d2e8191423000ba32af2
2024-03-04 10:47:29 +08:00
Chelsea Hao
7eb6df8ee7
Merge "[Audiosharing] Remove audio streams from settings." into main
2024-03-04 02:33:18 +00:00
Weng Su
777157b5b4
Ignore failed Wi-Fi unit tests
...
Bug: 323645528
Flag: None
Test: unit test
atest -c SettingsUnitTests:RequestToggleWiFiActivityTest \
SettingsUnitTests:WifiDialog2Test \
SettingsUnitTests:WifiUtilsTest
Change-Id: I8d3ddb1eb775b8758cb359cac4dac39bb9c8dfed
2024-03-04 06:07:40 +08:00
Jacky Wang
006bf17c4f
[DataStore] Migrate BatteryBackupHelper to BackupRestoreStorage
...
Bug: 325144964
Test: Manual tests
Change-Id: I19f7c78969d70648d1e45f1627827d98b1fdd1e0
2024-03-03 22:42:00 +08:00
songferngwang
3f6d1dc3e5
Fix SimDialogActivityTest
...
Can't create handler inside thread
Bug: 323649089
Test: atest SimDialogActivityTest
Change-Id: I678a1a1841ab1e1cd87c358fbb3d52cbfb55dbe4
2024-03-02 14:45:47 +00:00
Chaohui Wang
bec4c9573e
Create isSubscriptionEnabledFlow
...
To better display the isEnable checked state.
Bug: 318310357
Test: manual - on Mobile Settings
Test: unit test
Change-Id: Ia595e7445650ad67883f1e7c1a0662cb826565ea
2024-03-02 05:01:28 +00:00