Commit Graph

120749 Commits

Author SHA1 Message Date
SongFerng Wang
2b26f1314f [automerger skipped] Merge "[Settings] Customizable resource for hiding 3G preferred network type" into tm-qpr-dev am: 2b3cbffffd am: d427c0d2d1 -s ours am: 8153d6c491 -s ours
am skip reason: Merged-In I8092372372cb334b5ac1956b869d194b9fcd0523 with SHA-1 a9717482a7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21551540

Change-Id: I0db8fbac952436a26b36d51aa1e8d4d3d10fa8bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 18:56:43 +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
2300bbd5a8 Merge "Hide BatteryManagerPreference if there is no adaptive charging" into udc-dev am: 4f98350ba3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21736487

Change-Id: Ice2abaa97f4d9b21e5d05c9d6a5c23bf6b7372a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 18:37:53 +00:00
Angela Wang
e49da0f0c6 Merge "Fix duplicated order in notification settings layout" into udc-dev am: 5da8894d9a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578804

Change-Id: Iea0c6c0116d008cbe33200ef8ecb546e96fb1d11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 18:18:20 +00:00
Wenhui Yang
1fc651aee7 Merge "[DO NOT MERGE] Fix tablet verify pin wording" into tm-qpr-dev 2023-03-03 18:07:50 +00:00
SongFerng Wang
8153d6c491 [automerger skipped] Merge "[Settings] Customizable resource for hiding 3G preferred network type" into tm-qpr-dev am: 2b3cbffffd am: d427c0d2d1 -s ours
am skip reason: Merged-In I8092372372cb334b5ac1956b869d194b9fcd0523 with SHA-1 a9717482a7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21551540

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

Change-Id: Id2d541bd387ae9736c1a74a4605d55286387f5c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 17:44:48 +00:00
SongFerng Wang
d427c0d2d1 Merge "[Settings] Customizable resource for hiding 3G preferred network type" into tm-qpr-dev am: 2b3cbffffd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21551540

Change-Id: I30a31add9ce0d6c8493edf162b57d80b03e4ef5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 17:15:07 +00:00
YK Hung
4759c9447f Merge "Update incompatible charging string based on UXR suggestion" into udc-dev am: ffd306e63a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21701046

Change-Id: Ic91d53898891a9140f4844e9567fba6c170acd20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 16:59:47 +00:00
TreeHugger Robot
a8ab02ee7f Merge "Fix checkcolor_hook error" into udc-dev am: 4b4b0cf83b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21692788

Change-Id: I2858864b51bc6b8e3f75b667c8f2e0be609bb4aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 16:57:08 +00:00
Diya Bera
4894495f06 [automerger skipped] Merge "Learn more updated in Fingerprint Settings for side fps" into tm-qpr-dev am: 47cedbde0a am: f3012c6497 -s ours am: 7cb164d0c1 -s ours
am skip reason: Merged-In Ia22fcd1289bec85642993b22fe3cb3ebaf647cbd with SHA-1 5faf4eeb8e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21593025

Change-Id: I98e087a4e69332a89e18ae1946c893c4d5f798ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 16:56:51 +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
Angela Wang
5da8894d9a Merge "Fix duplicated order in notification settings layout" into udc-dev 2023-03-03 08:56:49 +00:00
SongFerng Wang
2b3cbffffd Merge "[Settings] Customizable resource for hiding 3G preferred network type" into tm-qpr-dev 2023-03-03 07:42:51 +00: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
YK Hung
ffd306e63a Merge "Update incompatible charging string based on UXR suggestion" into udc-dev 2023-03-03 03:34:16 +00:00
Diya Bera
23ed65d348 [automerger skipped] Merge "Removed subtext from side fps enrollment flow" into tm-qpr-dev am: 97f99f5d30 am: afa29d5cb8 -s ours am: 63c145445b -s ours
am skip reason: Merged-In Iba4c13e8083ecb92f8033882af9147f14071e726 with SHA-1 7fa342fadb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21613842

Change-Id: I85b3b28b9b3ed4bc7adc5ce1d8b2b5db92a09d30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 02:22:01 +00:00
Chris Li
6cc9ace3d4 Update EmbeddingAspectRatio to the latest am: 81ee016a6e am: 32d271dfb3 am: aabd2ee494
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21673464

Change-Id: If0108316abbd7f185002d821271d603b78cda7bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 02:08:05 +00:00
TreeHugger Robot
4b4b0cf83b Merge "Fix checkcolor_hook error" into udc-dev 2023-03-03 01:52:59 +00:00
Diya Bera
7cb164d0c1 [automerger skipped] Merge "Learn more updated in Fingerprint Settings for side fps" into tm-qpr-dev am: 47cedbde0a am: f3012c6497 -s ours
am skip reason: Merged-In Ia22fcd1289bec85642993b22fe3cb3ebaf647cbd with SHA-1 5faf4eeb8e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21593025

Change-Id: Ieed83b86abaedc2c6f49bc859ee3c51dde81763e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 01:37:20 +00:00
Diya Bera
63c145445b [automerger skipped] Merge "Removed subtext from side fps enrollment flow" into tm-qpr-dev am: 97f99f5d30 am: afa29d5cb8 -s ours
am skip reason: Merged-In Iba4c13e8083ecb92f8033882af9147f14071e726 with SHA-1 7fa342fadb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21613842

