Commit Graph

88842 Commits

Author SHA1 Message Date
TreeHugger Robot
0f31f9bd84 Merge "Adjust size/position of face education illustrations" into sc-dev am: 0a111093bd am: 6eb29afaff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14922977

Change-Id: I0ab191970421bf313ef8588673859eb43b5cfeb2
2021-06-10 02:21:11 +00:00
TreeHugger Robot
683e147080 Merge "Adjust size/position of face education illustrations" into sc-dev am: 0a111093bd am: 30e11c2f89
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14922977

Change-Id: Id4dd2d44ff11e6c05e248446ba6164766dbedb15
2021-06-10 02:20:37 +00:00
TreeHugger Robot
6eb29afaff Merge "Adjust size/position of face education illustrations" into sc-dev am: 0a111093bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14922977

Change-Id: I4c4ee05dadd5f705549fb602977127f17814e277
2021-06-10 02:04:17 +00:00
TreeHugger Robot
30e11c2f89 Merge "Adjust size/position of face education illustrations" into sc-dev am: 0a111093bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14922977

Change-Id: I113854092937696e63036aa5ec6dd96496977807
2021-06-10 02:02:21 +00:00
TreeHugger Robot
f6d3b406b4 Merge "Adjust size/position of face education illustrations" into sc-dev am: 0a111093bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14922977

Change-Id: I29eb0e6131cb2d861b29f1f48ef749f727ef26b6
2021-06-10 02:02:16 +00:00
TreeHugger Robot
0a111093bd Merge "Adjust size/position of face education illustrations" into sc-dev 2021-06-10 01:38:21 +00:00
Curtis Belmonte
2f2acef17a Adjust size/position of face education illustrations
Increase the size of the Lottie animation and adjust the margins of both
illustrations shown on the Face Unlock enrollment education screen.

Test: Start face enroll, press accessibility button on education screen

Fixes: 189725079
Change-Id: I40fc174c2ae574ed1a2919e8fab8a62ce90c8d0e
2021-06-09 17:31:56 -07:00
Curtis Belmonte
f54cc58de4 Merge "Remove intro text from Face Unlock Settings screen" into sc-dev am: ac84b879dc am: 4f9906769e am: a819e28549
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14922390

Change-Id: Ib0bc8818e07246f297438d47a2360a85985dcfdc
2021-06-09 22:29:00 +00:00
Curtis Belmonte
33be8441db Merge "Remove intro text from Face Unlock Settings screen" into sc-dev am: ac84b879dc am: 5c440f729b am: 17dd91093e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14922390

Change-Id: I81f6f00c7bb804b9bf20c9e98511b197f98c243c
2021-06-09 22:28:51 +00:00
Curtis Belmonte
a819e28549 Merge "Remove intro text from Face Unlock Settings screen" into sc-dev am: ac84b879dc am: 4f9906769e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14922390

Change-Id: I27e2f8eac3c068ce2663afdb23c3a79915ddaba5
2021-06-09 22:12:21 +00:00
Curtis Belmonte
17dd91093e Merge "Remove intro text from Face Unlock Settings screen" into sc-dev am: ac84b879dc am: 5c440f729b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14922390

Change-Id: I807713a3dd188658093408cc64620079cfd2a6b1
2021-06-09 22:11:29 +00:00
Curtis Belmonte
5d50499e62 Merge "Remove intro text from Face Unlock Settings screen" into sc-dev am: ac84b879dc am: 1bffc18b68
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14922390

Change-Id: Iffad1424c6fba41f4cdbfbe10153afc1aa8a74ec
2021-06-09 22:11:14 +00:00
Curtis Belmonte
5c440f729b Merge "Remove intro text from Face Unlock Settings screen" into sc-dev am: ac84b879dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14922390

Change-Id: Ice2a7a3b1a9252c1e1ffda770fab41d4bc7e6785
2021-06-09 21:54:19 +00:00
Curtis Belmonte
1bffc18b68 Merge "Remove intro text from Face Unlock Settings screen" into sc-dev am: ac84b879dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14922390

Change-Id: Ieffec4b19d6c6eb6a445c1a112857edb2f6c96d0
2021-06-09 21:53:08 +00:00
Curtis Belmonte
4f9906769e Merge "Remove intro text from Face Unlock Settings screen" into sc-dev am: ac84b879dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14922390

Change-Id: I487a6d0dd1bdfb331c765b2e75b8d784bbc22e79
2021-06-09 21:52:51 +00:00
Curtis Belmonte
ac84b879dc Merge "Remove intro text from Face Unlock Settings screen" into sc-dev 2021-06-09 21:41:19 +00:00
Joshua Mccloskey
b44b67802f Merge "BiometricEnrollIntroduction button update" into sc-dev am: cc9a251082 am: 115302057b am: 6ac51192f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14909536

