Commit Graph

88465 Commits

Author SHA1 Message Date
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
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
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
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
TreeHugger Robot
0dc2fde11e Merge changes from topic "free_up_space_card_preference" into sc-dev am: a23533cbdd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14909652

Change-Id: I33f42583bbc28eec283d15a3a261cf8f922ce6fe
2021-06-09 17:05:03 +00:00
TreeHugger Robot
38bd71ed07 Merge changes from topic "free_up_space_card_preference" into sc-dev am: a23533cbdd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14909652

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

Change-Id: I181cc7e6385a87f40d8632db84e98f4e9b279206
2021-06-09 17:04:12 +00:00
TreeHugger Robot
a23533cbdd Merge changes from topic "free_up_space_card_preference" into sc-dev
* changes:
  Tweak UI of CardPreference and ContextualCard
  'Free up space' uses CardPreference
2021-06-09 16:45:54 +00:00
Sunny Shao
55da2bfa85 Fix button is not fully rounded corner issue am: d769667e09 am: 20efc0ce3e am: 4c5f66175a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880641

Change-Id: I10738bfb11e033532e729babf2167cf70a8c05f2
2021-06-09 16:15:18 +00:00
Sunny Shao
e78b0bcfa1 Fix button is not fully rounded corner issue am: d769667e09 am: 997641d20c am: c484b7e7f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880641

Change-Id: I5942836d01be17ca03e2bd792800a1c6f103d896
2021-06-09 16:14:55 +00:00
Sunny Shao
4c5f66175a Fix button is not fully rounded corner issue am: d769667e09 am: 20efc0ce3e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880641

Change-Id: I36556c0f377fffd5ff630e9efb50fdc172b7323d
2021-06-09 16:04:10 +00:00
Sunny Shao
c484b7e7f0 Fix button is not fully rounded corner issue am: d769667e09 am: 997641d20c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880641

Change-Id: I4a3d3832f612860642725abfad3feba9b4e73d73
2021-06-09 16:02:10 +00:00
Sunny Shao
f6ae958c68 Fix button is not fully rounded corner issue am: d769667e09 am: 32457e20c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880641

Change-Id: I75fddbd0e850679848bce454af7e52d2cf9de152
2021-06-09 16:01:38 +00:00
Sunny Shao
997641d20c Fix button is not fully rounded corner issue am: d769667e09
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880641

Change-Id: Iafa9ad7cc80c67b58ad84a717d33caec58552e90
2021-06-09 15:42:55 +00:00
Sunny Shao
32457e20c6 Fix button is not fully rounded corner issue am: d769667e09
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880641

Change-Id: I3685f2bfb340da40478e0cb4ceccdcc9cf664ba7
2021-06-09 15:41:38 +00:00
Sunny Shao
20efc0ce3e Fix button is not fully rounded corner issue am: d769667e09
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880641

Change-Id: I5bb8d0590937d8544cc0eaf50705314d4bfdad07
2021-06-09 15:41:23 +00:00
Yi-Ling Chuang
a483ff28b8 Merge "Suppress Shared Axis transiiton on the SIM dialog" into sc-dev am: 562ad29721 am: e031b6f551 am: 58a2a32b4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880642

Change-Id: I6abe65b42878b0cbc4bc63866a08ca960fc77940
2021-06-09 13:55:12 +00:00
Yi-Ling Chuang
234cb7f32b Merge "Suppress Shared Axis transiiton on the SIM dialog" into sc-dev am: 562ad29721 am: aba4103920 am: d7f96b9571
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880642

Change-Id: I7851a05b8e5c557940bad296437052bd7cb1cc0c
2021-06-09 13:54:58 +00:00