Change-Id: Ia1f47a216186d1819d70dfaa89af04a6e3341edc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 01:37:05 +00:00
Diya Bera
f3012c6497 Merge "Learn more updated in Fingerprint Settings for side fps" into tm-qpr-dev am: 47cedbde0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21593025

Change-Id: Ic8b8eea0c25961ccc05b3d344161e1a194104b3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 01:26:01 +00:00
Diya Bera
afa29d5cb8 Merge "Removed subtext from side fps enrollment flow" into tm-qpr-dev am: 97f99f5d30
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21613842

Change-Id: Ia2a62797dd783366a5d2df4494a25d748fac7995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 01:24:11 +00:00
Chris Li
aabd2ee494 Update EmbeddingAspectRatio to the latest am: 81ee016a6e am: 32d271dfb3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21673464

Change-Id: I59f466f5c34469e77455ef7332cd14237ac4162c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 01:20:54 +00: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
Wenhui Yang
07ca5b7e4e [DO NOT MERGE] Fix tablet verify pin wording
Test: Manual - Reset tablet without removing accounts, observe the texts
displayed correctly for tablet. Expanded related for devices.
Fixes: 267539281
Fixes: 270516438

Change-Id: If2ad3692b9fb2c8a374d8e988aac76a7254b8cd6
2023-03-03 00:10:18 +00:00
Diya Bera
47cedbde0a Merge "Learn more updated in Fingerprint Settings for side fps" into tm-qpr-dev 2023-03-02 22:21:12 +00:00
Diya Bera
97f99f5d30 Merge "Removed subtext from side fps enrollment flow" into tm-qpr-dev 2023-03-02 21:22:46 +00:00
Chris Li
32d271dfb3 Update EmbeddingAspectRatio to the latest am: 81ee016a6e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21673464

Change-Id: I45ffde90d1b91b709b6e00622a789722c7cd750f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 20:46:57 +00:00
Diya Bera
27e77d4f8c Merge "Learn more updated in Fingerprint Settings for side fps" into udc-dev am: 4c3ac9b994
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21611408

Change-Id: I4bcb7c7d27561d4ec2272392bd37a812a1011e2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 19:31:47 +00:00
Diya Bera
961b32ca28 Learn more updated in Fingerprint Settings for side fps
Test: Manual - Go to Fingerprint Settings and check the string
Bug: 258338293
Change-Id: Ia22fcd1289bec85642993b22fe3cb3ebaf647cbd
Merged-in: Ia22fcd1289bec85642993b22fe3cb3ebaf647cbd
2023-03-02 19:09:34 +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
327eaf16fb 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
Merged-in: Iba4c13e8083ecb92f8033882af9147f14071e726
2023-03-02 18:42:02 +00:00
Diya Bera
4f9d82de86 Merge "Removed subtext from side fps enrollment flow" into udc-dev am: 36e41dc985
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21673465

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

Change-Id: I1fc12a04726c86a53c87611ff7304014111fe2be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 17:07:59 +00:00
ykhung
03442225a3 Update incompatible charging string based on UXR suggestion
Bug: 246960554
Test: atest
Change-Id: I19ed65d17a538bf6c3c95a121d699e4a1a8ca7b1
2023-03-03 00:50:59 +08: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
Chris Li
81ee016a6e Update EmbeddingAspectRatio to the latest
alwaysAllow() is changed to ALWAYS_ALLOW per API Council feedback.

Bug: 270160592
Test: build
Change-Id: I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0
(cherry picked from commit af2b07b248)
(cherry picked from commit 1092486873)
2023-03-02 15:56:45 +00:00
Vania Januar
4bdff64e80 Show single icon layout for unknown device type in advanced header.
Bug: 270654477
Test: AdvancedBluetoothDetailsHeaderControllerTest
Change-Id: I24a42693a66664caa460d44245a68e3606e98481
2023-03-02 13:37:25 +00:00
Vincent Wang
baa851a640 Merge "Fix Incorrect lottie status on the beginning of enrolling UDFPS" into udc-dev am: 98819227f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21692082

Change-Id: I303f5583775ddb7fa038c4b8e6ae339090f4929c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 13:28:37 +00:00
Sunny Shao
d32647d890 Fix checkcolor_hook error
Bug: 271373417
Test: repo upload OK
Change-Id: I60fd9ec6c6f47c5885bf7176d2143ab8131ea9a5
2023-03-02 21:23:12 +08: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
b5c70634b4 Merge "Handle DEVICE_TYPE_STYLUS in advanced details header." into udc-dev am: 8ba47734ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21673463

Change-Id: I9601d15e4573184f55a2362526d44661632d6f6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 12:21:10 +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
Bonian Chen
28367dae4d [Settings] Customizable resource for hiding 3G preferred network type
Add a customiazble resource for specifying the carriers that avoiding
from showing 3G option within the preferred network type.

Bug: 261615630
Bug: 247995343
Bug: 268564499
Bug: 265147144
Bug: 267433657
Bug: 240176276
Bug: 266724047
Bug: 265147263
Bug: 242017692
Bug: 220998105
Bug: 209835551
Bug: 237837196
Bug: 239318933
Bug: 247996564
Test: local

Merged-In: I8092372372cb334b5ac1956b869d194b9fcd0523
Merged-In: I5c12ad23a240fbe70630855e5f98b5be83912674
Change-Id: I8092372372cb334b5ac1956b869d194b9fcd0523
2023-03-02 10:47:00 +00:00