Change-Id: I4c5f83b1618af055fa9d5c4e70123f8a8271bf8a
2021-06-09 21:04:20 +00:00
Joshua Mccloskey
2fa16614f7 Merge "BiometricEnrollIntroduction button update" into sc-dev am: cc9a251082 am: 62f05dc807 am: 3bf8a7a7fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14909536

Change-Id: If727ba2e951704e31a777d678385f9382a47e0b7
2021-06-09 21:03:55 +00:00
Joshua Mccloskey
6ac51192f1 Merge "BiometricEnrollIntroduction button update" into sc-dev am: cc9a251082 am: 115302057b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14909536

Change-Id: I5f26fb6fac4a8e8445cc8ac6bd3ba1ff521fc51c
2021-06-09 20:52:35 +00:00
Joshua Mccloskey
3bf8a7a7fc Merge "BiometricEnrollIntroduction button update" into sc-dev am: cc9a251082 am: 62f05dc807
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14909536

Change-Id: I0623606273aaaabbe855571256d86586e655047e
2021-06-09 20:52:04 +00:00
Joshua Mccloskey
8ee2c0e4b6 Merge "BiometricEnrollIntroduction button update" into sc-dev am: cc9a251082 am: 2e96fea0eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14909536

Change-Id: Idf6c24033f5c016cb286f668b2f77642349624cf
2021-06-09 20:51:02 +00:00
Joshua Mccloskey
62f05dc807 Merge "BiometricEnrollIntroduction button update" into sc-dev am: cc9a251082
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14909536

Change-Id: I267821d5a9088792f57d6731b646ac94f1bcc8bc
2021-06-09 20:33:28 +00:00
Joshua Mccloskey
2e96fea0eb Merge "BiometricEnrollIntroduction button update" into sc-dev am: cc9a251082
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14909536

Change-Id: I7310802572b207122908b7ea3bf50dbf9eeac226
2021-06-09 20:32:17 +00:00
Joshua Mccloskey
115302057b Merge "BiometricEnrollIntroduction button update" into sc-dev am: cc9a251082
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14909536

Change-Id: I59c751047daa2028b1c6baaf2a2f9260e3d58e3d
2021-06-09 20:31:58 +00:00
Joshua Mccloskey
cc9a251082 Merge "BiometricEnrollIntroduction button update" into sc-dev 2021-06-09 20:11:48 +00:00
TreeHugger Robot
183c011911 Merge "Apply android accent color" into sc-dev am: 40f65961a2 am: 9f76510d0f am: 0b914c6c56
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14918673

Change-Id: I0ac56c9ea30e2fa6f60264b624ac9223bcf7a7eb
2021-06-09 20:06:26 +00:00
TreeHugger Robot
8e597a2cd2 Merge "Apply android accent color" into sc-dev am: 40f65961a2 am: 1652fde41c am: fe0f7f172f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14918673

Change-Id: Id11aade391ec179ccbc03d173a8e8bf85b5c6274
2021-06-09 20:05:36 +00:00
TreeHugger Robot
0b914c6c56 Merge "Apply android accent color" into sc-dev am: 40f65961a2 am: 9f76510d0f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14918673

Change-Id: Ib92c4fc2e0efce0fd61f778f2dea7871c4816ee8
2021-06-09 19:52:42 +00:00
TreeHugger Robot
fe0f7f172f Merge "Apply android accent color" into sc-dev am: 40f65961a2 am: 1652fde41c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14918673

Change-Id: Ic0aa3ec45753f5bf7b51091bb838b877eced80e8
2021-06-09 19:51:01 +00:00
TreeHugger Robot
d57ade6aa8 Merge "Apply android accent color" into sc-dev am: 40f65961a2 am: 7ab25d56d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14918673

Change-Id: I34ff6da612a893c6404ebfaab076cb08ac919d83
2021-06-09 19:51:00 +00:00
TreeHugger Robot
9f76510d0f Merge "Apply android accent color" into sc-dev am: 40f65961a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14918673

Change-Id: I1a08bc2ecf340a8a5dfe906bf19a7b35a6308587
2021-06-09 19:36:14 +00:00
Julia Reynolds
cf6e06649e Merge "Update method name" into sc-dev am: a2c2889c78 am: 6f89dddcc0 am: b64c178b17
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14919903

Change-Id: I6e32e83039082ef74fd2335c66c9f86aff76e024
2021-06-09 19:31:58 +00:00
TreeHugger Robot
1652fde41c Merge "Apply android accent color" into sc-dev am: 40f65961a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14918673

Change-Id: I943fe7c1560ad0250edb2fdc79d0cc02503f2de7
2021-06-09 19:30:36 +00:00
TreeHugger Robot
7ab25d56d5 Merge "Apply android accent color" into sc-dev am: 40f65961a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14918673

