Commit Graph

47431 Commits

Author SHA1 Message Date
SongFerng Wang
6e4b026138 Merge "Using upper case country code" into udc-dev am: 524b15c627 am: c680bd69c3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809663

Change-Id: Ic14bcd396809aff2522d9c8f935c7abb04bfe6bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 10:39:33 +00:00
SongFerng Wang
524b15c627 Merge "Using upper case country code" into udc-dev 2023-03-07 09:43:30 +00:00
SongFerngWang
d1d1ecc9d3 Using upper case country code
According to the ISO 3166-1, the two letters country code is upper case.

Bug: 271753491
Test: build pass and local test
Change-Id: Ia71cb6de45682407e4d988522c50d83659fe0017
2023-03-07 16:27:36 +08:00
Angela Wang
c325b89877 Merge "Updates to use flash notification settings keys in settings provider" into udc-dev am: ccb009c34f am: 4efb1f47f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21507358

Change-Id: I1d0711035c54f4a80eade62cc1d06c8f31c13d45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 07:50:06 +00:00
Angela Wang
ccb009c34f Merge "Updates to use flash notification settings keys in settings provider" into udc-dev 2023-03-07 06:58:53 +00:00
Tom Hsu
437434f9bc Merge "Add confirmation dialog for system locale change." into udc-dev am: 39129e09d3 am: 358c2d9aaa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21740799

Change-Id: Id6fb6f6b3a7cc3a4a659ff0a8b07e69178917598
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 04:23:45 +00:00
Tom Hsu
39129e09d3 Merge "Add confirmation dialog for system locale change." into udc-dev 2023-03-07 03:31:02 +00:00
Becca Hughes
573e844275 Move CredentialProviderInfo for test/settings (settings)
This is a precusor CL to adding a subtitle for settings
to use so we need to move CPI where it can be used
by settings, atest and CTS.

Test: ondevice & atest & cts
Bug: 253157366
Change-Id: Ief25f562eb5c2ca4438701de8a8e26941a8370a3
2023-03-06 19:07:09 +00:00
Marcelo Arteiro
280915b052 Merge "Automated Token Alignment Android/Material" into udc-dev am: b93f186df4 am: a679d68853
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21480745

Change-Id: I9c266b1924594129a6ccdd6d1df147c7ad05672c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 13:42:51 +00:00
Marcelo Arteiro
b93f186df4 Merge "Automated Token Alignment Android/Material" into udc-dev 2023-03-06 12:46:02 +00:00
Daniel Huang
3cc3fccc68 Merge "Set preference visible to false when there is no keyboard." into udc-dev am: 7f9eba9481 am: c1f32370b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21572781

Change-Id: I9b9ab79bb7ce587115211a00b6737f7ba3115342
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 08:35:22 +00:00
tom hsu
04eae5cc60 Add confirmation dialog for system locale change.
Bug: b/243511340
Test: atest passed.
Change-Id: I7ef4ed4557a1064d078e49a372f11a573b81058a
2023-03-06 16:01:27 +08:00
Daniel Huang
7f9eba9481 Merge "Set preference visible to false when there is no keyboard." into udc-dev 2023-03-06 07:26:57 +00:00
TreeHugger Robot
68c1901636 Merge "Fix icon touch dialog in Enrolling page" into udc-dev am: 3e41d936b3 am: d74803d317
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21736488

Change-Id: Icf00b173d78a5cab227df652b7b4bc8c7f22a133
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 06:29:10 +00:00
TreeHugger Robot
3e41d936b3 Merge "Fix icon touch dialog in Enrolling page" into udc-dev 2023-03-06 05:14:17 +00:00
YK Hung
4364d80786 Merge "Update the incompatible banner tip icon based on UX refinement" into udc-dev am: ba9bd128c7 am: 2691e0b2f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21784767

Change-Id: I95996dcdd4e74b0b7c69a30b60bd04d55031dcda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-05 06:03:47 +00:00
YK Hung
8ee200e8b5 Merge "Add a new config for checking BatteryManager show/hide rule" into udc-dev am: edb03e5535 am: 5c37ab9c6d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21784766

