Commit Graph

88892 Commits

Author SHA1 Message Date
TreeHugger Robot
46bcf5ae17 Merge "Remove "Require all non-trusted certificate statuses" option" into sc-dev 2021-06-14 17:01:00 +00:00
Joe Bolinger
b32bae8c3c Merge "Delay invoking biometric prompt." into sc-dev am: a72230977d am: 0f32ee6122 am: 4df9a8cd58
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14925234

Change-Id: I54a9bff34f9154856e0ea969d6539a9851c83c77
2021-06-14 16:54:22 +00:00
Joe Bolinger
4df9a8cd58 Merge "Delay invoking biometric prompt." into sc-dev am: a72230977d am: 0f32ee6122
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14925234

Change-Id: I48cd41ff03a3726ec0185d686907acb4912231eb
2021-06-14 16:51:46 +00:00
Joe Bolinger
d90c8bc2df Merge "Delay invoking biometric prompt." into sc-dev am: a72230977d am: 78a129a37a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14925234

Change-Id: Ia670341cb8625fac37e008b19e1f18a4ff21911c
2021-06-14 16:51:45 +00:00
Joe Bolinger
2ddba89db0 Merge "Delay invoking biometric prompt." into sc-dev am: a72230977d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14925234

Change-Id: I0530719ce6fd63e18b1c0848d3a9bf63bcf6a79f
2021-06-14 16:51:19 +00:00
Joe Bolinger
78a129a37a Merge "Delay invoking biometric prompt." into sc-dev am: a72230977d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14925234

Change-Id: Icca31b9cfd6234b79c45e9fef7447d613516a87c
2021-06-14 16:39:01 +00:00
Joe Bolinger
0f32ee6122 Merge "Delay invoking biometric prompt." into sc-dev am: a72230977d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14925234

Change-Id: I74478f61878eaf445e5bf5285d43ec40666d5e28
2021-06-14 16:38:34 +00:00
Joe Bolinger
a72230977d Merge "Delay invoking biometric prompt." into sc-dev 2021-06-14 16:38:08 +00:00
TreeHugger Robot
a1ae8e6244 Merge "Remove the divider on "Pair new device"." into sc-dev am: c7f8315e66 am: b746b4bd85 am: 08bd584aee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934757

Change-Id: I1c580ffda6ad8a555bfc6ec4c6c8c3b1c4c60312
2021-06-14 08:52:30 +00:00
TreeHugger Robot
0c652d3dc6 Merge "Remove the divider on "Pair new device"." into sc-dev am: c7f8315e66 am: 39f7fb0256 am: 66b3a69422
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934757

Change-Id: Ibb07303e1368bb9ad5ea65c8a591d99628ddf1d4
2021-06-14 08:52:23 +00:00
TreeHugger Robot
08bd584aee Merge "Remove the divider on "Pair new device"." into sc-dev am: c7f8315e66 am: b746b4bd85
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934757

Change-Id: Id344fbb2112ffa39bb1ceed0a62bc75a111cda32
2021-06-14 08:40:11 +00:00
TreeHugger Robot
66b3a69422 Merge "Remove the divider on "Pair new device"." into sc-dev am: c7f8315e66 am: 39f7fb0256
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934757

Change-Id: I56c0d770813638d5b68f760d69472159d92eb846
2021-06-14 08:39:51 +00:00
TreeHugger Robot
4f77286399 Merge "Remove the divider on "Pair new device"." into sc-dev am: c7f8315e66 am: 0eb7f0a33f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934757

Change-Id: I9c966c25335235953d5414bd531b68563469345c
2021-06-14 08:39:27 +00:00
TreeHugger Robot
39f7fb0256 Merge "Remove the divider on "Pair new device"." into sc-dev am: c7f8315e66
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934757

Change-Id: I7e3164ccbf9effe18d2ff8dddc8760d00baa45b0
2021-06-14 08:24:53 +00:00
TreeHugger Robot
0eb7f0a33f Merge "Remove the divider on "Pair new device"." into sc-dev am: c7f8315e66
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934757

Change-Id: Ie7cbb8b8d5415f0389ead397b78a01f1600ba79a
2021-06-14 08:24:05 +00:00
TreeHugger Robot
b746b4bd85 Merge "Remove the divider on "Pair new device"." into sc-dev am: c7f8315e66
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934757

Change-Id: Ia26f10e65d91fb7f0450dd98a6d8bd366d2efcae
2021-06-14 08:23:59 +00:00
TreeHugger Robot
c7f8315e66 Merge "Remove the divider on "Pair new device"." into sc-dev 2021-06-14 08:09:16 +00:00
PETER LIANG
5c28524e8a Merge changes from topic "a11y_image_preference_bc" into sc-dev am: a96c844df5 am: ec7f4821b2 am: 511c02c55f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928754

