PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
90,809 Commits 1 Branch 0 Tags
a0773b1574a21856f62ea84110b7d02da4a2004f
Commit Graph

90809 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Erik Wolsheimer
8434eed3e3 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: I27d13c5e9ceb5440b3cb4a5e3a5a960bd757c5ae
 2021-06-28 20:51:47 +00:00
Erik Wolsheimer
89af43a4ab Merge "Do not refer to 'default' in default_print_service_main_switch_title" into sc-dev 2021-06-28 20:39:21 +00:00
TreeHugger Robot
6a66056a07 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f7c714547f -s ours am: 392e4a67ce -s ours am: e86e2ce070 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15129443

Change-Id: Iac447f1d3e5b1e2b383ea606e093ce78f122ee40
 2021-06-28 20:13:40 +00:00
TreeHugger Robot
12e09be050 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f91bc70bb6 -s ours am: 93cf2766da -s ours am: 78559d2b31 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15129261

Change-Id: I2e5749b4719c1e88056e9968aba7b48d1de58940
 2021-06-28 20:13:35 +00:00
TreeHugger Robot
edd48c8316 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f7c714547f -s ours am: 39df8b0bb9 -s ours am: 94b4e5db48 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15129443

Change-Id: Idb39af963aef41710e7e77b9cd29dc0eb7d22570
 2021-06-28 20:12:37 +00:00
TreeHugger Robot
a813eb5ed8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f91bc70bb6 -s ours am: 4c3d565029 -s ours am: 97b9f5e7df -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15129261

Change-Id: I6002a820866d4057d8e48d1202472dfa62c711bf
 2021-06-28 20:11:57 +00:00
TreeHugger Robot
e86e2ce070 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f7c714547f -s ours am: 392e4a67ce -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15129443

Change-Id: I305da6bad506b85f20eaaa9a606d45d71aadf7d7
 2021-06-28 19:55:58 +00:00
TreeHugger Robot
78559d2b31 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f91bc70bb6 -s ours am: 93cf2766da -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15129261

Change-Id: Ieb67f9d3c25ee8ca4f43f17af265cafad91143bd
 2021-06-28 19:55:52 +00:00
TreeHugger Robot
94b4e5db48 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f7c714547f -s ours am: 39df8b0bb9 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15129443

Change-Id: I7a55b90980797e6709467a6a39e7c9282fe1761d
 2021-06-28 19:54:55 +00:00
TreeHugger Robot
97b9f5e7df [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f91bc70bb6 -s ours am: 4c3d565029 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15129261

Change-Id: Ic0b1777d1014f54e1afa4e986cd74905295327d1
 2021-06-28 19:54:36 +00:00
TreeHugger Robot
1288d0a69f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f7c714547f -s ours am: 15a7f5ed3d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15129443

Change-Id: I6603de8e724a4cf8a9dee96cd53a23c836720a0c
 2021-06-28 19:53:05 +00:00
TreeHugger Robot
b2f5f78e0f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f91bc70bb6 -s ours am: e956631e69 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15129261

Change-Id: Icfe3dd3d9849ce13e6e9decc99da3c458654318f
 2021-06-28 19:52:44 +00:00
TreeHugger Robot
39df8b0bb9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f7c714547f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15129443

Change-Id: Iaa37c939eaff86408e7256ecbc6bc1ca1b4125eb
 2021-06-28 19:29:09 +00:00
TreeHugger Robot
4c3d565029 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f91bc70bb6 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15129261

Change-Id: I40ea65402827869e490499086ee2ee6836a5a3f8
 2021-06-28 19:28:55 +00:00
TreeHugger Robot
392e4a67ce [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f7c714547f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15129443

Change-Id: I4c9f99b331952bed4e68e84f76bbc17c9ae01e2c
 2021-06-28 19:28:19 +00:00
TreeHugger Robot
15a7f5ed3d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f7c714547f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15129443

Change-Id: If45ba7e69d33b06a8875df3923dd7e35d0a551b0
 2021-06-28 19:28:13 +00:00
TreeHugger Robot
e956631e69 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f91bc70bb6 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15129261

Change-Id: I6fa2a9def0ef55b8de3e2a01004b6b604387e7d4
 2021-06-28 19:28:08 +00:00