Change-Id: I25bcb42f5346a4d758381b3482ac11a37419d7af
2021-06-09 19:29:13 +00:00
Julia Reynolds
4f0141ed48 Merge "Update method name" into sc-dev am: a2c2889c78 am: c0e361ba79 am: cf63f6ec08
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14919903

Change-Id: I45f3d7883486e0c7ab02382a14fe50491291b1e2
2021-06-09 19:28:01 +00:00
TreeHugger Robot
40f65961a2 Merge "Apply android accent color" into sc-dev 2021-06-09 19:12:14 +00:00
Julia Reynolds
b64c178b17 Merge "Update method name" into sc-dev am: a2c2889c78 am: 6f89dddcc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14919903

Change-Id: I0353295c2fe5727d4c5cf60704062007c260c6e4
2021-06-09 18:54:22 +00:00
Julia Reynolds
cf63f6ec08 Merge "Update method name" into sc-dev am: a2c2889c78 am: c0e361ba79
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14919903

Change-Id: Iea3700e06f6b2ad1b5e7c64eb7b3784d815a0532
2021-06-09 18:49:26 +00:00
Julia Reynolds
0718ee6309 Merge "Update method name" into sc-dev am: a2c2889c78 am: 77b60fb6c3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14919903

Change-Id: I1af02eea2b6f94341b4e61807a89a67af05061f5
2021-06-09 18:45:26 +00:00
Julia Reynolds
6f89dddcc0 Merge "Update method name" into sc-dev am: a2c2889c78
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14919903

Change-Id: I4e469fcfc86a3117e094ded36279675341ccd34f
2021-06-09 18:04:04 +00:00
Julia Reynolds
77b60fb6c3 Merge "Update method name" into sc-dev am: a2c2889c78
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14919903

Change-Id: I4cff8e8f8043befdbd3b914aa4e2a9ee87f957ca
2021-06-09 18:02:47 +00:00
Julia Reynolds
c0e361ba79 Merge "Update method name" into sc-dev am: a2c2889c78
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14919903

Change-Id: Iaedb06a7d862f708af1ba1139f17a648d74ace4e
2021-06-09 18:02:33 +00:00
Curtis Belmonte
f097ad4100 Remove intro text from Face Unlock Settings screen
Removes the intro text from the top of the Face Unlock Settings screen,
since it is now redundant with the help text shown in the footer of this
screen.

Test: Open Face Unlock Settings, ensure intro text is gone

Fixes: 190622232
Change-Id: Ie7880a2e5b1405bf1298e3b9160b7d534fabd1c2
2021-06-09 10:59:06 -07:00
Weng Su
368852424c Revert "[Provider Model] Replace WiFi panel to Internet panel"
This reverts commit c33f69673a.

Reason for revert: Because Wi-Fi toggle design is rollback, resume the Wi-Fi panel as well.

Bug: 190563749
Change-Id: Ia214ff9abaa7f4f33c485ca9aa72f73749ce7fc3
2021-06-09 17:49:27 +00:00
TreeHugger Robot
0f55d40525 Merge changes from topic "free_up_space_card_preference" into sc-dev am: a23533cbdd am: 38bd71ed07 am: d564e9f7b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14909652

Change-Id: I13957efbc31b0c7583563d4f70d948e2c3719c3f
2021-06-09 17:42:26 +00:00
TreeHugger Robot
79f672b0af Merge changes from topic "free_up_space_card_preference" into sc-dev am: a23533cbdd am: 5ccaa61a2f am: a0ab6ee754
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14909652

Change-Id: Id9bcf7af717e088f0bee8aa82be54a209ffe292c
2021-06-09 17:41:51 +00:00
Julia Reynolds
a2c2889c78 Merge "Update method name" into sc-dev 2021-06-09 17:33:23 +00:00
TreeHugger Robot
d564e9f7b3 Merge changes from topic "free_up_space_card_preference" into sc-dev am: a23533cbdd am: 38bd71ed07
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14909652

Change-Id: I2d80aa4bd09942d6eb82243ded47b73501e341d4
2021-06-09 17:22:35 +00:00
TreeHugger Robot
a0ab6ee754 Merge changes from topic "free_up_space_card_preference" into sc-dev am: a23533cbdd am: 5ccaa61a2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14909652

Change-Id: I500c4b58fe25d62953f21f60323c8f4a6ad39c19
2021-06-09 17:21:43 +00:00
TreeHugger Robot
469caaf49e Merge changes from topic "free_up_space_card_preference" into sc-dev am: a23533cbdd am: 0dc2fde11e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14909652

Change-Id: Id9975e632d7eb3f0159aa4f1aa80ce92b7db5d78
2021-06-09 17:19:55 +00:00