Derek Jedral
cb9ddfe658
Merge "Remove feature flag for active unlock" into udc-dev am: 9c67ee1eb1
am: 1f01e15499
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23089996
Change-Id: I8c7ad9ce82f2418932672ff591b5de108340aa91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 18:42:26 +00:00
Derek Jedral
a711dc3a06
Merge "Remove feature flag for active unlock" into udc-dev am: 9c67ee1eb1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23089996
Change-Id: Iede1c8c33c9c3999952f363625687482e5980b11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 17:59:27 +00:00
Derek Jedral
9c67ee1eb1
Merge "Remove feature flag for active unlock" into udc-dev
2023-05-09 17:17:11 +00:00
Chaohui Wang
704b8c2dc8
Merge changes I07d964b9,Ifa5928e1 into udc-dev am: 1cc7d75d91
am: 5d8cbe5b2c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081917
Change-Id: I489c1ca7265de61419e06bf3923381105287a61c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:13:04 +00:00
Chaohui Wang
322234a222
Merge changes I07d964b9,Ifa5928e1 into udc-dev am: 1cc7d75d91
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081917
Change-Id: Idcc55f833a72e852233f687f663addc1d1b036f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:50:17 +00:00
Derek Jedral
501f3635dc
Remove feature flag for active unlock
...
Active Unlock was guarded behind a feature flag for two main purposes.
1) To select the unlock intent or biometric failure layout. We've
settled on unlock intent, so we no longer need the biometric failure
codepath.
2) To guard the feature rollout. However, the additional platform guard
is not necessary, since this feature availability is still guarded
based on whether the secure settings are flipped to valid targets.
In order to keep the scope of this CL small, useBiometricFailureLayout
always returns false. Another CL will clean up all areas where it and
useUnlockIntentLayout are referenced.
Test: make RunSettingsRoboTests
Bug: b/280306741
Change-Id: I331afe9654b72249d461007c087e7f81783d7625
2023-05-08 12:46:36 -07:00
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
Chaohui Wang
2901125674
Fix flicker in SIM card page
...
Before fix, the DefaultSubscriptionController will set an empty summary
before data is ready.
Not set the summary before data is ready to fix.
Also fix the ignored tests.
Fix: 277301125
Test: Manual on Mobile Settings
Test: Unit test
Change-Id: I07d964b9f9ce21f8f168cb775eea188e48172c5d
2023-05-08 19:07:28 +08:00
Chaohui Wang
ab8a130674
Clean up DefaultSubscriptionController.getSummary
...
Which is always overridden by subclass after Change
I7d29b58ca5476ae0bb6fe2e04fecb96164cb1ada
This is a no op.
Bug: 277301125
Test: Manually with Mobile Settings
Test: Unit test
Change-Id: Ifa5928e1026b18c33f2bdd51fdcba267249dcee5
2023-05-08 18:56:06 +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
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
76edddc1c5
Merge "[Settings] Remove WFC enabled state condition of querying Telecomm." into udc-dev am: 3a2b8e81e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22961321
Change-Id: I97766d9ecac3a7de66d7d1b66a95264c14049a69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 15:23:05 +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
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
Tom Hsu
f4f0d99add
Merge "[Settings] Fix NPE from updating subinfo changed." into udc-dev am: 99e03458fa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954342
Change-Id: I1bc3947b3319f8ba46c64f8124e74dd91e7a50b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 04:58:06 +00:00
Tom Hsu
99e03458fa
Merge "[Settings] Fix NPE from updating subinfo changed." into udc-dev
2023-05-04 04:21:51 +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
Becca Hughes
6f600f1ddf
Merge "Align settings with new mocks" into udc-dev am: 21733fa106
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912923
Change-Id: I563b006d6eccc442dd63a39bca10a8bd82eb690e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 16:36:54 +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
476e6769eb
Fork autofill default app selection am: ddf359d0f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912922
Change-Id: I52df2333cec85e89f24940c7a463a5ce57f50655
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 22:47:57 +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
tom hsu
21860761e8
[Settings] Remove WFC enabled state condition of querying Telecomm.
...
- Query WFC enabled state by querying Telecomm may have problem.
- Only use ImsMmTelManager API to check WFC enabled state.
Bug: 278108377
Test: atest passed
Change-Id: I6d1122bcf66ed5cd274e99b7b4f13558ab922162
2023-05-02 12:57:35 +00:00
tom hsu
fa0bdabc6a
[Settings] Fix NPE from updating subinfo changed.
...
- Refactor code to avoid NPE.
Bug: 278721219
Test: make passed
Test: atest MobileDataPreferenceControllerTest passed
Change-Id: I1fe57b8835677335ae9102cfff71451060ea4f78
2023-05-02 11:40:12 +00:00
Becca Hughes
7fdbfc7b0e
Revert "Rollback decision to merge by package name"
...
This reverts commit ca542c90cd
.
Reason for revert: product changed mind
Change-Id: Ic4b9275e8f19bf2b3e3e51f09162fb6d45e6a5bf
2023-04-28 21:06:00 +00:00
Tom Hsu
c3f08dcf56
Merge "[Settings] UI part: Add metrics for language" into udc-dev am: bd9263b391
am: 2bc75c0d5d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22788844
Change-Id: Id8451b6b130cfccca0061f8aa9529c0783635641
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 04:06:33 +00:00
Tom Hsu
574483e474
Merge "[Settings] UI part: Add metrics for language" into udc-dev am: bd9263b391
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22788844
Change-Id: I3e1823e82cc1d0a2cdc57652b8de7cbddd3bb2b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 03:17:19 +00:00
Tom Hsu
bd9263b391
Merge "[Settings] UI part: Add metrics for language" into udc-dev
2023-04-28 02:49:59 +00:00
Becca Hughes
c6a74847e4
DO NOT MERGE Hide provider from this list if autofill provider am: 99f1d5448d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22792839
Change-Id: I79a8f47acb16ac995333c7c40a0309c83e67404c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 17:09:06 +00:00
Zoey Chen
cfaa13442c
[Settings] UI part: Add metrics for language
...
Bug: 279915462
Test: atest
Change-Id: Ie13c57b2b398beb48dfe0ac289ec336483575445
2023-04-27 15:55:45 +00:00
Becca Hughes
99f1d5448d
DO NOT MERGE Hide provider from this list if autofill provider
...
Since we are merging the two lists we should
hide the provider from this list to avoid
duplicates.
Test: local & unit
Bug: 279205251
Change-Id: I70ec4a4bda13bdcd5fd8f82f6ba6045e94d5daa9
2023-04-26 21:23:30 +00:00
Becca Hughes
02ca65edaa
Hide provider from this list if autofill provider
...
Since we are merging the two lists we should
hide the provider from this list to avoid
duplicates.
Test: local & unit
Bug: 279205251
Change-Id: I70ec4a4bda13bdcd5fd8f82f6ba6045e94d5daa9
2023-04-26 16:19:51 +00:00
Treehugger Robot
a33d6c5061
Merge "Restart Wi-Fi tethering automatically if configuration change" into udc-dev am: 9cdf565458
am: 03ec360960
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22762556
Change-Id: Ic38356dae643818061a9d06b4b1a81debcc2667a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-26 05:11:01 +00:00
Treehugger Robot
685826a459
Merge "Restart Wi-Fi tethering automatically if configuration change" into udc-dev am: 9cdf565458
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22762556
Change-Id: If81fda473dae436a06b123928e942d19d8e3402d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-26 04:29:15 +00:00
Treehugger Robot
9cdf565458
Merge "Restart Wi-Fi tethering automatically if configuration change" into udc-dev
2023-04-26 03:59:47 +00:00
Fangqiu Su
13fdff36ea
Merge "Update uiautomator references in packages/apps/Settings/tests/unit" am: 233c708436
am: a176782c18
am: 5ed8e6bc0e
am: 6b6044bedb
am: 0f1ca5b569
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558510
Change-Id: Ie741b7c5244982a85336078ceccc606c25fea519
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 17:49:58 +00:00
Matías Hernández
78b7892f2f
Merge "Tweak refresh of notification channel group preferences" into udc-dev am: c49cb1014c
am: b168628c13
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761580
Change-Id: I020f10a1b238245175e299a23bd3c48cdd89a241
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 15:18:40 +00:00
Matías Hernández
cb13bd964d
Merge "Tweak refresh of notification channel group preferences" into udc-dev am: c49cb1014c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761580
Change-Id: I889dff9b16777539e8e8d9775c7ae3fe0bf462e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 14:37:35 +00:00
Matías Hernández
c49cb1014c
Merge "Tweak refresh of notification channel group preferences" into udc-dev
2023-04-25 14:00:14 +00:00
SongFerngWang
539266a2f3
Replace the SlicePreference with Preference am: 794fc58235
am: c054498357
am: c070721d96
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22755956
Change-Id: I69ce2df75d1bee0eb1ad048bc253658e9af2ca62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 09:00:40 +00:00
SongFerng Wang
f929dc6dea
Merge changes from topic "presubmit-am-58603bfd39e0474b9e10a90af62fa3f5" into tm-qpr-dev-plus-aosp am: b0f9c2deae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22755956
Change-Id: I25f24e707f42147d28101ed00da233b37218865e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 06:47:35 +00:00
SongFerngWang
c054498357
Replace the SlicePreference with Preference am: 794fc58235
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22755956
Change-Id: I5e9032624347b27acb02eafd28002744d92b5f2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 06:23:25 +00:00
SongFerng Wang
b0f9c2deae
Merge changes from topic "presubmit-am-58603bfd39e0474b9e10a90af62fa3f5" into tm-qpr-dev-plus-aosp
...
* changes:
[automerge] Replace the SlicePreference with Preference 2p: 794fc58235
Replace the SlicePreference with Preference
2023-04-25 05:52:54 +00:00
Zoey Chen
9c0ae3aa1b
Merge " [Settings] UI part: Add metrics for numbers preferences" into udc-dev am: c31cf3d3b4
am: d14da56ab6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802959
Change-Id: Iac587978bc2de9ea4a1bbdbd6703919119acdbfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 04:51:42 +00:00
Zoey Chen
29efe8eaf7
Merge changes from topic "regional_preference_metrics" into udc-dev am: 1d74998647
am: b37a320ed8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22762358
Change-Id: I8c2c90ccb81c1cc731a899d085b7601c480ef869
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 04:51:21 +00:00
Zoey Chen
d014b55e01
Merge " [Settings] UI part: Add metrics for numbers preferences" into udc-dev am: c31cf3d3b4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802959
Change-Id: Id22c108a702b279e8348f81fb6d84e7dd97501d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 03:25:49 +00:00
Zoey Chen
221a58918c
Merge changes from topic "regional_preference_metrics" into udc-dev am: 1d74998647
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22762358
Change-Id: I10c1d03beb08f2425de8552a7a8d6697ed3b873d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 03:23:46 +00:00
Zoey Chen
c31cf3d3b4
Merge " [Settings] UI part: Add metrics for numbers preferences" into udc-dev
2023-04-25 03:00:20 +00:00
Fangqiu Su
6b6044bedb
Merge "Update uiautomator references in packages/apps/Settings/tests/unit" am: 233c708436
am: a176782c18
am: 5ed8e6bc0e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558510
Change-Id: Ic9bd09f06a4cf29e220b9516846ead6b0e2e634e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 01:55:20 +00:00
Fangqiu Su
a176782c18
Merge "Update uiautomator references in packages/apps/Settings/tests/unit" am: 233c708436
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558510
Change-Id: Ifef3769deeed83ef20214e9ade0b2f3f9000ccfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 00:27:13 +00:00