Change-Id: Ib093152c9a45fed127a1e7e99ee8cdc6a8a393d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-05 06:03:34 +00:00
YK Hung
ba9bd128c7 Merge "Update the incompatible banner tip icon based on UX refinement" into udc-dev 2023-03-05 05:17:32 +00:00
YK Hung
edb03e5535 Merge "Add a new config for checking BatteryManager show/hide rule" into udc-dev 2023-03-05 05:12:27 +00:00
ykhung
ecb91b7d36 Update the incompatible banner tip icon based on UX refinement
Bug: 246960554
Test: presubmit & manual
Change-Id: I5fab570e1a8947d70a7923338c4e74caa67bcd2e
2023-03-05 11:30:19 +08:00
ykhung
3ae46cd6ec Add a new config for checking BatteryManager show/hide rule
Bug: 271387663
Test: presubmit
Change-Id: If24b5e6de630afe972ad7ff7af866cb587db0a56
2023-03-05 10:54:01 +08:00
Lucas Dupin
514aeeb058 Merge "Revert "Add discrete contrast UI slider in the setting"" into udc-dev am: f9f6b80efc am: 2aff6c3484
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21733631

Change-Id: I370ec766048281f8cf0cfc7fec3ed7dab51573d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 20:02:53 +00:00
YK Hung
d7b3234962 Merge "Hide BatteryManagerPreference if there is no adaptive charging" into udc-dev am: 4f98350ba3 am: 78be1d4dee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21736487

Change-Id: Ibffa6745725db3cca8d4005b0d3c1a5f842f5fae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 19:59:42 +00:00
YK Hung
106ef93c1c Merge "Update the battery saver scheduler string" into udc-dev am: 8efe31900c am: 04bc21c347
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21701047

Change-Id: Ic61b01af3ff9207598b3ee43cc4b23765717c888
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 19:44:31 +00:00
Lucas Dupin
f9f6b80efc Merge "Revert "Add discrete contrast UI slider in the setting"" into udc-dev 2023-03-03 18:45:22 +00:00
YK Hung
4f98350ba3 Merge "Hide BatteryManagerPreference if there is no adaptive charging" into udc-dev 2023-03-03 12:04:29 +00:00
danielwbhuang
1f3261467d Set preference visible to false when there is no keyboard.
1. Physical keyboard settings should only show up if at least one PK is connected.
2. Update tests.
3. Fix NullPointerException.

Bug: 269983475
Bug: 270109384
Bug: 271357910
Test: atest and manual
Change-Id: If7798587fb386dbf669fc249cab304d91a26879b
2023-03-03 18:16:55 +08:00
Milton Wu
7b817dd0a0 Fix icon touch dialog in Enrolling page
1. Fix icon touch dialog not shown in Enrolling page for SFPS and RFPS
   devices
2. Remove AccessibilityRepository and VibratorRepository because they
   only bypass info w/o actual effect.
3. Add/Refine missing test cases for FingerprintRepositoryTest,
   CredentailModelTest, AutoCredentialViewModelTest,
   FingerprintEnrollEnrollingViewModelTest,
   FingerprintEnrollFindSensorViewModelTest,
   FingerprintEnrollIntroViewModelTest

Bug: 271535048
Bug: 271220339
Test: atest FingerprintEnrollmentActivityTest CredentialModelTest
      FingerprintRepositoryTest AutoCredentialViewModelTest
      FingerprintEnrollEnrollingViewModelTest
      FingerprintEnrollFindSensorViewModelTest
      FingerprintEnrollIntroViewModelTest
Test: Manually test enrollment
Change-Id: I7d1ed935e156bbd41d5da63902683e430fd3fc1f
2023-03-03 17:49:17 +08:00
ykhung
82d5103f07 Hide BatteryManagerPreference if there is no adaptive charging
Fix: 271387663
Test: presubmit
Change-Id: I12c511f17f23b21f6a584d86e854683fba037047
2023-03-03 17:46:27 +08:00
YK Hung
8efe31900c Merge "Update the battery saver scheduler string" into udc-dev 2023-03-03 05:42:08 +00:00
ykhung
b25a824f50 Update the battery saver scheduler string
Fix: 266030870
Test: presubmit
Change-Id: I271f02b6a6044ba39d23e9ad1eb1decebe4eec85
2023-03-03 12:16:29 +08:00
Phil Weaver
64c23fc5cf Revert "Add discrete contrast UI slider in the setting"
This reverts commit fd3911ba29.

Reason for revert: Setting will be re-landed in developer settings. Not currently aligned with other accessibility features.

Change-Id: If896d87b0bd6d5e74422c1919e60d8717d28a1d0
2023-03-03 00:53:07 +00:00
Diya Bera
2cf85af3d0 Merge "Learn more updated in Fingerprint Settings for side fps" into udc-dev am: 4c3ac9b994 am: 4afe665577
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21611408

Change-Id: I103292554e98ea2fd5a3fdd3f09f644bbf19ad80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 20:28:01 +00:00
Diya Bera
4c3ac9b994 Merge "Learn more updated in Fingerprint Settings for side fps" into udc-dev 2023-03-02 19:09:23 +00:00
Diya Bera
aacb08b441 Merge "Removed subtext from side fps enrollment flow" into udc-dev am: 36e41dc985 am: 4f9d82de86
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21673465

