Commit Graph

90775 Commits

Author SHA1 Message Date
Wesley Wang
7570cb538b Merge "Update batteryDiffEntry filter condiction" into sc-dev am: 4c1b805cef am: 68e0560669 am: dd37503830
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15080731

Change-Id: I31ad963e21e91392f12538394aa3081a9bb5bd08
2021-06-29 04:49:55 +00:00
Tiffany Nguyen
acae86538d Merge "Log Battery Saver states." into sc-dev am: dc93eda197 am: ca4facf659 am: cbdf9f8a43
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125481

Change-Id: I47abb785b6b582e990c58efa544f6c78fb1e6c42
2021-06-29 04:49:38 +00:00
Edgar Wang
1ff8306439 Merge "Tweak Factory reset page for Material Next style" into sc-dev am: 87d34a0ec6 am: baf8e94445 am: c697441ad9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15124034

Change-Id: I752f8d7b7b585f29c3feafb3d4b93b0126399d1b
2021-06-29 04:49:31 +00:00
Wesley Wang
e38633d3b2 Merge "Update batteryDiffEntry filter condiction" into sc-dev am: 4c1b805cef am: 3df9608ca6 am: 5ef540f9fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15080731

Change-Id: I3e40161c7213450d86bd6594cfeb5798331b2105
2021-06-29 04:49:23 +00:00
Tiffany Nguyen
b224e419b0 Merge "Log Battery Saver states." into sc-dev am: dc93eda197 am: 637ec7bdc4 am: ce4f1a8df0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125481

Change-Id: I6662b82a95132cfc80653935299c6d599b030268
2021-06-29 04:49:04 +00:00
Wesley Wang
dd37503830 Merge "Update batteryDiffEntry filter condiction" into sc-dev am: 4c1b805cef am: 68e0560669
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15080731

Change-Id: Ieb550e98ddf7fd9932d1c7577cea991fc3c9d837
2021-06-29 04:40:57 +00:00
Tiffany Nguyen
cbdf9f8a43 Merge "Log Battery Saver states." into sc-dev am: dc93eda197 am: ca4facf659
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125481

Change-Id: Ibac1494a4790f06eeba43aee1e1536fa46ffd4cb
2021-06-29 04:40:42 +00:00
Edgar Wang
c697441ad9 Merge "Tweak Factory reset page for Material Next style" into sc-dev am: 87d34a0ec6 am: baf8e94445
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15124034

Change-Id: I9c9bdc63c79951ec7b70ed5b7930eeb1a2551b79
2021-06-29 04:37:19 +00:00
Wesley Wang
5ef540f9fc Merge "Update batteryDiffEntry filter condiction" into sc-dev am: 4c1b805cef am: 3df9608ca6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15080731

Change-Id: I3fa7248d2ac62f508ca1371699bcc44168904c42
2021-06-29 04:37:13 +00:00
Tiffany Nguyen
ce4f1a8df0 Merge "Log Battery Saver states." into sc-dev am: dc93eda197 am: 637ec7bdc4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125481

Change-Id: Ie6fdfd54d7ac4f7dabbaf76a4d6f43360938d853
2021-06-29 04:37:09 +00:00
Edgar Wang
9b50ae8682 Merge "Tweak Factory reset page for Material Next style" into sc-dev am: 87d34a0ec6 am: d7e31d78c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15124034

Change-Id: Ied84cda0db37dd3e29b2e7f093ca87a6a1a1ab7e
2021-06-29 04:36:38 +00:00
Wesley Wang
3dd141cd95 Merge "Update batteryDiffEntry filter condiction" into sc-dev am: 4c1b805cef am: 7975e08c46
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15080731

Change-Id: I4b6098590a8b6815681a61be1e4a45cb33744174
2021-06-29 04:36:33 +00:00
Tiffany Nguyen
7b3f71fdc0 Merge "Log Battery Saver states." into sc-dev am: dc93eda197 am: 8fe839e3f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125481

Change-Id: I6d2a0c7511285c35f6a4bac1844d76e8b9dce07f
2021-06-29 04:36:24 +00:00
Wesley Wang
68e0560669 Merge "Update batteryDiffEntry filter condiction" into sc-dev am: 4c1b805cef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15080731

Change-Id: Iaedc030c4bf75f4b367121b03e0406aa2b874c44
2021-06-29 04:23:08 +00:00
Tiffany Nguyen
ca4facf659 Merge "Log Battery Saver states." into sc-dev am: dc93eda197
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125481

Change-Id: I42d463bd964949404e861c83bf8dee98f2d9c55e
2021-06-29 04:23:03 +00:00
Edgar Wang
d7e31d78c8 Merge "Tweak Factory reset page for Material Next style" into sc-dev am: 87d34a0ec6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15124034