Change-Id: I101e15877d00b44d32476d89775e0f9e6609218d
2021-06-14 03:35:55 +00:00
PETER LIANG
64650a8f7d Merge changes from topic "a11y_image_preference_bc" into sc-dev am: a96c844df5 am: a989ce32ec am: 7f49a0282a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928754

Change-Id: Ifcdb5057e7e5ddfe9f9ec92595847ec05594fe90
2021-06-14 03:35:40 +00:00
PETER LIANG
511c02c55f Merge changes from topic "a11y_image_preference_bc" into sc-dev am: a96c844df5 am: ec7f4821b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928754

Change-Id: Ica0e7784ffc3b84f5ee8901d3d2b3ea2114dbb19
2021-06-14 03:30:35 +00:00
PETER LIANG
2ef3b0b264 Merge changes from topic "a11y_image_preference_bc" into sc-dev am: a96c844df5 am: 39911eee17
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928754

Change-Id: Ib2e1225408a04bad0880dc45903962a47ab1f788
2021-06-14 03:30:14 +00:00
Peter_Liang
7ceed32f5b Update the material next style for AnimatedImagePreference. am: db1d3d2a47 am: 99504d39ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928753

Change-Id: Ib8bf79a9ecbb0de32a0e8f5798e933dee6834e4b
2021-06-14 03:30:12 +00:00
PETER LIANG
7f49a0282a Merge changes from topic "a11y_image_preference_bc" into sc-dev am: a96c844df5 am: a989ce32ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928754

Change-Id: I21106ec26ebf1350d8310c40cf7eab6462d6acf4
2021-06-14 03:25:11 +00:00
PETER LIANG
ec7f4821b2 Merge changes from topic "a11y_image_preference_bc" into sc-dev am: a96c844df5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928754

Change-Id: If20ac2d389642d8de204c1b9e709b027bc22b3be
2021-06-14 03:12:36 +00:00
PETER LIANG
39911eee17 Merge changes from topic "a11y_image_preference_bc" into sc-dev am: a96c844df5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928754

Change-Id: Ib8e5f6877ee4d836953ddd4f2d26dd6bafdb194d
2021-06-14 03:11:45 +00:00
Peter_Liang
99504d39ea Update the material next style for AnimatedImagePreference. am: db1d3d2a47
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928753

Change-Id: Ifa5cb68a9f9b64d57aa817ef1272b02e2571f323
2021-06-14 03:11:43 +00:00
PETER LIANG
a989ce32ec Merge changes from topic "a11y_image_preference_bc" into sc-dev am: a96c844df5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928754

Change-Id: Ia7f3f1bd9e35ec1233433dd07b4c023cb0a113ef
2021-06-14 03:11:28 +00:00
PETER LIANG
a96c844df5 Merge changes from topic "a11y_image_preference_bc" into sc-dev
* changes:
  Update the Lottie images for Accessibility features.
  Update the material next style for AnimatedImagePreference.
2021-06-14 02:55:07 +00:00
TreeHugger Robot
fefd8e0d69 Merge "Fix face/fingerprint consent primary footer button logic" into sc-dev am: cd6c64a5c7 am: 52a20f10c6 am: 7727591655
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14941211

Change-Id: Ia483fdcdafc98da46ab73c7cb083cf2ab2ab6d3a
2021-06-13 00:13:19 +00:00
TreeHugger Robot
aa68bd022c Merge "Fix face/fingerprint consent primary footer button logic" into sc-dev am: cd6c64a5c7 am: 64d5b55607 am: 8c869d6279
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14941211

Change-Id: Ie26caffca5c214fa09c031f952f1aaa70a84651b
2021-06-13 00:13:12 +00:00
TreeHugger Robot
7727591655 Merge "Fix face/fingerprint consent primary footer button logic" into sc-dev am: cd6c64a5c7 am: 52a20f10c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14941211

Change-Id: I93e6d5c7ef7b8d56a560a4a754c2252abcaeaa6b
2021-06-12 23:57:48 +00:00
TreeHugger Robot
8c869d6279 Merge "Fix face/fingerprint consent primary footer button logic" into sc-dev am: cd6c64a5c7 am: 64d5b55607
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14941211

Change-Id: I923064a04373f7404cc0ddab9c13acfefeaa9f57
2021-06-12 23:57:29 +00:00
TreeHugger Robot
bf71488e98 Merge "Fix face/fingerprint consent primary footer button logic" into sc-dev am: cd6c64a5c7 am: eaa98e659a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14941211

Change-Id: I3bf8a0982e9dcc7a028fd9c2a47ddf06d858df9a
2021-06-12 23:57:01 +00:00
TreeHugger Robot
64d5b55607 Merge "Fix face/fingerprint consent primary footer button logic" into sc-dev am: cd6c64a5c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14941211

