Commit Graph

121823 Commits

Author SHA1 Message Date
Grace Cheng
ff0fa142f4 Merge "Update locked device icon in FingerprintEnrollIntroduction" into tm-qpr-dev am: e9c795c96b am: 59992bbbb8 am: 387c36968b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22086565

Change-Id: Ifebc427b74a8008320d8691689042e2e7bb31084
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-18 07:59:48 +00:00
Grace Cheng
387c36968b Merge "Update locked device icon in FingerprintEnrollIntroduction" into tm-qpr-dev am: e9c795c96b am: 59992bbbb8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22086565

Change-Id: I12a196c7c0b630885af8ebb820be6ef45177ef55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-18 07:22:02 +00:00
Grace Cheng
59992bbbb8 Merge "Update locked device icon in FingerprintEnrollIntroduction" into tm-qpr-dev am: e9c795c96b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22086565

Change-Id: I67dfb8b2e904668b7236187d727f4eae38720888
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-18 06:43:39 +00:00
Grace Cheng
e9c795c96b Merge "Update locked device icon in FingerprintEnrollIntroduction" into tm-qpr-dev 2023-03-18 06:18:32 +00:00
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
Bill Yi
edc87d7950 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: cb5f2a5316 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idb6bd84fe1245c3310ada6c42a31377ddab67628
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-18 02:01:28 +00:00
Bill Yi
19f97147b9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a2956d8f6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I738c8187ffa3298186d8182da1abdb8795827fa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-18 02:01:25 +00:00
Bill Yi
9afa1a07a4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 3bcb58f7cd -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id732e12247b11b3f7e15bcc0b02a3ec02a24fb81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-18 02:01:22 +00:00
Bill Yi
5e635fcaa8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2dbe4ce5e3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0f1bfdcc83d489d5e6a7a1700e2cbfa2e1fa8965
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-18 02:01:06 +00:00
Bill Yi
a2197093e1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 7879f2d529 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic7482ee953f37d330ce2a2d6bf24d58ca0bcab0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-18 02:00:46 +00:00
Bill Yi
ca40598f6f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 62b0143cf5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If4d1c5c60dc0b73e58d243ccc113acb6fd7d1636
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-18 02:00:29 +00:00
Bill Yi
cb5f2a5316 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-03-18 01:18:29 +00:00
Bill Yi
3bcb58f7cd Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-03-18 01:18:29 +00:00
Bill Yi
7879f2d529 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-03-18 01:18:29 +00:00
TreeHugger Robot
6626647a22 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 3dc2599568 -s ours am: 0230bb216a -s ours am: 71e0457e8d -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: I613e240da9e0ea7e67abe81f75b5508b0c23e360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-18 00:25:17 +00:00
TreeHugger Robot
0812eb44b4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 3dc2599568 -s ours am: 0230bb216a -s ours am: 36ed451b84 -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: I320c7adda3891f7446425a97b8e051fbb06da986
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-18 00:04:08 +00:00
TreeHugger Robot
71e0457e8d [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: Ib00769119b011b725eeefbe09b412df7272aaeba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 23:46:55 +00:00
TreeHugger Robot
5f71828a8b Merge changes from topic "tc_change_23031706_16" into udc-dev am: 7d2143f9ed am: 82e7956228
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132057

Change-Id: I9c0cdbc10f1d3b7fc1261b57906092e6d45afdaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 23:45:21 +00:00
Bill Yi
328324d92a [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7c58d10ebb am: 816a0bbd13 -s ours am: e4cbdfe5d4 -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: Idf24e341780478b53cc9f7a35ec8225e2602b8a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 23:45:19 +00:00
TreeHugger Robot
4775c4d2e4 Merge changes from topic "tc_change_23031706_17" into udc-dev am: 96d5e1edf6 am: 74d84f1576
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132058

Change-Id: Ia53fb8d71821853f9023ec5f63090ff7a4e93f49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 23:44:52 +00:00
Bill Yi
29d1aebe67 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 59769526e0 am: 14e9cdb4fd -s ours am: 6725be4303 -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: Ie81ddc3f7651a8d02996e2c374e32af423e1eb91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 23:44:48 +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
4391293af3 Merge changes from topic "tc_change_23031706_16" into udc-dev am: 7d2143f9ed am: e384716d01
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132057

Change-Id: I32cb93e955b6f122bc6ab5c1044bb3a96df59a1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 23:32:40 +00:00
Bill Yi
ff2d0f6de9 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7c58d10ebb am: 816a0bbd13 -s ours am: cb8d478c8a -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: I26ea72fd50b4da0efa88d143643d353d5f9986fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 23:32:37 +00:00
TreeHugger Robot
d9a965ea98 Merge changes from topic "tc_change_23031706_17" into udc-dev am: 96d5e1edf6 am: 75118dc01e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22132058

Change-Id: Ia7f16929d47b022bd33cfa06b5f63fb670444737
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 23:32:01 +00:00
Bill Yi
b63a222a91 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 59769526e0 am: 14e9cdb4fd -s ours am: 471a7e486f -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: Id95c9cf3e2d896944841e6bf675627800392758f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 23:31:59 +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
e384716d01 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: I409ed99c7cb3f4e15355fe46d57e647013ac600b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 23:15:53 +00:00
Bill Yi
cb8d478c8a [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: I07847adec48311d31838af98789508fc35c05c26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 23:15:48 +00:00
TreeHugger Robot
75118dc01e 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: I151448763d9e0707b51aeb77ece6a6e072089cf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 23:13:03 +00:00
Bill Yi
471a7e486f [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: I4a1e65bca77d0f8e165ddf185b29a527727ebcd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 23:13:00 +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
SongFerng Wang
5a089ceb8d Merge "Update OpenNetworkSelect UI at main thread" into udc-dev am: dbfc04cb2d am: 866a6b6428
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22121989

Change-Id: Ia2ec17628aedb76d258b5b602f9febf4fe7133fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 18:27:18 +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
Automerger Merge Worker
f1912c8cfa Merge "Merge "Update OpenNetworkSelect UI at main thread" into udc-dev am: dbfc04cb2d am: 20d9a4e371" 2023-03-17 18:07:16 +00:00
SongFerng Wang
afdd74ef7a Merge "Update OpenNetworkSelect UI at main thread" into udc-dev am: dbfc04cb2d am: 20d9a4e371
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22121989

Change-Id: I5f5df3c27b268892e6be2dafc2043012086329f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 18:07:12 +00:00
Darrell Shi
2784438a84 [automerger skipped] Merge "Prevent the screen reader box from unexpected scrolling in dream setting page." into tm-qpr-dev am: 34db15a008 am: 2119a2dcf9 am: 5f15e00e07 am: 6352eaf0c0 -s ours
am skip reason: Merged-In I66a70d6b12bd3a2766e6879cb27c68a851d1dd87 with SHA-1 1b6ab7ec90 is already in history

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

Change-Id: I42f5ce40b81f2cb4dc20c57e8fd9ee5c6615f367
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 18:07:05 +00:00
Darrell Shi
b8471dded5 [automerger skipped] Merge "Prevent the screen reader box from unexpected scrolling in dream setting page." into tm-qpr-dev am: 34db15a008 am: 2119a2dcf9 am: 5f15e00e07 am: ce5c4d3cea -s ours
am skip reason: Merged-In I66a70d6b12bd3a2766e6879cb27c68a851d1dd87 with SHA-1 edfd262be2 is already in history

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

Change-Id: Ia0994c40596a03d2f93192c0579f317711550224
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 18:06:37 +00:00
SongFerng Wang
20d9a4e371 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: I461d82905fd12a886cb1bba9d3517a223edb0b75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 17:48:30 +00:00
SongFerng Wang
dbfc04cb2d Merge "Update OpenNetworkSelect UI at main thread" into udc-dev 2023-03-17 17:43:07 +00:00
Darrell Shi
ce5c4d3cea 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: I3daf4bcf4becdf86996fbcf0efccb58df0168997
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 17:40:57 +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