Change-Id: Ia480bea4e52eb39540b6026689e255c85cb8bb12
2021-06-29 04:22:35 +00:00
Wesley Wang
7975e08c46 Merge "Update batteryDiffEntry filter condiction" into sc-dev am: 4c1b805cef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15080731

Change-Id: I48dd44b6b744c3baac4331e2e42953a7ce78b975
2021-06-29 04:22:28 +00:00
Tiffany Nguyen
8fe839e3f5 Merge "Log Battery Saver states." into sc-dev am: dc93eda197
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125481

Change-Id: I6fcbec59b53f93dc7774a8b4bb496ab350fc065a
2021-06-29 04:22:20 +00:00
Edgar Wang
baf8e94445 Merge "Tweak Factory reset page for Material Next style" into sc-dev am: 87d34a0ec6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15124034

Change-Id: I7d95273d91d465f941b793ce49d8b429109008a8
2021-06-29 04:21:33 +00:00
Wesley Wang
3df9608ca6 Merge "Update batteryDiffEntry filter condiction" into sc-dev am: 4c1b805cef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15080731

Change-Id: I32a35f5a3185a4c5f841a821594fbecf6bb0acd7
2021-06-29 04:21:25 +00:00
Tiffany Nguyen
637ec7bdc4 Merge "Log Battery Saver states." into sc-dev am: dc93eda197
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125481

Change-Id: I9cb0b0d978133b032d3ba311cefffba57b13bf1f
2021-06-29 04:21:18 +00:00
Edgar Wang
87d34a0ec6 Merge "Tweak Factory reset page for Material Next style" into sc-dev 2021-06-29 04:18:56 +00:00
Wesley Wang
4c1b805cef Merge "Update batteryDiffEntry filter condiction" into sc-dev 2021-06-29 04:17:29 +00:00
Tiffany Nguyen
dc93eda197 Merge "Log Battery Saver states." into sc-dev 2021-06-29 04:13:02 +00:00
Joe Bolinger
86a8af8d38 Merge "Return enrollment consent status to caller." into sc-dev am: 8d5b841fb1 am: 28b5b3361d am: 2fe3bf271c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15133398

Change-Id: Id894454dd221a5f2fc4b97105532af2215408878
2021-06-29 03:23:55 +00:00
Joe Bolinger
43e4230d69 Merge "Return enrollment consent status to caller." into sc-dev am: 8d5b841fb1 am: 953b2deb54 am: 2181355911
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15133398

Change-Id: I946fdafbec95204c118b308aa36f10dcbef5cdb9
2021-06-29 03:21:28 +00:00
Joe Bolinger
2fe3bf271c Merge "Return enrollment consent status to caller." into sc-dev am: 8d5b841fb1 am: 28b5b3361d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15133398

Change-Id: I3a6d673525aa7ee173a21438ffe2c1f217b65d35
2021-06-29 03:16:44 +00:00
Joe Bolinger
2181355911 Merge "Return enrollment consent status to caller." into sc-dev am: 8d5b841fb1 am: 953b2deb54
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15133398

Change-Id: Iabcdc4e1e2bff8af900e813289a44414e5ea088e
2021-06-29 03:08:22 +00:00
Joe Bolinger
259a2672c9 Merge "Return enrollment consent status to caller." into sc-dev am: 8d5b841fb1 am: 725ca71a7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15133398

Change-Id: Ie8f302a4ac18e46d76da362c8014535f30a60348
2021-06-29 03:07:33 +00:00
Joe Bolinger
28b5b3361d Merge "Return enrollment consent status to caller." into sc-dev am: 8d5b841fb1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15133398

Change-Id: Idbe7aa5032a111f43afa43d884edd81160834a5f
2021-06-29 02:59:17 +00:00
Joe Bolinger
725ca71a7d Merge "Return enrollment consent status to caller." into sc-dev am: 8d5b841fb1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15133398

Change-Id: Ifc77b38ee0772f7e9fac85fe33acc78ae443fce6
2021-06-29 02:58:31 +00:00
Joe Bolinger
953b2deb54 Merge "Return enrollment consent status to caller." into sc-dev am: 8d5b841fb1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15133398

Change-Id: Ia66f4df37a37f3756377e7a12568e752c4bc8301
2021-06-29 02:57:22 +00:00
Joe Bolinger
8d5b841fb1 Merge "Return enrollment consent status to caller." into sc-dev 2021-06-29 02:41:55 +00:00
Joe Bolinger
eb1dac69f0 Return enrollment consent status to caller.
Bug: 188847063
Test: adb shell am start -a android.settings.BIOMETRIC_ENROLL --ez require_consent true
Change-Id: I3285b379e175539c37355c67749c3d900e6ac62b
2021-06-28 17:51:46 -07:00
Curtis Belmonte
d5e9c61ddb Adjust layout of the face education Lottie animation am: d8c142b44a am: 43d437810e am: c2d883709d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15132425