Change-Id: I4f4ea29ca7080f143bc7772424c8aadaa8162d8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 17:59:52 +00:00
Jason Chang
9bc3bd1b34 Merge "(2/2) Fix No clear steps for "re-enroll face unlock" into udc-dev am: a441922bdd am: 7f788db206
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21598459

Change-Id: I70503ccc067405ce8592e7619e25a85754f32f7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 17:59:15 +00:00
Diya Bera
36e41dc985 Merge "Removed subtext from side fps enrollment flow" into udc-dev 2023-03-02 17:16:31 +00:00
Jason Chang
a441922bdd Merge "(2/2) Fix No clear steps for "re-enroll face unlock" into udc-dev 2023-03-02 16:24:16 +00:00
Vincent Wang
71945b2919 Merge "Fix Incorrect lottie status on the beginning of enrolling UDFPS" into udc-dev am: 98819227f1 am: baa851a640
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21692082

Change-Id: I1ff4b3ef6dbc5db91d942c034a60f1b7a42dec27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 14:01:49 +00:00
Vincent Wang
98819227f1 Merge "Fix Incorrect lottie status on the beginning of enrolling UDFPS" into udc-dev 2023-03-02 12:55:19 +00:00
Vania Januar
745d4d8879 Merge "Handle DEVICE_TYPE_STYLUS in advanced details header." into udc-dev am: 8ba47734ad am: b5c70634b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21673463

Change-Id: Ie4522cf5b88bb8fab50deda7ab8bdbc3e929e5a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 12:50:42 +00:00
Vania Januar
8ba47734ad Merge "Handle DEVICE_TYPE_STYLUS in advanced details header." into udc-dev 2023-03-02 11:46:58 +00:00
Vincent Wang
3ff1939b59 Fix Incorrect lottie status on the beginning of enrolling UDFPS
Bug: b/271209610
Test: 1. adb root
      2. adb shell setprop sys.fflag.override.settings_biometrics2_enrollment true
      3. Excute fingerprint enroll process & check the state of enroll progress is
         correct
Change-Id: I3cac369e9dcf939a09dce11a7b9e96952bceeee8
2023-03-02 07:24:43 +00:00
Jason Chang
c3fae47144 (2/2) Fix No clear steps for "re-enroll face unlock
When the user has face id registered but failed enrolling in
device lock state, lead users directly to the confirm deletion
dialog in Face Unlock settings.
- When receiving a face id re-enroll extra intent data, lead users
directly to the confirm deletion dialog in Face Unlock settings.

Bug: 233069240

Test: manually force enrolling face id fail, then doing test steps:
1. Receive notification that face unlock needs to be re-enrolled
2. Tap it then entering device
3. Check if showing the confirm deletion dialog in Face Unlock
settings.

Change-Id: I4eb09cf4a7d92a1dd9866c5c8b938aeb8c7eddf5
2023-03-02 06:53:31 +00:00
Jason Chiu
1c4d1ca19a Merge "Eliminate the injection flicker while navigating back" into udc-dev am: bfd3c051be am: 207b47c696
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21659505

Change-Id: Ib8402b47391f59f505b82040fa6eebb3b4eec56e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 03:47:09 +00:00
Angela Wang
0dc987ef80 Merge "Applies feature flag on Flash Notifications" into udc-dev am: aa9f7660c8 am: 022b41c2b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21508166

Change-Id: I2ff4ff52f03502e9c04d8b450970ba6e06385ae1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 02:44:58 +00:00
Jason Chiu
bfd3c051be Merge "Eliminate the injection flicker while navigating back" into udc-dev 2023-03-02 02:34:14 +00:00
Angela Wang
aa9f7660c8 Merge "Applies feature flag on Flash Notifications" into udc-dev 2023-03-02 01:53:27 +00:00
Diya Bera
7fa342fadb Removed subtext from side fps enrollment flow
Test: Manual (Try to enroll your fingerprint in a side fps device, and
observe that there is no subtext in landscape mode)
Bug: 267271891

Change-Id: Iba4c13e8083ecb92f8033882af9147f14071e726
2023-03-01 23:17:27 +00:00
Hao Dong
9c1fb8d05f Merge "Do not announce a11y move instructions in sensor area." into udc-dev am: b48c247ef9 am: 528bd9781e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21617790

Change-Id: I7f740224bb449abb3447bed86a2dd5b7a871d868
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 23:03:13 +00:00