Wenhui Yang
bfa2feb316
Merge "Fix fingerprint unlock stuck after renaming" into udc-qpr-dev
2023-06-13 01:02:42 +00:00
Wenhui Yang
14b115177c
Merge "Fix face re-enroll stuck for work profile" into udc-qpr-dev
2023-06-13 01:02:08 +00:00
Wenhui Yang
7e6443e025
Fix face re-enroll stuck for work profile
...
Call super.onCreate(savedInstanceState) first to pass the correct userId
in maxFacesEnrolled.
Test: Manual - delete face unlock for work and re-enroll and observe
face unlock can be enrolled successfully
Test: atest FaceEnrollIntroductionTest
Fixes: 284819031
Change-Id: Ic1620c0ca3ca9adc61f5281abd34471f0c1b3f97
2023-06-12 20:06:01 +00:00
Han Xu
e319c686e7
Add manufactured year into hardware info page am: b452bc9f9d
am: 15da26329f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342
Change-Id: I29b80b692bc97132b5cc7eac3d3a153d0f93d238
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 18:08:24 +00:00
Han Xu
15da26329f
Add manufactured year into hardware info page am: b452bc9f9d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342
Change-Id: I53f6c06271bb862cd16e2f3cb48886f764686d40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 17:43:44 +00:00
Han Xu
b452bc9f9d
Add manufactured year into hardware info page
...
Bug: 285471557
Test: manual visually
Change-Id: Iaab254ac6ee77217e29d89524d782577f44119cb
2023-06-12 17:43:55 +08:00
Treehugger Robot
55774422b1
Merge "Remove redundant methods and refactor" into udc-qpr-dev
2023-06-12 09:05:05 +00:00
Yi-Ling Chuang
f148baa372
Remove redundant methods and refactor
...
Remove the summary method and write the code in AOSP directly instead to
force string consistency. Also refactor a bit after the modification.
Fixes: 276399056
Test: robotests
Change-Id: I76ad740b694363a3cdfb3748e41c840fb678b93d
2023-06-12 16:11:49 +08:00
Wenhui Yang
98744f1a8e
Fix fingerprint unlock stuck after renaming
...
FingerprintAuthenticationClient wasn't cancelled successfully because cancelletion signal was set to null.
Test: Manual - rename an existing fingerprint and observe fingerprint unlock can be entered again
Test: atest FingerprintSettingsFragmentTest
Fixes: 283926104
Change-Id: Id33cc3d3e8052f5cc39eddac26a75047d3139633
2023-06-09 17:55:48 +00:00
Treehugger Robot
4b44c6632e
Merge "Show "Not available" summary when hotspot speed is unavailable" into udc-d1-dev am: a99c52e160
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601566
Change-Id: I5b91a44f9c947d6686a28cb2acb2c41f58e8fe01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-09 05:02:25 +00:00
Treehugger Robot
a99c52e160
Merge "Show "Not available" summary when hotspot speed is unavailable" into udc-d1-dev
2023-06-09 04:29:16 +00:00
Weng Su
7171e0a29b
Show "Not available" summary when hotspot speed is unavailable
...
- Show "Not available" summary when hotspot bands (5 GHz and 6 GHz) are unavailable
- Update debug logs to track down issues
Bug: 285769583
Test: manual test
atest -c WifiHotspotSpeedSettingsTest
atest -c WifiHotspotSpeedViewModelTest
Change-Id: If1050c120b4b612d3a9adbe886c2f12db82b793e
2023-06-08 21:38:01 +08:00
Ale Nijamkin
163c01ab4c
Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd
am: 1e3ecf6352
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917
Change-Id: Ie370f2e7fe8e473d46fec5a88ee831042d47903b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 20:27:23 +00:00
Ale Nijamkin
1e3ecf6352
Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917
Change-Id: I93ad7cae5cf900539bbded918807ea19b4c358b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 19:44:29 +00:00
Ale Nijamkin
b5dda005fd
Merge "Fixes nav stack issue." into udc-dev
2023-06-06 18:48:59 +00:00
Alejandro Nijamkin
6f9f3a4594
Fixes nav stack issue.
...
By marking the Intent that's being sent to WPP as "launched from
settings", the code in CustomizationPickerActivity can correctly
conclude that the multi-pane wrapper does not need to be applied to the
intent, preventing the odd "disordering" of the back stack in the bug.
Fix: 284809020
Test: manually verified, on a large screen device with a multi-pane
settings configuration, that going to Display > Lock screen > Shortcuts
and then swiping back off the left edge of the display correctly exits
settings instead of revealing an incorrect screen like it did in the
bug.
Test: also manually verified that the long-press on the home screena and
on the lock screen paths both open the right tab in WPP in settings
correctly.
Change-Id: Iac2b4e9fa5bab91b6a5251f1c51b4d21a0824f00
2023-06-05 16:02:17 -07:00
Treehugger Robot
dbec7ba7fb
Merge "Use custom action key icon" into udc-qpr-dev
2023-06-05 16:56:35 +00:00
TreeHugger Robot
4834abe241
Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0
am: f0503e2a51
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978
Change-Id: I763e30e24d32f456b30bf174eeacc899149b0ffb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 22:23:17 +00:00
TreeHugger Robot
f0503e2a51
Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978
Change-Id: Ifdc153ead7f9c45046bf5df96b1d44cd576f561b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 21:36:40 +00:00
TreeHugger Robot
25d24e0cf0
Merge "Restrict SimDialogActivity" into udc-dev
2023-06-02 20:41:47 +00:00
Treehugger Robot
d19f4f85fd
Merge "Skip Wi-Fi hotspot in Settings Widgets" into udc-dev am: 47d3cfe635
am: 91737c0b3b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517077
Change-Id: I9277de61513b892dee6517e2a6a393f77451e9c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 15:56:40 +00:00
YK Hung
6f892d206b
Merge "Update incompatible charger checking rule" into udc-dev am: bfc4637d09
am: 4eabcdea6d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484351
Change-Id: I924fe9631af514f947d278f32e808938a9c4c72e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 15:50:24 +00:00
Treehugger Robot
91737c0b3b
Merge "Skip Wi-Fi hotspot in Settings Widgets" into udc-dev am: 47d3cfe635
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517077
Change-Id: I272844e63ff78dc9ef730c04b768ee2dc1634e73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 04:24:57 +00:00
Treehugger Robot
47d3cfe635
Merge "Skip Wi-Fi hotspot in Settings Widgets" into udc-dev
2023-06-02 04:19:22 +00:00
YK Hung
4eabcdea6d
Merge "Update incompatible charger checking rule" into udc-dev am: bfc4637d09
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484351
Change-Id: I7a3133f83570a82bb5e87dd1096d5d47f85f3390
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 01:22:21 +00:00
YK Hung
bfc4637d09
Merge "Update incompatible charger checking rule" into udc-dev
2023-06-02 00:50:17 +00:00
Weng Su
ef81179538
Skip Wi-Fi hotspot in Settings Widgets
...
- Do not show Wi-Fi hotspots in Settings Widgets if the config is not set to show
Bug: 275268676
Test: Manual test
atest -c CreateShortcutPreferenceControllerTest
Change-Id: I5d86a78c9d48c9b63faff50d46f1254dbefd94cf
2023-06-02 04:54:59 +08:00
Prabir Pradhan
8fca8a72dc
Merge "Add "Show key presses" to input developer options" into udc-qpr-dev
2023-06-01 17:37:44 +00:00
Pavel Grafov
81e7bac047
Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0
am: 4c5394afb3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320
Change-Id: I8ce1a31df186ab0a396c8b0858286fd1cc53f740
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 17:35:41 +00:00
Pavel Grafov
4c5394afb3
Merge "Avoid double quiet mode requests" into udc-dev am: 8e13abebc0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23489320
Change-Id: I6a82013b578378facf575a6daa9070ff337d0fc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 16:38:28 +00:00
Pavel Grafov
8e13abebc0
Merge "Avoid double quiet mode requests" into udc-dev
2023-06-01 15:31:13 +00:00
Angela Wang
d91da4f4ca
Merge "Shouldn't show pair another ear dialog if hearing aid supports CSIP" into udc-qpr-dev
2023-06-01 11:04:31 +00:00
Angela Wang
1bc59caf13
Shouldn't show pair another ear dialog if hearing aid supports CSIP
...
Some devices may supports both ASHA and CSIP. If the device supports
CSIP, it'll automatically pair the other ear and thus no need to pop up
the pair another ear dialog which is specially for ASHA device.
Bug: 283269736
Test: make RunSettingsRoboTests ROBOTEST_FILTER=HearingAidUtilsTest
Change-Id: I9a8e3876e2905b18b1c63e74f47c6877504ebdc8
2023-06-01 09:54:35 +00:00
TreeHugger Robot
c57d3de706
Merge "Fix TetherSettings crash issue" into udc-dev am: f65da39f37
am: 9f831a600b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23485222
Change-Id: I15e5a054a77aafd21dcedea9b6a96a5b05b21e03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 05:46:26 +00:00
TreeHugger Robot
9f831a600b
Merge "Fix TetherSettings crash issue" into udc-dev am: f65da39f37
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23485222
Change-Id: Ia75886edc6211a05645e047bc627a95f923cd6ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 05:02:59 +00:00
ykhung
e2f19b7de9
Update incompatible charger checking rule
...
Bug: 278316711
Test: make test RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge
Change-Id: I8f720bcdf7c0efabc8278913ccf1c0427c857fac
2023-06-01 12:50:47 +08:00
Angela Wang
7df08d69be
Merge "Make Hearing devices preference always visible" into udc-qpr-dev
2023-06-01 02:04:50 +00:00
Pavel Grafov
8112fb3828
Avoid double quiet mode requests
...
Currently when "Work apps" the toggle is tapped in Settings it leads to
UM.requestQuietMode() being called twice via different routes.
Bug: 284915370
Test: atest WorkModePreferenceControllerTest
Change-Id: I5eeb7ecdb10245a32d947ae2430a865bd7a5a60a
2023-05-31 13:56:42 +01:00
Weng Su
086d062cb2
Fix TetherSettings crash issue
...
- When the user is a guest user, the UI will remove all preferences to restrict setting changes. If the ViewModel updates the UI in this situation, it will cause Settings to crash.
- Avoid to setup ViewModel when UI is restricted
Bug: 284435378
Test: Manual test
atest -c TetherSettingsTest
Change-Id: I52d4ea717c34eacc9cc2321e3950dc89408049f8
2023-05-31 20:38:36 +08:00
danielwbhuang
19a5e212de
Use custom action key icon
...
1. get icon from getKeyboardSettingsFeatureProvider
2. set color for it
Bug: 269214138
Test: manual, atest KeyboardSettingsFeatureProviderImplTest
Change-Id: I3a2d47e8230aec1404300b000e8b1fcf221e2a65
2023-05-29 15:38:55 +08:00
Weng Su
25d259e3e2
Restrict SimDialogActivity
...
- Restrict UI if user is a guest
- Restrict UI if user has DISALLOW_CONFIG_MOBILE_NETWORKS
Bug: 262242946
Bug: 271849181
Test: manual test
atest -c SimDialogActivityTest
Change-Id: I227400aa71880895d8356f3d2961cb610ad2a357
2023-05-29 07:03:19 +00:00
Hao Dong
6cb1f9401d
Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-qpr-dev
2023-05-26 20:35:34 +00:00
Treehugger Robot
67b9234806
Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc
am: 24db1f3393
am: 424440670d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956
Change-Id: Ib5975d1e338250b7468f3e37650094eeb5244bad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 20:20:34 +00:00
Treehugger Robot
424440670d
Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc
am: 24db1f3393
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956
Change-Id: I9d29601614b0f166afc898f99e3ee87df974abf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 18:52:36 +00:00
Treehugger Robot
24db1f3393
Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956
Change-Id: Ifa1155d2a3ae19ff743b29b47e088d5d42724f70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 17:44:20 +00:00
Chaohui Wang
97963e8389
Merge "Move unrestricted data summary to DataSaverController" into udc-qpr-dev
2023-05-26 07:50:45 +00:00
TreeHugger Robot
bf08be55a0
Merge "Fixed unable to enable hotspot with Security None" into udc-dev am: 52d2daf3b3
am: 89b497a051
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442438
Change-Id: I1c9beadacb0731dfb425932a077cb7354d924cd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 07:09:34 +00:00
TreeHugger Robot
89b497a051
Merge "Fixed unable to enable hotspot with Security None" into udc-dev am: 52d2daf3b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442438
Change-Id: I46d36e32cdb36b47eaa3c62005e65666c9fe94bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 06:26:29 +00:00
TreeHugger Robot
52d2daf3b3
Merge "Fixed unable to enable hotspot with Security None" into udc-dev
2023-05-26 05:43:02 +00:00
Chaohui Wang
3e35cff7ba
Move unrestricted data summary to DataSaverController
...
DataSaverController currently used in 2 pages,
- Network & internet > Data Saver
- Apps > Special app access
This helps unify the logic, and instead of showing on "Special app
access", this summary shows on "Unrestricted data" is make more sense.
Bug: 280280596
Test: Manually on above pages
Test: Unit test
Change-Id: Ia151ed8179a250f8f20cc5041f9383fffebdab10
2023-05-26 13:05:48 +08:00