Change-Id: Iae6772a247022a2a64b791d93f972fbe5e40e344
2021-06-29 00:19:36 +00:00
Curtis Belmonte
d3a9800d34 Adjust layout of the face education Lottie animation am: d8c142b44a am: 0d0a045bad am: 26f5a75259
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15132425

Change-Id: Icc314569a7d348f9e731b2638521097d0037f63a
2021-06-29 00:19:24 +00:00
Curtis Belmonte
c2d883709d Adjust layout of the face education Lottie animation am: d8c142b44a am: 43d437810e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15132425

Change-Id: I8316ba5f0e96140a8713c14587ed736c3ebc7072
2021-06-29 00:08:13 +00:00
Curtis Belmonte
26f5a75259 Adjust layout of the face education Lottie animation am: d8c142b44a am: 0d0a045bad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15132425

Change-Id: I30c39524f0cf8ddaeef6d41c5f97f78dc20adae7
2021-06-29 00:07:41 +00:00
Curtis Belmonte
604c2dff1b Adjust layout of the face education Lottie animation am: d8c142b44a am: 0d8c4c053c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15132425

Change-Id: Ied5473194be6d5c421ec0500efc65105962d068a
2021-06-29 00:07:19 +00:00
Curtis Belmonte
0d0a045bad Adjust layout of the face education Lottie animation am: d8c142b44a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15132425

Change-Id: Ieaa753a52bfae3b43938f72a462b4a11316d7c8e
2021-06-28 23:51:03 +00:00
Curtis Belmonte
0d8c4c053c Adjust layout of the face education Lottie animation am: d8c142b44a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15132425

Change-Id: I8dec0d88dcb43eb7566763df94ffab585017f2f2
2021-06-28 23:50:16 +00:00
Curtis Belmonte
43d437810e Adjust layout of the face education Lottie animation am: d8c142b44a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15132425

Change-Id: I90f83abfe934d4cb177faef78273f4a01a99e9e0
2021-06-28 23:50:13 +00:00
Curtis Belmonte
d8c142b44a Adjust layout of the face education Lottie animation
Updates the size and position of the face enroll education Lottie
animation to support the latest version.

Test: Manual

Bug: 181373277
Change-Id: Ieccd3fa839f3ef329ed732a8b8623baf236c31ad
2021-06-28 15:37:34 -07:00
Erik Wolsheimer
6f80fe1150 Merge "Do not refer to 'default' in default_print_service_main_switch_title" into sc-dev am: 89af43a4ab am: 8434eed3e3 am: 6a2c48a77f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15130027

Change-Id: I129313687786bcb0fa983414205e45081accdfbf
2021-06-28 21:15:42 +00:00
Erik Wolsheimer
e9e4b32ad2 Merge "Do not refer to 'default' in default_print_service_main_switch_title" into sc-dev am: 89af43a4ab am: 7fa9100f4a am: 93cc3ea981
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15130027

Change-Id: Id247e467b18eb2bbd2fb8a042983e9c13fc10984
2021-06-28 21:15:28 +00:00
Erik Wolsheimer
6a2c48a77f Merge "Do not refer to 'default' in default_print_service_main_switch_title" into sc-dev am: 89af43a4ab am: 8434eed3e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15130027

Change-Id: I62adfc14f46ccfbc5373aaecab1bacdf196d0e38
2021-06-28 21:03:57 +00:00
Erik Wolsheimer
93cc3ea981 Merge "Do not refer to 'default' in default_print_service_main_switch_title" into sc-dev am: 89af43a4ab am: 7fa9100f4a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15130027

Change-Id: Ic831cade470554be06698da2b7de3a0466b12d81
2021-06-28 21:03:37 +00:00
Erik Wolsheimer
3445dd0d35 Merge "Do not refer to 'default' in default_print_service_main_switch_title" into sc-dev am: 89af43a4ab am: cb6013ea44
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15130027

Change-Id: I3b2d28d3cccf280f0be4484843ec95054c899ef9
2021-06-28 21:03:04 +00:00
Erik Wolsheimer
7fa9100f4a Merge "Do not refer to 'default' in default_print_service_main_switch_title" into sc-dev am: 89af43a4ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15130027

Change-Id: I9e78359c2613542dbf3a025c2e1337c214cd261e
2021-06-28 20:52:41 +00:00
Erik Wolsheimer
cb6013ea44 Merge "Do not refer to 'default' in default_print_service_main_switch_title" into sc-dev am: 89af43a4ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15130027

Change-Id: Iad294f53965938d326942894a59c0aaabf8a7e74
2021-06-28 20:51:51 +00:00