Change-Id: If38157d9414243b4411a652577ce4ae668a3e889
2021-06-12 23:45:21 +00:00
TreeHugger Robot
eaa98e659a Merge "Fix face/fingerprint consent primary footer button logic" into sc-dev am: cd6c64a5c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14941211

Change-Id: I94f3b428fc705ac7e769694a1196bf2f2c9b09b9
2021-06-12 23:44:36 +00:00
TreeHugger Robot
52a20f10c6 Merge "Fix face/fingerprint consent primary footer button logic" into sc-dev am: cd6c64a5c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14941211

Change-Id: I44d170baf79a4418fba5c3ec30fe628131c177c7
2021-06-12 23:44:33 +00:00
TreeHugger Robot
cd6c64a5c7 Merge "Fix face/fingerprint consent primary footer button logic" into sc-dev 2021-06-12 23:31:12 +00:00
Jason Chang
870920de2e Merge changes from topic "OHM-newUI-Sys-Gesture" into sc-dev am: 5213fbced1 am: 48ea6abf18 am: d21b014fee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14804130

Change-Id: I7acd23b3b2c2d7d9d00fd182ef1e2f6881dcae76
2021-06-12 12:20:10 +00:00
Jason Chang
30bcd1d0ca Remove redundant swipe down notification and one handed sub settings am: 1c310ef44b am: c9b0c596be am: 1179c9bd86
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14797789

Change-Id: Iaaf3f6854df96b77d543743fdd1db0e38e910b7f
2021-06-12 12:20:06 +00:00
Jason Chang
8dbdcf89dc Merge changes from topic "OHM-newUI-Sys-Gesture" into sc-dev am: 5213fbced1 am: 0ec543dd95 am: 6c73b5d9d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14804130

Change-Id: I645c5f7fd91e0fae923b0e22341c3d0ffb9c5f3d
2021-06-12 12:19:40 +00:00
Jason Chang
41dbd52074 Remove redundant swipe down notification and one handed sub settings am: 1c310ef44b am: 691a29062a am: d0e3a0d904
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14797789

Change-Id: Ic72749edbcf6993ecfd2c4fb8459ffc63f8ee5de
2021-06-12 12:19:36 +00:00
Jason Chang
d21b014fee Merge changes from topic "OHM-newUI-Sys-Gesture" into sc-dev am: 5213fbced1 am: 48ea6abf18
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14804130

Change-Id: I38d8fe5fe3770d2284e05ddad0b390dbb41879dc
2021-06-12 12:15:40 +00:00
Jason Chang
1179c9bd86 Remove redundant swipe down notification and one handed sub settings am: 1c310ef44b am: c9b0c596be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14797789

Change-Id: I5616933e4ac7bb1f48e3d0c7b0d08ddc37ad1f69
2021-06-12 12:15:36 +00:00
Jason Chang
6c73b5d9d7 Merge changes from topic "OHM-newUI-Sys-Gesture" into sc-dev am: 5213fbced1 am: 0ec543dd95
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14804130

Change-Id: I856db725c29dec6244468bf243b988c016c92c8a
2021-06-12 12:07:57 +00:00
Jason Chang
d0e3a0d904 Remove redundant swipe down notification and one handed sub settings am: 1c310ef44b am: 691a29062a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14797789

Change-Id: I12fdc3757650452ef430659fe35607113c19bdbf
2021-06-12 12:07:54 +00:00
Jason Chang
3ab0d7b1b9 Merge changes from topic "OHM-newUI-Sys-Gesture" into sc-dev am: 5213fbced1 am: 7e61c806e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14804130

Change-Id: I0ba93c73c85b9c8120ed23fa3642921fe73fe87f
2021-06-12 12:06:55 +00:00
Jason Chang
48ea6abf18 Merge changes from topic "OHM-newUI-Sys-Gesture" into sc-dev am: 5213fbced1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14804130

Change-Id: Ia210213ae6504c7192186d59ff37877444bc8b9c
2021-06-12 11:59:58 +00:00
Jason Chang
c9b0c596be Remove redundant swipe down notification and one handed sub settings am: 1c310ef44b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14797789

Change-Id: I1f9f15568537d75e49ad622564ed9f19060cf254
2021-06-12 11:59:54 +00:00
Jason Chang
0ec543dd95 Merge changes from topic "OHM-newUI-Sys-Gesture" into sc-dev am: 5213fbced1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14804130

Change-Id: Id11fd3cf73c7d657d8f05d4a803f2f0c5b03364e
2021-06-12 11:59:11 +00:00
Jason Chang
7e61c806e9 Merge changes from topic "OHM-newUI-Sys-Gesture" into sc-dev am: 5213fbced1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14804130

Change-Id: I13e555a0fedab56172a520ea52c97c4988ac9e9e
2021-06-12 11:59:10 +00:00