Milton Wu
3e8a37f2c7
[BiometricsV2] Remove "Try again" button from errorDialog
...
Remove "Try again" button from fingerprint enrolling error dialog for
biometrics v2.
Test: Manual (Enable biometrics v2, Start enrollment and don't
complete it for 10 minutes; observe the dialog)
Test: atest FingerprintEnrollEnrollingViewModelTest
FingerprintEnrollmentActivityTest
Bug: 280546173
Change-Id: I844786719a41b1a3d0e86ab32b74ab9b5aeaa0a1
2023-05-08 13:50:03 +00:00
Treehugger Robot
6a2d24093f
Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am: fb1cebd7f9
am: 9e7da7aaba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645
Change-Id: I4716b5ae4497002fa1fedd9320af07422483a38e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 11:38:26 +00:00
Treehugger Robot
fb1cebd7f9
Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev
2023-05-08 10:25:06 +00:00
Sunny Shao
b723c4f96a
Fix the updateDialogForCdmaPhone test case failed
...
- This is a side effect of the CL(ag/16379105) which removed the getTextAsDigits API.
- Update the return value as empty string of the TelephonyManager.getImei().
Fixes: 215071948
Test: atest ImeiInfoDialogControllerTest
Change-Id: I790b5dc505ad1a91a951a4c46b241baddea392a1
2023-05-08 14:01:23 +08:00
Milton Wu
8b0fc14f94
[BiometricsV2] Refine fingerprint ui and flow
...
1. Fix "No thanks" become 2 lines, and fix the status when new
fingerprint enrolled.
2. Fix Finish page shows again after pressing back from a new Finish
page
3. Fix FindSensor page shows again after max number of fingerprint
has reached.
4. Add missing tests, and remove some bypass-only tests
Bug: 279134177
Bug: 279380583
Bug: 279386539
Bug: 279394069
Test: atest FingerprintEnrollIntroViewModelTest
FingerprintEnrollFindSensorViewModelTest
FingerprintEnrollEnrollingViewModelTest
FingerprintEnrollmentViewModelTest FingerprintEnrollmentActivityTest
Test: manually test 1, 2, and 3
Change-Id: I3797ceed8e7d6c10a4b4711f8bff8d7f222f0923
2023-05-08 14:00:22 +08:00
Jack He
e64f750f61
Merge changes from topic "LeAudioBeta" into udc-dev am: 2605ccbcfa
am: e188c6c0bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994939
Change-Id: I23d06ed58ed7725bfb1eed931db3ba313291c1b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-06 01:57:41 +00:00
Jack He
2605ccbcfa
Merge changes from topic "LeAudioBeta" into udc-dev
...
* changes:
Hide the LE audio toggle by flag
Add toggle to show/hide the Per Device Enable LE Audio Toggle in Device details
2023-05-06 00:42:40 +00:00
Chaohui Wang
fab8b4d786
Merge "Fix dialog leak in RequestPermissionActivity" into udc-dev am: 5b18837a49
am: 5c437ee03b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012490
Change-Id: I06bfe151516232983621d98785d535dba1423edb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 12:47:34 +00:00
Chaohui Wang
5b18837a49
Merge "Fix dialog leak in RequestPermissionActivity" into udc-dev
2023-05-05 11:32:13 +00:00
Chaohui Wang
39bf7dd530
Fix dialog leak in RequestPermissionActivity
...
Dialog still show when activity destroyed will cause leak.
Dismiss dialog when activity onDestroy to fix this issue.
Fix: 279522922
Test: Manually with "Don't keep activities"
Test: Robolectric Test
Change-Id: I445f4b160020823a6f6e2883055218c1224e2c48
2023-05-05 17:30:02 +08:00
Chaohui Wang
b39729c7aa
Merge "FRP bypass defense in the Settings App for SPA" into udc-dev am: 7c042f374b
am: 48c93451a8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948156
Change-Id: I07bddd6922e9aea9270eeb9d769ee6b63f46dafd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 09:18:56 +00:00
Chaohui Wang
7c042f374b
Merge "FRP bypass defense in the Settings App for SPA" into udc-dev
2023-05-05 07:57:39 +00:00
Daniel Huang
07a0572fa9
Merge "[Fixed] Reverse scrolling setting is reversed" into udc-dev am: 08b2b68e22
am: 319351aaf4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994936
Change-Id: I2e821256729615e2bbe68faa1ec2cd2bda0a8dd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 04:14:38 +00:00
Daniel Huang
08b2b68e22
Merge "[Fixed] Reverse scrolling setting is reversed" into udc-dev
2023-05-05 02:33:13 +00:00
TreeHugger Robot
a2af0ba3d4
Merge "[Settings] Remove WFC enabled state condition of querying Telecomm." into udc-dev am: 3a2b8e81e5
am: 51b4b2dd2e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22961321
Change-Id: I65f4dc56f3d93256e64a1423ed1431191887ae08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 16:05:11 +00:00
TreeHugger Robot
3a2b8e81e5
Merge "[Settings] Remove WFC enabled state condition of querying Telecomm." into udc-dev
2023-05-04 14:57:36 +00:00
Treehugger Robot
36e6a9d491
Merge "Support incompatible charger state in the battery main page" into udc-dev am: 54de6fd80b
am: 94d430b929
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981565
Change-Id: If83a923bf8b1b33ca724a894566e171270302e00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 09:43:49 +00:00
Treehugger Robot
54de6fd80b
Merge "Support incompatible charger state in the battery main page" into udc-dev
2023-05-04 08:28:57 +00:00
Chaohui Wang
0b387d23c2
Merge "Fix SettingsDumpServiceTest" into udc-dev am: 678b1d5fa4
am: f029f96558
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23015997
Change-Id: If11c36598e70dcbc93d41857adbb328dc0968b6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 08:18:31 +00:00
Chaohui Wang
678b1d5fa4
Merge "Fix SettingsDumpServiceTest" into udc-dev
2023-05-04 07:39:14 +00:00
Hao Dong
1c9288fa24
Merge "Call onFaceStrengthChanged() only when authenticators registered." into udc-dev
2023-05-04 07:00:40 +00:00
Hao Dong
6e8434b793
Call onFaceStrengthChanged() only when authenticators registered.
...
Test: atest FaceEnrollIntroductionTest
Test: manually tested face enroll introduction page
Bug: 280384533
Change-Id: Iac9506d8430459aa399ac8efd3f41cbc6e67260d
Merged-In: Iac9506d8430459aa399ac8efd3f41cbc6e67260d
2023-05-04 06:59:53 +00:00
Hao Dong
666d68a17b
Merge "Call onFaceStrengthChanged() only when authenticators registered."
2023-05-04 06:59:44 +00:00
Hao Dong
cb00672359
Call onFaceStrengthChanged() only when authenticators registered.
...
Test: atest FaceEnrollIntroductionTest
Test: manually tested face enroll introduction page
Bug: 280384533
Change-Id: Iac9506d8430459aa399ac8efd3f41cbc6e67260d
2023-05-04 06:59:36 +00:00
ykhung
c234196bc1
Support incompatible charger state in the battery main page
...
https://screenshot.googleplex.com/PrSzAtMAhsyqbsR
Bug: 271775549
Test: make test RunSettingsRoboTests
Change-Id: I0bb912eaab9c8837eaa3a9b998b3ebb5a8e6f99f
2023-05-04 14:57:07 +08:00
Chaohui Wang
e2b9d0680e
Fix SettingsDumpServiceTest
...
SettingsDumpService behavior changed in
Change I9d7fe2e763b9e5840ee76c5eb00bc88288e7ee41
After behavior changed, PrintWriter was wrapped in IndentingPrintWriter,
it's harder to mock the PrintWriter, so check the result directly.
Fix: 280068083
Test: RobolectricTest
Change-Id: I92a7b931c93df4cd9e9c3e47b91a9750df936f15
2023-05-04 14:20:33 +08:00
Tom Hsu
be2bc189a5
Merge "[Settings] Fix NPE from updating subinfo changed." into udc-dev am: 99e03458fa
am: 9f47d30cd2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954342
Change-Id: I39b6f572b83c011d7f3fb8b29fc3864cd37259de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 05:27:39 +00:00
Treehugger Robot
7eb1826cf6
Merge "Fix testNonIndexableKeys_existInXmlLayout" into udc-dev am: e71643efac
am: b3d65a57af
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981573
Change-Id: I2993195910a00b9c87c969f9ad28b44343ac36bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 04:38:49 +00:00
Tom Hsu
99e03458fa
Merge "[Settings] Fix NPE from updating subinfo changed." into udc-dev
2023-05-04 04:21:51 +00:00
Treehugger Robot
e71643efac
Merge "Fix testNonIndexableKeys_existInXmlLayout" into udc-dev
2023-05-04 03:15:40 +00:00
Hiroki Sato
c72e8c1eda
Merge "Don't show bubble settings when framework doesn't support it"
2023-05-04 00:44:43 +00:00
Eric Biggers
1ccf11d582
Merge "ShadowLockPatternUtils: remove patternEverChosen methods"
2023-05-03 18:28:39 +00:00
Becca Hughes
1c5bfbeafd
Merge "Align settings with new mocks" into udc-dev am: 21733fa106
am: 1022918da5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912923
Change-Id: Ica4092467ac4a290b5f1a5ec0f7c7905e3928755
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 17:36:09 +00:00
Patty Huang
f05615f1e8
Add toggle to show/hide the Per Device Enable LE Audio Toggle in Device details
...
Bug: 280020008
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioDeviceDetailsPreferenceControllerTest
Change-Id: I559f34f2b0764c4f566fe1e0c1357929e2c88fb6
2023-05-04 01:26:15 +08:00
Becca Hughes
21733fa106
Merge "Align settings with new mocks" into udc-dev
2023-05-03 16:14:12 +00:00
danielwbhuang
0b79c92348
[Fixed] Reverse scrolling setting is reversed
...
If useTouchpadNaturalScrolling is false, "Reverse scrolling" should be on.
[The API value]
useTouchpadNaturalScrolling: false
[The expected UX behavior]
Reverse scrolling: on
fingers upward, scroll up, content moves down
The description of "useTouchpadNaturalScrolling":
Returns true if moving two fingers upwards on the touchpad should scroll down, which is known as natural scrolling.
The description of "Reverse scrolling":
Content moves up when you scroll down.
Bug: 280047007
Test: manual and passed atest TrackpadReverseScrollingPreferenceControllerTest
Change-Id: Ia5e30fa14b599ddcffae99005114f10412ccad3c
2023-05-03 23:59:55 +08:00
danielwbhuang
bd2d0de0b3
Fix testNonIndexableKeys_existInXmlLayout
...
This test is for LanguageAndInputSettings UI.
Hence, we should set flag "SETTINGS_NEW_KEYBOARD_UI" to false
Bug: 280018738
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER=LanguageAndInputSettingsTest
Change-Id: Ida91a23bb576c81f9618406d54c1d892b23eb4fa
2023-05-03 20:40:53 +08:00
Treehugger Robot
86a449749a
Merge "Reducing slice requesting logging" into udc-dev am: 8060347ec6
am: a785d94839
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22568596
Change-Id: I4b8cde8da24defe54fc7e78ad5f976e90b3f40fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 11:58:50 +00:00
Treehugger Robot
8060347ec6
Merge "Reducing slice requesting logging" into udc-dev
2023-05-03 10:37:24 +00:00
Vania Januar
6857cb3213
Merge "Guard against null input device in StylusDeviceUpdater" into udc-dev am: e78b1f377e
am: e686a77ec9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22894945
Change-Id: Ia3ead3945813be4aca3e91e83f853fa35138c800
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 10:13:59 +00:00
Edgar Wang
fae664c79c
Reducing slice requesting logging
...
Bug: 253684322
Test: rebuild
Change-Id: If0e884875e09bd43b88f6b5f205ad450de488552
2023-05-03 17:04:38 +08:00
Vania Januar
e78b1f377e
Merge "Guard against null input device in StylusDeviceUpdater" into udc-dev
2023-05-03 09:00:56 +00:00
Chaohui Wang
80462c370b
FRP bypass defense in the Settings App for SPA
...
Over the last few years, there have been a number of
Factory Reset Protection bypass bugs in the SUW flow.
It's unlikely to defense all points from individual apps.
Therefore, we decide to block some critical pages when
user doesn't complete the SUW flow.
Fix: 280154358
Test: Unit test
Change-Id: I06e73386711d5ad13c89d033cf0fe3164781c0ef
2023-05-03 10:53:27 +08:00
Eric Biggers
795a02c92a
ShadowLockPatternUtils: remove patternEverChosen methods
...
These methods are being removed from LockPatternUtils because they are
no longer used, so remove them from ShadowLockPatternUtils too.
Bug: 270013005
Change-Id: If196bbef4755c644b3188043ed47e99817bf1856
2023-05-03 00:34:48 +00:00
Becca Hughes
b21df6c5fc
Align settings with new mocks
...
Test: ondevice
Bug: 278919696
Change-Id: I274126bce3616596c4a81dd3385f0844d8bdbf71
2023-05-02 23:50:22 +00:00
Becca Hughes
428811be05
Fork autofill default app selection am: ddf359d0f8
am: 270b54d8a5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912922
Change-Id: I63239ddc7d287a32afc9b686fe83d1aefef8587b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 23:49:18 +00:00
Becca Hughes
ddf359d0f8
Fork autofill default app selection
...
We are merging the default app selection for autofill
with credman so this forks the existing UI (so we can
flag it off).
Test: ondevice
Bug: 278919696
Change-Id: I96bcf1ff86b169a182b9974f7384c45b474c3d5d
2023-05-02 20:31:14 +00:00
Treehugger Robot
1a2d75bb4c
Merge "Add tests for config check in ClonedAppsPreferenceController" into udc-dev am: d624141732
am: a6c44f048b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954943
Change-Id: I8d1ecffc1b8890233ab44a349d2e9ea684e10eed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 15:16:31 +00:00
Treehugger Robot
d624141732
Merge "Add tests for config check in ClonedAppsPreferenceController" into udc-dev
2023-05-02 14:47:48 +00:00
Treehugger Robot
1ff9d7cc34
Merge "Fix battery percentage is inconsistent in settings" into udc-dev am: 3b60e2a9c3
am: f6ba37e583
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948142
Change-Id: Ifbc2f697f1c01683bab16227d5a02e9c3044575b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 14:24:35 +00:00