Commit Graph

138744 Commits

Author SHA1 Message Date
Chaohui Wang
c038d58bef Merge "Sort the selectable subscription by id" into main 2024-03-07 06:40:34 +00:00
SongFerng Wang
eb80786be3 Merge "Add the mechanism of enable DSDS" into main 2024-03-07 04:33:37 +00:00
Wilson Wu
4406de67e0 Merge "Add fixed amplitude check for keyboard vibration" into main 2024-03-07 04:30:36 +00:00
Chaohui Wang
ad611366df Sort the selectable subscription by id
To make sure users always see a fixed order.

Bug: 318310357
Test: manual - on SIMs and turn on / off SIM
Change-Id: I2910d83f5b1d04287afca0e3ba91dedbeb588c14
2024-03-07 11:23:25 +08:00
Chaohui Wang
bdfae3a3bf Merge "Create NetworkScanRepository" into main 2024-03-07 02:47:30 +00:00
Chaohui Wang
51c78ff199 Merge "Update the summary when Wi-Fi calling ready" into main 2024-03-07 02:46:43 +00:00
Treehugger Robot
1b3c21ef1b Merge "Fixed NPE in FingerprintEnrollIntro" into main 2024-03-07 02:24:40 +00:00
Joshua McCloskey
3c57fcde32 Fixed NPE in FingerprintEnrollIntro
Test: atest FingerprintEnrollIntroductionTest
Fixes: 317515741
Change-Id: Icc4e5cd4fbfea6828684ce6c8fc30acaabe5d315
2024-03-07 00:33:49 +00:00
songferngwang
2b5002ae6a Add the mechanism of enable DSDS
When the user click the "set up" on sim onboarding BottomSheet, settings
enable the DSDS mode and then start the sim onboarding flow

Bug: 318310357
Bug: 298898436
Bug: 298891941
Test: build pass and verify the UI flow
Change-Id: Ibd4fc2f482019f02738c3fedef7af7f4ef9b8e50
2024-03-06 23:01:48 +00:00
Manish Singh
eb840e23f7 Merge "Return the correct position for the profile tab" into main 2024-03-06 19:33:41 +00:00
Wilson Wu
fd45101eee Add fixed amplitude check for keyboard vibration
Make sure the keybaord vibration settings only show
up when fixed amplitude provided to avoid any unsync
behavior with platform.

Bug: 326027376
Test: atest KeyboardVibrationTogglePreferenceControllerTest
Change-Id: I3b4e06660e3eaa6ce537b72831073f092cba37e2
2024-03-06 12:33:07 +00:00
Chaohui Wang
d48cf866d8 Update the summary when Wi-Fi calling ready
Since the correct summary can only be got after Wi-Fi calling ready.

Fix: 325414275
Test: manual - on Mobile Settings
Change-Id: Ida94fd0a86f2130b9f0dded82fe18efd3ffc0c27
2024-03-06 12:44:22 +08:00
Manish Singh
8ca4f47292 Return the correct position for the profile tab
The existing code returns the fixed tab values, which doesn't work
now that the ordering is determined by the user manager's ordering.

Bug: 302278487
Test: manual
Test: atest ProfileSelectFragmentTest
Change-Id: I87b393b8e12e21dc1b38ee75bb43ca9133785c81
2024-03-05 19:50:29 +00:00
Isaac Chai
46369353ed Adding Settings preference for single finger panning feature
Test: Locally tested on device +
MagnificationOneFingerPanningPreferenceControllerTest
Bug: 282039824

Change-Id: I1d1a649060cba862c8f333e6e76184fade2dcdce
2024-03-05 19:10:59 +00:00
Manish Singh
ea341bdf98 Merge "Add controller for location for private profile" into main 2024-03-05 18:48:35 +00:00
Matías Hernández
65e6431ec5 Merge "Moved zen-conversion-related methods into ZenAdapters" into main 2024-03-05 16:52:03 +00:00
Manish Singh
dd5a8e610c Add controller for location for private profile
Bug: 303196278
Test: manual
Change-Id: I0997918e5046ac803c2c2d117c2e027b4aacc2c2
2024-03-05 16:27:28 +00:00
Treehugger Robot
d89636390f Merge "[Thread] fix wrong kotlin argument name" into main am: dee4388b93 am: 887741ee49
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2984352

Change-Id: I329e07a9a27327d967a9c8de34531f33c847a74b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-05 16:04:15 +00:00
David Liu
710b4cdcbe Merge "Fix toolbar keyboard navigation and touch." into main 2024-03-05 16:04:08 +00:00
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
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