Joshua Mccloskey
83102ab0a2
Merge "Updated Fingerprint enrollment logging"
2021-01-08 19:11:51 +00:00
TreeHugger Robot
4419633fb1
Merge "Expose role API for Settings on RoleManager."
2021-01-08 18:48:37 +00:00
Bill Yi
e5f17d9b91
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d5c247dbf -s ours am: 834bce20d7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13306223
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I588abee420f9f42423ee8b026fd7507f9aae3c95
2021-01-08 18:30:18 +00:00
Bill Yi
834bce20d7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d5c247dbf -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13306223
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ife4a611a82a86cb6ed3236ed244cb691d48ea985
2021-01-08 18:00:46 +00:00
TreeHugger Robot
2fbfc6f57a
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-01-08 17:38:59 +00:00
TreeHugger Robot
c81a929f65
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-01-08 17:15:13 +00:00
Bill Yi
1d5c247dbf
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic94d377a34a4c4e4df254418e06023ef13abb5b8
2021-01-08 07:36:39 -08:00
Bill Yi
b11aa0bce4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8ff6eb1cf9c0da480e9fcbf23d12f3e20d522f5f
2021-01-08 15:00:28 +00:00
Bill Yi
ed27135cc9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3e54272d727177238bf945b3415fa8ac3f4cda4a
2021-01-08 14:31:21 +00:00
Jason Hsu
606e8b1f88
Merge "Fix crash when rotating the device on magnification mode dialog"
2021-01-08 13:13:28 +00:00
TreeHugger Robot
1d4857d8dd
Merge "Animate the search bar expansion"
2021-01-08 12:51:38 +00:00
Edgar Wang
d5e9dbb878
Merge "Make Autofill category in developer options can not be search"
2021-01-08 12:47:29 +00:00
Treehugger Robot
4fa8813f8b
Merge "Fix too many receivers Exception" am: 2e6cde6b94 am: 8c2b2cc806 am: f83f554a75
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1498417
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I994084cd157a33e74a07525e6dd61229069fbdd7
2021-01-08 10:40:56 +00:00
Treehugger Robot
f83f554a75
Merge "Fix too many receivers Exception" am: 2e6cde6b94 am: 8c2b2cc806
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1498417
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iac11b0261e6c2323558d974e7e81788c54661029
2021-01-08 10:14:26 +00:00
Treehugger Robot
8c2b2cc806
Merge "Fix too many receivers Exception" am: 2e6cde6b94
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1498417
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id69d676c8386f74a7e642984ea7387baacd2711c
2021-01-08 09:22:52 +00:00
Tsung-Mao Fang
902a3469f0
Animate the search bar expansion
...
Enable the transition between Settings app and Settings Search
Test: Record the transition video and confirm it.
Fix: 175764903
Change-Id: I95125fba17bbf517feee9a10fd828ff8017f7106
2021-01-08 07:48:54 +00:00
Fan Zhang
80c7251526
Switch to use EmergencyNumberUtils to update e-number.
...
The backend storage choice is delegated to EmergencyNumberUtils. Using
the utils class abstrats underlying details away from Settings app.
Bug: 177006940
Test: manual
Change-Id: I78c5ef79e141e3609ab9d10e558803457b617911
2021-01-07 22:45:39 -08:00
Treehugger Robot
2e6cde6b94
Merge "Fix too many receivers Exception"
2021-01-08 05:35:46 +00:00
TreeHugger Robot
6f74b9a5dd
Merge "Update the message for FingerprintEnrollIntroduction"
2021-01-08 05:34:46 +00:00
TreeHugger Robot
75e2af7645
Merge "Add the mutability flag to the pendingIntent"
2021-01-08 05:26:31 +00:00
Bryan Ferris
43f8e3bb7c
[automerger skipped] Merge "RESTRICT AUTOMERGE Update String" into pi-dev am: 8a79a4314d -s ours am: 12033fe425 am: f5477b05d9 -s ours am: 857f330841 am: 421dce1928 am: 1b11dbe557 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276368
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibc4191676c34c961d88c9da0fff2c18a85e23476
2021-01-08 05:05:24 +00:00
Bryan Ferris
538af12904
[automerger skipped] Merge "RESTRICT AUTOMERGE Update String" into pi-dev am: 8a79a4314d -s ours am: 12033fe425 am: f5477b05d9 -s ours am: 857f330841 am: 24390f2449 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276368
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9e2b0a6f8ee26c300a58d70b94eb409d6568a542
2021-01-08 04:17:04 +00:00
Bryan Ferris
1b11dbe557
[automerger skipped] Merge "RESTRICT AUTOMERGE Update String" into pi-dev am: 8a79a4314d -s ours am: 12033fe425 am: f5477b05d9 -s ours am: 857f330841 am: 421dce1928
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276368
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifc4696861836d97e73a376f20280a16cc6f236ca
2021-01-08 04:16:46 +00:00
TreeHugger Robot
66363d707f
Merge "[Provider Model] Replace WiFi panel to Internet panel"
2021-01-08 03:57:19 +00:00
Bryan Ferris
24390f2449
[automerger skipped] Merge "RESTRICT AUTOMERGE Update String" into pi-dev am: 8a79a4314d -s ours am: 12033fe425 am: f5477b05d9 -s ours am: 857f330841
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276368
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1670f28e87a1838b128d47fd09db8688e6d77605
2021-01-08 03:54:30 +00:00
Bryan Ferris
421dce1928
[automerger skipped] Merge "RESTRICT AUTOMERGE Update String" into pi-dev am: 8a79a4314d -s ours am: 12033fe425 am: f5477b05d9 -s ours am: 857f330841
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276368
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1b1f1188958d52b025bd67bc27c847725b38598f
2021-01-08 03:53:39 +00:00
Bryan Ferris
857f330841
[automerger skipped] Merge "RESTRICT AUTOMERGE Update String" into pi-dev am: 8a79a4314d -s ours am: 12033fe425 am: f5477b05d9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276368
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I41680fe10178c008dbf5a173f8c73892cb49422d
2021-01-08 03:17:10 +00:00
Julia Reynolds
60633f6253
Merge "Allow notification filtering per listener."
2021-01-08 03:14:52 +00:00
Bryan Ferris
f5477b05d9
[automerger skipped] Merge "RESTRICT AUTOMERGE Update String" into pi-dev am: 8a79a4314d -s ours am: 12033fe425
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276368
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie1e8ff34d2a4976e89d5cbe03db797156dc764e5
2021-01-08 02:56:12 +00:00
Bryan Ferris
12033fe425
[automerger skipped] Merge "RESTRICT AUTOMERGE Update String" into pi-dev am: 8a79a4314d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276368
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I23717e289650bb8996db1e51e601b78515cdd81b
2021-01-08 02:12:14 +00:00
Bryan Ferris
8a79a4314d
Merge "RESTRICT AUTOMERGE Update String" into pi-dev
2021-01-08 01:35:51 +00:00
TreeHugger Robot
bd56b6ba62
Merge "Add a few native setting items to safety page"
2021-01-07 22:59:10 +00:00
TreeHugger Robot
76c649968f
Merge "Add a empty page to host Safety/emergency settings"
2021-01-07 22:39:06 +00:00
Steven Liu
24267318a2
Merge "Fix the unit test failure of WifiPickerTrackerHelperTest"
2021-01-07 22:18:51 +00:00
joshmccloskey
75587638ff
Updated Fingerprint enrollment logging
...
Test: Verified regular fingerprint enrollment correctly logged
enrollment.
Test: Verified that the find fingerprint sensor activity no longer
falsely reports a failed enrollment.
Bug: 175316123
Fingerprint enrollment shows a find sensor screen which makes a call to
FingerprintManager.enroll(), the purpose is to get the user to locate
the sensor. The consequence was that logging built into the framework
was incorrectly logging a failed enrollment after cancellation.
Change-Id: I4777613fe521f04cc97c471e0a1e85e5809d7f06
2021-01-07 13:53:27 -08:00
Fan Zhang
e98055b960
Add a few native setting items to safety page
...
* Emergency info
* Emergency sos
* WEA
The pages are not removed from their old place yet, because the new
safety page is not yet visible to users.
https://screenshot.googleplex.com/92VGQxR4ocuiutj.png
Bug: 175158310
Test: manual
Change-Id: I0484f1724e626c8de822460844b5a4c93b7ff815
2021-01-07 20:28:25 +00:00
Fan Zhang
9b1fb77b54
Add a empty page to host Safety/emergency settings
...
The page will eventually be displayed on settings root. It's currently
disabled to avoid QA/dogfood confusion, as the page is pretty empty at
this point.
Bug: 175158310
Test: manual only. Skipped robolectric because the page is pretty empty.
Will add more test as we build business logic.
Change-Id: I80f193f6e90b89ab0c37d0f23f7174e4ba86c091
2021-01-07 10:56:32 -08:00
TreeHugger Robot
f005055ee7
Merge changes Ib9a3c4fa,Idc6ef558 into qt-dev am: c0cd669bef am: af29a157db am: 0b9260031d am: b9faf1cd4a am: 072b5f4bda am: 8c2cbae90a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3ed92e870cd436bfaff9f9d8b12a6c89ebfac00d
2021-01-07 18:55:53 +00:00
Hugh Chen
bca973fed2
[automerger skipped] RESTRICT AUTOMERGE Update String am: 19aeca103d am: 5108e1bd83 -s ours am: 13a927cb9c am: b16061d3ad am: b21ad75989 am: 99b1567fc2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2f3022d5322a7edfc0c3ebd344b1f8beecc19a05
2021-01-07 18:55:51 +00:00
Hugh Chen
b8d3b5abc6
[automerger skipped] RESTRICT AUTOMERGE Update String am: 48ec74592d -s ours am: 57358903b3 -s ours am: 77d2c798e5 am: 84f9417fa2 -s ours am: fc0292dc19 am: 724278a1fa am: 0dd7f8dbef am: 5338b30942 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275407
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I72d5a0a5caf5d29c4fe00b5bd304a18ccb372011
2021-01-07 18:55:42 +00:00
Hugh Chen
3085b7ddf4
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 9037e43fa8 -s ours am: d6bc0a328f -s ours am: 5036eee733 am: 535f5ba053 -s ours am: d62def70c7 am: bfd2571c3b am: 28243b2996 am: 6591058f84 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275406
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic47215debf6c0338033d4fdf35fcc551b9e4961f
2021-01-07 18:55:41 +00:00
TreeHugger Robot
cf178bd57b
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into pi-dev am: 1a6a1b12ef -s ours am: c5f7e582b4 am: 5bd40911f5 -s ours am: 6bae86bec6 am: 7ff97d7703 am: 17fd90a341 am: 0dd34e2c31 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276367
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia406b5fc64256c6657f996bbe9e176d1b1065771
2021-01-07 18:55:30 +00:00
Hugh Chen
daeb680c44
[automerger skipped] RESTRICT AUTOMERGE Update String am: 085f70d48d am: 4b22b601f7 am: 26623c9572 am: cb79c659b5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275411
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia93bc51daa8881b24b9deb4c66ae5bc2a5c024c0
2021-01-07 18:55:22 +00:00
Hugh Chen
b6e7632fc5
[automerger skipped] DO NOT MERGE: resolve merge conflicts of c17ec818af to rvc-qpr-dev am: dc2b694a54 -s ours am: 9d153e6331 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13278059
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I509b0b17ff15db95e2a89b7578df24521008d14e
2021-01-07 18:55:14 +00:00
TreeHugger Robot
8c2cbae90a
Merge changes Ib9a3c4fa,Idc6ef558 into qt-dev am: c0cd669bef am: af29a157db am: 0b9260031d am: b9faf1cd4a am: 072b5f4bda
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I43d14c1a953f1ae7183acfddd88bf0384f5637f5
2021-01-07 18:31:47 +00:00
Hugh Chen
99b1567fc2
[automerger skipped] RESTRICT AUTOMERGE Update String am: 19aeca103d am: 5108e1bd83 -s ours am: 13a927cb9c am: b16061d3ad am: b21ad75989
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I29353db2b0e9063601aaa8d69baa037c146b943a
2021-01-07 18:31:46 +00:00
Hugh Chen
5338b30942
[automerger skipped] RESTRICT AUTOMERGE Update String am: 48ec74592d -s ours am: 57358903b3 -s ours am: 77d2c798e5 am: 84f9417fa2 -s ours am: fc0292dc19 am: 724278a1fa am: 0dd7f8dbef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275407
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I98f1e8a2518ee278963fd4f63edf7b043445dd14
2021-01-07 18:31:37 +00:00
Hugh Chen
6591058f84
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 9037e43fa8 -s ours am: d6bc0a328f -s ours am: 5036eee733 am: 535f5ba053 -s ours am: d62def70c7 am: bfd2571c3b am: 28243b2996
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275406
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I74b19a40f47bf2c67ba55cbd9c158c34320a75b8
2021-01-07 18:31:36 +00:00
TreeHugger Robot
0dd34e2c31
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into pi-dev am: 1a6a1b12ef -s ours am: c5f7e582b4 am: 5bd40911f5 -s ours am: 6bae86bec6 am: 7ff97d7703 am: 17fd90a341
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276367
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I82d2b0993fcd5c12491f43453cbb94479caf911f
2021-01-07 18:31:23 +00:00
Hugh Chen
cb79c659b5
RESTRICT AUTOMERGE Update String am: 085f70d48d am: 4b22b601f7 am: 26623c9572
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275411
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I84520568c24220945c1ce226bafb82f7a40367af
2021-01-07 18:31:16 +00:00
