Jason Chang
848973d300
Fix the Fingerprint enrollment page's title text creates a truncate
...
problem when it needs three lines on the R4 device
Add padding between title and lottie animation, and adjust UDFPS
enroll view top margin.
Bug: 269437675
Test: manually test,
1.Go to Go to Settings > Security > Fingerprint Unlock >
Set up Fingerprint Unlock > How to set up your fingerprint >
Touch & hold the fingerprint sensor ,
then to start enroll fingerprint.
2. Always keep the finger in the same position,
then let the title become a three line description
“Change the position of your fingerprint slightly each time”.
3. Check the UI if it has been fixed.
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings
.biometrics.fingerprint.FingerprintEnrollEnrollingTest"
Change-Id: Ib330e9fbe01b959892f2f9007ce35f5ab107e42e
2023-03-18 03:40:45 +00:00
TreeHugger Robot
36ed451b84
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 3dc2599568 -s ours am: 0230bb216a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132057
Change-Id: I3f0299a878407139aa3f237c143d6e0bf56df5bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 23:34:02 +00:00
TreeHugger Robot
82e7956228
Merge changes from topic "tc_change_23031706_16" into udc-dev am: 7d2143f9ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132057
Change-Id: Ibf67e708f7af6b6f030724752e919e3055e9485c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 23:31:53 +00:00
Bill Yi
e4cbdfe5d4
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7c58d10ebb am: 816a0bbd13 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132057
Change-Id: Iad55015b6971cbe394dd7d8651a4cef74d57dacf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 23:31:51 +00:00
TreeHugger Robot
74d84f1576
Merge changes from topic "tc_change_23031706_17" into udc-dev am: 96d5e1edf6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132058
Change-Id: I167aa48440729ea63cb81cfc864447621ead0434
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 23:30:08 +00:00
Bill Yi
6725be4303
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 59769526e0 am: 14e9cdb4fd -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132058
Change-Id: I62ad965d80766bb9562109fc6133547425aafcb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 23:29:37 +00:00
TreeHugger Robot
0230bb216a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 3dc2599568 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132057
Change-Id: Ie06f53690b26101fe0963a8aee57d94907d9e1eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 23:24:57 +00:00
TreeHugger Robot
3dc2599568
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2023-03-17 23:03:30 +00:00
TreeHugger Robot
7d2143f9ed
Merge changes from topic "tc_change_23031706_16" into udc-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7c58d10ebb
Import translations. DO NOT MERGE ANYWHERE
2023-03-17 23:03:28 +00:00
TreeHugger Robot
96d5e1edf6
Merge changes from topic "tc_change_23031706_17" into udc-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 59769526e0
Import translations. DO NOT MERGE ANYWHERE
2023-03-17 22:56:07 +00:00
Zoey Chen
76bb350c73
[Settings] Do not set text if the fragment is not attached
...
Bug: 273415166
Test: loacl test
Change-Id: I5298727359191d8ce9c4526279faa4e8a3c1df43
2023-03-17 18:14:49 +00:00
SongFerng Wang
866a6b6428
Merge "Update OpenNetworkSelect UI at main thread" into udc-dev am: dbfc04cb2d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22121989
Change-Id: Id2b9d2c0f5467a653c1ace5c219369806d11db12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 18:09:18 +00:00
SongFerng Wang
dbfc04cb2d
Merge "Update OpenNetworkSelect UI at main thread" into udc-dev
2023-03-17 17:43:07 +00:00
Becca Hughes
fb4488ea83
Add subtitle to settings (settings)
...
Allows a credential provider to show a
subtitle/summary underneath the title in
the list of providers.
Test: ondevice & atest
Bug: 253157366
Change-Id: I481da16985027a49ee464623b6db166d941cab55
(cherry picked from commit on googleplex-android-review.googlesource.com host: 6474e01372 )
Merged-In: I481da16985027a49ee464623b6db166d941cab55
2023-03-17 17:29:23 +00:00
Darrell Shi
6352eaf0c0
Merge "Prevent the screen reader box from unexpected scrolling in dream setting page." into tm-qpr-dev am: 34db15a008 am: 2119a2dcf9 am: 5f15e00e07
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517324
Change-Id: Id67b1e19ff8bbfa3bc069ad2f7fb046827e3cce6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 17:27:47 +00:00
Darrell Shi
5f15e00e07
Merge "Prevent the screen reader box from unexpected scrolling in dream setting page." into tm-qpr-dev am: 34db15a008 am: 2119a2dcf9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517324
Change-Id: I38545423c8784f826265ece8aef6a75662cb7549
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 16:50:59 +00:00
Darrell Shi
2119a2dcf9
Merge "Prevent the screen reader box from unexpected scrolling in dream setting page." into tm-qpr-dev am: 34db15a008
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517324
Change-Id: Ib3444fa954cdc2d6a4c179994f36963673b46492
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 16:13:40 +00:00
Darrell Shi
34db15a008
Merge "Prevent the screen reader box from unexpected scrolling in dream setting page." into tm-qpr-dev
2023-03-17 15:47:23 +00:00
Bill Yi
14e9cdb4fd
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 59769526e0
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132058
Change-Id: I74c650a1dc74ebe956bf01f55c33a99593a34057
2023-03-17 13:17:19 +00:00
Bill Yi
816a0bbd13
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7c58d10ebb
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132057
Change-Id: I11219ef573331fc96a958889a2b0d36699a7b869
2023-03-17 13:17:11 +00:00
Betty Chang
07392a5407
Merge "[LE Audio] Set activity for result after scanning the QR code" into udc-dev am: bb2c12b990
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22097102
Change-Id: Id7b44d3e72f1a09134dd2f36497d5bcb7189617a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 11:57:21 +00:00
Betty Chang
bb2c12b990
Merge "[LE Audio] Set activity for result after scanning the QR code" into udc-dev
2023-03-17 11:19:50 +00:00
SongFerngWang
12066c72f9
Update OpenNetworkSelect UI at main thread
...
Bug: 270652395
Test: local test and atest AutoSelectPreferenceControllerTest
Change-Id: Idfc7a07106d552c35a94414bb14eac0fbdc3974f
2023-03-17 18:49:38 +08:00
Pingzhi Wang
417b4a8537
Hide TTS search results if no TTS engine is available
...
If there is no Text-to-speech engine available/installed then
disable page search
Bug: 274007225
Test: Manual
Change-Id: Id734a69e742d9598be6824177d1a7d115ba6e594
2023-03-17 11:25:14 +01:00
Jason Hsu
41987d7df5
Merge "Update the exclamation icon can be announced by screen reader" into udc-dev am: fe9c359367
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22093886
Change-Id: I759f29261d3e9b55f63848844c2c0675e6e6a505
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 07:54:01 +00:00
SongFerng Wang
c9384a7b9c
Merge "Close the dialog activity when user click cancel or background" into udc-dev am: e959be60a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22133443
Change-Id: I501720108e6971f39a6cca615997ae134da7214f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 07:53:31 +00:00
Jason Hsu
fe9c359367
Merge "Update the exclamation icon can be announced by screen reader" into udc-dev
2023-03-17 07:29:02 +00:00
SongFerng Wang
e959be60a9
Merge "Close the dialog activity when user click cancel or background" into udc-dev
2023-03-17 07:13:36 +00:00
changbetty
74dc069d16
[LE Audio] Set activity for result after scanning the QR code
...
Bug: 263554347
Bug: 265281156
Bug: 248409874
Test: manual test
Change-Id: Ia252f29ad9dfdc09266e91cc9ecaa32ed8c749c2
2023-03-17 06:02:08 +00:00
SongFerngWang
07114a6d00
Close the dialog activity when user click cancel or background
...
Bug: 241346100
Test: local test
Change-Id: Id9d931fc8b74ef566ffe3c6135aaf433cd9f770b
2023-03-17 12:37:29 +08:00
Bill Yi
71e954c78b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I79c7f425dac1cd278eface63dc0c3702616bfc88
2023-03-16 20:45:10 -07:00
Bill Yi
82c23db452
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie8640533b71ecdb1baf669edd91ed6df54df8a4d
2023-03-16 20:40:36 -07:00
Bill Yi
59769526e0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I15422a02d7174c3cfc21c00ce39cbde8d0234c8b
2023-03-16 20:29:17 -07:00
Bill Yi
7c58d10ebb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9910d114216f4f3c749fa096cb37e0d843bb82fc
2023-03-16 20:23:48 -07:00
Menghan Li
771028e76b
[automerger skipped] Merge "Update color-check-baseline.xml" into tm-qpr-dev am: 1306ebf737 -s ours am: 2600b1bbc2 -s ours am: 813f654aa1 -s ours
...
am skip reason: Merged-In Ife355166df080ce7371a95b5cea28575227153f0 with SHA-1 f952e89d4b is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22105808
Change-Id: Idd37efaf1da85d58f584f8e7d0f20bcac969e4b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 22:17:16 +00:00
menghanli
1ef86aaa54
[automerger skipped] Update color-check-baseline.xml am: 796fcccd9b -s ours am: 6f478f1a6b -s ours am: dba1c83ed4 -s ours
...
am skip reason: Merged-In Ife355166df080ce7371a95b5cea28575227153f0 with SHA-1 f952e89d4b is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22105808
Change-Id: Ieb3f4673e8229e4ecc58c2288a2e832d317dd608
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 22:16:54 +00:00
Menghan Li
813f654aa1
[automerger skipped] Merge "Update color-check-baseline.xml" into tm-qpr-dev am: 1306ebf737 -s ours am: 2600b1bbc2 -s ours
...
am skip reason: Merged-In Ife355166df080ce7371a95b5cea28575227153f0 with SHA-1 f952e89d4b is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22105808
Change-Id: Id167b7cda9295904f5f8aa173bacaeb7175a9b5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 21:37:43 +00:00
menghanli
dba1c83ed4
[automerger skipped] Update color-check-baseline.xml am: 796fcccd9b -s ours am: 6f478f1a6b -s ours
...
am skip reason: Merged-In Ife355166df080ce7371a95b5cea28575227153f0 with SHA-1 f952e89d4b is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22105808
Change-Id: I3059f4c5bb13108c00abfe3844e45739312ba155
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 21:37:36 +00:00
Menghan Li
2600b1bbc2
[automerger skipped] Merge "Update color-check-baseline.xml" into tm-qpr-dev am: 1306ebf737 -s ours
...
am skip reason: Merged-In Ife355166df080ce7371a95b5cea28575227153f0 with SHA-1 f952e89d4b is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22105808
Change-Id: I204ee5dc7a8861b51d06420c6bb1d4ff7b216c9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 20:59:03 +00:00
menghanli
6f478f1a6b
[automerger skipped] Update color-check-baseline.xml am: 796fcccd9b -s ours
...
am skip reason: Merged-In Ife355166df080ce7371a95b5cea28575227153f0 with SHA-1 f952e89d4b is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22105808
Change-Id: I6a67de10b42d08b3786b01928377d020c8513630
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 20:58:48 +00:00
Michael Groover
da1856f5b1
Merge "Make CheckReturnValue errorprone check a warning for unit tests" into udc-dev am: 8458e7f630
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22121970
Change-Id: Iea42035f8a83fe8b6ff3d22965c08c17ec50631c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 20:58:39 +00:00
Michael Groover
8458e7f630
Merge "Make CheckReturnValue errorprone check a warning for unit tests" into udc-dev
2023-03-16 20:41:12 +00:00
Kweku Adams
eaba347a70
Merge "Revert "Remove duplicate strings."" into udc-dev am: 9a087d6c19
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22106646
Change-Id: I55b37a8eae38e2937160f2bb19fd72fb650f5c97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 20:39:06 +00:00
Menghan Li
1306ebf737
Merge "Update color-check-baseline.xml" into tm-qpr-dev
2023-03-16 20:29:25 +00:00
Kweku Adams
9a087d6c19
Merge "Revert "Remove duplicate strings."" into udc-dev
2023-03-16 20:14:16 +00:00
Julia Reynolds
91ef0f1ee4
Merge "Remove explicit number from string" into udc-dev am: fe310a86de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22121609
Change-Id: I2bf60fbfd1e3b5c1b24a6c9a2fa6e8c205547633
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 20:03:31 +00:00
Julia Reynolds
fe310a86de
Merge "Remove explicit number from string" into udc-dev
2023-03-16 18:52:25 +00:00
Sally
611d1adff3
Update Extra dim banner for tablets
...
The corner radius on top left/bottom right now map to the device frame
Bug: 273553096
Test: manual check of light and dark theme
Change-Id: I8005ecdaa0d96df2e6b73a4e3b791a964f231708
2023-03-16 17:30:31 +00:00
Michael Groover
38819fd906
Make CheckReturnValue errorprone check a warning for unit tests
...
CredentialManagerPreferenceControllerTest now differs between the
current development branch and internal main, and the
CheckReturnValue errorprone is failing in the branches that use
the code from the development branch. Modifying
CredentialManagerPreferenceControllerTest does not resolve this
because it results in merge conflicts, but making this check a
warning in the development branch will allow the fix to reach all
affected branches.
Fixes: 273833063
Test: m RUN_ERROR_PRONE=true SettingsUnitTests
Change-Id: Ia923f0d988b1428cbb7378f33b4703ed19113dcd
2023-03-16 11:31:05 -05:00
Matías Hernández
86508f09f1
Merge "Refresh the app's "Conversations" list when there are none" into udc-dev am: 08893ed0b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22119305
Change-Id: I004e79d313aa29942d8a4762631706b86a2aec87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 16:27:50 +00:00