PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,815 Commits 1 Branch 0 Tags
b1d2e82bc3450cf62c30e56b6a28db15fe2b3bae
Commit Graph

89815 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Syaoran Kuo
b1d2e82bc3 Merge "Add testcase: Add multiple user and delete." 2021-06-22 02:49:37 +00:00
TreeHugger Robot
1e1b5fe32b Merge "Dissable scrolling behavior for collapsing toolbar" into sc-dev am: b96246196b am: b2aa3a2c8e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029686

Change-Id: If0fdfa105c06a2b84e61f3e7e37cd109cfa78fcf
 2021-06-22 02:11:59 +00:00
TreeHugger Robot
b2aa3a2c8e Merge "Dissable scrolling behavior for collapsing toolbar" into sc-dev am: b96246196b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029686

Change-Id: If083327a5bee129ce4c0bee11646667b7b5e9be9
 2021-06-22 01:52:25 +00:00
TreeHugger Robot
b96246196b Merge "Dissable scrolling behavior for collapsing toolbar" into sc-dev 2021-06-22 01:26:59 +00:00
Mill Chen
3f8f0a4356 Dissable scrolling behavior for collapsing toolbar 
We intended to make subsetting pages disable the scrolling behavior
within the collapsing toolbar area. The collapsing toolbar is still
able to be expanded/collapsed depending on the content of page.

Fix: 191614437
Fix: 189003332
Test: manual test
Cannot scroll/drag with the collapsing toolbar area

Change-Id: I6755268781b8b3d1a76bf71f9e39e6de4eeb76e3
 2021-06-22 05:30:01 +08:00
Joshua Mccloskey
5fe9ace936 Merge "Added fp_bad_calibration to fp enrollment." into sc-dev am: be845d1541 am: 306642fc38 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15027458

Change-Id: I59a11fe53492c096c5aaf59157f48f8bc44551a9
 2021-06-21 21:03:09 +00:00
Joshua Mccloskey
306642fc38 Merge "Added fp_bad_calibration to fp enrollment." into sc-dev am: be845d1541 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15027458

Change-Id: If66320c54e0e23a8cda5a1b57cb209236ef34499
 2021-06-21 20:52:12 +00:00
Joshua Mccloskey
be845d1541 Merge "Added fp_bad_calibration to fp enrollment." into sc-dev 2021-06-21 20:41:01 +00:00
TreeHugger Robot
dc08ae4b61 Merge "Adjust bubbles avatar icon size to align left icon" into sc-dev am: 65220e5cdb am: f26cd7a11e am: 25a3914e9a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15048196

Change-Id: Ia1016ff53e0fb0e16cd8e5da4317e8e0daf35481
 2021-06-21 20:36:34 +00:00
Joe Bolinger
38c477f704 Merge changes from topic "unicorn-hand" into sc-dev am: daeda0525b am: 32b8330f35 am: bade9c3558 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15030503

Change-Id: If2ed548b007be221043ea9da0b2c1251685dd3a3
 2021-06-21 20:36:09 +00:00
Joe Bolinger
efc6e4eb46 Add handoff activity to parental consent flow. am: fb515ed608 am: 94add587c4 am: 620e2eedd8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029584

Change-Id: I1fa3abdbadec8716c042ba75003d2d581f28d51b
 2021-06-21 20:36:07 +00:00
TreeHugger Robot
7911afcbcb Merge "Adjust bubbles avatar icon size to align left icon" into sc-dev am: 65220e5cdb am: fa6829a065 am: 7752a8be44 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15048196

Change-Id: I5199db95c42217b8b99ec7997e908ce9dc22eac6
 2021-06-21 20:33:40 +00:00
Joe Bolinger
d6f101a2d8 Merge changes from topic "unicorn-hand" into sc-dev am: daeda0525b am: d932268510 am: 88fc8f817a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15030503

Change-Id: I5866a3cc161292d1b146e8395ff92037a6937c68
 2021-06-21 20:33:01 +00:00
Joe Bolinger
2cc57b1d73 Add handoff activity to parental consent flow. am: fb515ed608 am: f7ee87c992 am: 872bc56abf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029584

Change-Id: Id44f2ba41b034596e7ad25f24073215607cd362e
 2021-06-21 20:32:55 +00:00
TreeHugger Robot
25a3914e9a Merge "Adjust bubbles avatar icon size to align left icon" into sc-dev am: 65220e5cdb am: f26cd7a11e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15048196

Change-Id: Ie4ca9e1cf1feefcb7e3c2469390dbae50ca71b01
 2021-06-21 20:17:26 +00:00
Joe Bolinger
bade9c3558 Merge changes from topic "unicorn-hand" into sc-dev am: daeda0525b am: 32b8330f35 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15030503

Change-Id: Id922e75e70ed4af6b97aa3904f1a7a1739dacb40
 2021-06-21 20:17:04 +00:00
Joe Bolinger
620e2eedd8 Add handoff activity to parental consent flow. am: fb515ed608 am: 94add587c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029584

Change-Id: Ib68d1ec712a4eb6a73b22aac663e465cf0bac02f
 2021-06-21 20:17:02 +00:00
TreeHugger Robot
ab43a110b7 Merge "Adjust bubbles avatar icon size to align left icon" into sc-dev am: 65220e5cdb am: 05e21445b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15048196

Change-Id: I47e61f79a6f76a979ab04e6048eabb051f280de8
 2021-06-21 20:16:44 +00:00
TreeHugger Robot
7752a8be44 Merge "Adjust bubbles avatar icon size to align left icon" into sc-dev am: 65220e5cdb am: fa6829a065 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15048196

Change-Id: If3ad3d7c6d85f557fb2644640f68e757b254e29d
 2021-06-21 20:16:43 +00:00
Joe Bolinger
88fc8f817a Merge changes from topic "unicorn-hand" into sc-dev am: daeda0525b am: d932268510 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15030503

Change-Id: I20bf2c44877c2ce19d3092b40893998823b6473c
 2021-06-21 20:15:00 +00:00
Joe Bolinger
872bc56abf Add handoff activity to parental consent flow. am: fb515ed608 am: f7ee87c992 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029584

Change-Id: I919ec7762bdfe3de75ed7a0153d3781e0905a899
 2021-06-21 20:14:58 +00:00
Joe Bolinger
e0996aaada Merge changes from topic "unicorn-hand" into sc-dev am: daeda0525b am: 69291542a5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15030503

Change-Id: Ic4aeffad3ac3608d3666328838c23bfe71736233
 2021-06-21 20:12:15 +00:00
TreeHugger Robot
f26cd7a11e Merge "Adjust bubbles avatar icon size to align left icon" into sc-dev am: 65220e5cdb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15048196

Change-Id: I2db1620d7a436d9370063217166ff9564b47323f
 2021-06-21 19:58:20 +00:00
Jason Hsu
4633147178 Merge "Improve search by adding the settings keywords for supported downloaded services" into sc-dev am: 34961821f4 am: 6581df598f am: 0ee314b055 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299190

Change-Id: Ia2135e3acb70745366f9dae9dd4eb05db70975d1
 2021-06-21 19:57:38 +00:00
TreeHugger Robot
797ca6996a Merge "Clean up unused code" into sc-dev am: 3928e0b4f1 am: d56cb9842f am: 1f7161ec35 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029689

Change-Id: Ie7369c8c89eb1ad3a4e97a83bd5d2218b8de1170
 2021-06-21 19:57:30 +00:00
YUKAI HUNG
a56b77ae4e Merge "Remove legacy MIN_POWER_THRESHOLD_MILLI_AMP_HOURS threshold value" into sc-dev am: a0d61f253a am: b0930acede am: fcbdc57177 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029683

Change-Id: I6428f72aa06d97d76d863892a1996cd420d71c60
 2021-06-21 19:57:23 +00:00
TreeHugger Robot
f17523d764 Merge "Fix A11y broken on Draw your pattern again page" into sc-dev am: 503219b316 am: 04d77c008d am: 8e1b7f8ddb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029685

Change-Id: I3fec01c31433c49b4b9815ce9eaf016b0fa9035d
 2021-06-21 19:57:17 +00:00
Joe Bolinger
32b8330f35 Merge changes from topic "unicorn-hand" into sc-dev am: daeda0525b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15030503

Change-Id: I6915f90eea8c58c3fbdbb380b5c93ec73db90d8c
 2021-06-21 19:57:09 +00:00
TreeHugger Robot
2f6b79fd53 Merge "Update the image for Fingerprint Finish page" into sc-dev am: f4a1b19c12 am: 6f2ed120b3 am: 9cab75d4a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15027578

Change-Id: I663a388243b059dbfab08301c30b874815f75ae8
 2021-06-21 19:57:09 +00:00
Joe Bolinger
94add587c4 Add handoff activity to parental consent flow. am: fb515ed608 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029584

Change-Id: Ia81d929181c4820ef55b4663f9807597e05ae040
 2021-06-21 19:57:07 +00:00
TreeHugger Robot
fa6829a065 Merge "Adjust bubbles avatar icon size to align left icon" into sc-dev am: 65220e5cdb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15048196

Change-Id: Ie481fef6a8015206ffd822a6177e1b453cf41fb9
 2021-06-21 19:57:02 +00:00
TreeHugger Robot
05e21445b8 Merge "Adjust bubbles avatar icon size to align left icon" into sc-dev am: 65220e5cdb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15048196

Change-Id: Iea48cb1d04c4d2f2c3afe00fb1f0f2da7809d1a0
 2021-06-21 19:55:32 +00:00
TreeHugger Robot
565507053e Merge "Revert "Suppress Shared Axis transition on the SIM dialog"" into sc-dev am: dbaad0436d am: 3909722588 am: 9d84b54ac0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029682

Change-Id: Idad26c81af6de34f5229d4d26f78449dc0e4a416
 2021-06-21 19:55:15 +00:00
Joe Bolinger
d932268510 Merge changes from topic "unicorn-hand" into sc-dev am: daeda0525b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15030503

Change-Id: If97be85445da06264840e618efc23dd1c194e1d5
 2021-06-21 19:55:03 +00:00
Joe Bolinger
f7ee87c992 Add handoff activity to parental consent flow. am: fb515ed608 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029584

Change-Id: Ia92797aaa897b0a31caf5d21b67ee05dd28ce6d4
 2021-06-21 19:55:00 +00:00
Joe Bolinger
69291542a5 Merge changes from topic "unicorn-hand" into sc-dev am: daeda0525b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15030503

Change-Id: Idb2045adfc3d220555330ea735fc4b04719c5976
 2021-06-21 19:53:49 +00:00
TreeHugger Robot
65220e5cdb Merge "Adjust bubbles avatar icon size to align left icon" into sc-dev 2021-06-21 18:46:23 +00:00
TreeHugger Robot
80c95cf92a Merge "Move ic_info_outline_24 from SettingsLib to Settings" into sc-dev am: 23222388c1 am: 9346fb4474 am: 0f7c1467a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15001652

Change-Id: Ic46944e2590072bb9db4fed8ab9ff45e34a45aff
 2021-06-21 17:30:52 +00:00
TreeHugger Robot
bc9c14e450 Merge "Remove the duplicated skip lock screen setting" into sc-dev am: b5b519dd85 am: 32a55b93f7 am: 11c55d019d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928755

Change-Id: I9011de13a6f459e62808c2a5827372e43c473307
 2021-06-21 17:30:37 +00:00
Xin Li
f7a4d22949 [automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: a8cf9a798d -s ours am: 4d789befc6 -s ours am: 845c880234 -s ours am: 41ea853ca2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib0b9a264a910cdc0be586a5f9cf742f300d8756a
 2021-06-21 17:22:57 +00:00
Joe Bolinger
daeda0525b Merge changes from topic "unicorn-hand" into sc-dev 
* changes:
  Add new enum for parental consent UI.
  Add handoff activity to parental consent flow.
 2021-06-21 17:06:29 +00:00
Jason Hsu
0ee314b055 Merge "Improve search by adding the settings keywords for supported downloaded services" into sc-dev am: 34961821f4 am: 6581df598f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299190

Change-Id: Id3b9d0be0c71ebe3dda3fb0e12eeaf2e2e022607
 2021-06-21 16:27:50 +00:00
TreeHugger Robot
1f7161ec35 Merge "Clean up unused code" into sc-dev am: 3928e0b4f1 am: d56cb9842f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029689

Change-Id: I9e8d800efa5633f86617116e08fdcdf01e38b30b
 2021-06-21 16:27:44 +00:00
YUKAI HUNG
fcbdc57177 Merge "Remove legacy MIN_POWER_THRESHOLD_MILLI_AMP_HOURS threshold value" into sc-dev am: a0d61f253a am: b0930acede 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029683

Change-Id: Ib908d9fa283b40f208f097b5ffd1b8eb69cfe133
 2021-06-21 16:27:39 +00:00
TreeHugger Robot
8e1b7f8ddb Merge "Fix A11y broken on Draw your pattern again page" into sc-dev am: 503219b316 am: 04d77c008d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029685

Change-Id: Ib5c8b99c1d796d6e189714dc6086a390e7f60def
 2021-06-21 16:27:34 +00:00
TreeHugger Robot
9cab75d4a7 Merge "Update the image for Fingerprint Finish page" into sc-dev am: f4a1b19c12 am: 6f2ed120b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15027578

Change-Id: I9db4033ca4eba0ca8fb4eb99d167540461c74acf
 2021-06-21 16:27:29 +00:00
TreeHugger Robot
9d84b54ac0 Merge "Revert "Suppress Shared Axis transition on the SIM dialog"" into sc-dev am: dbaad0436d am: 3909722588 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029682

Change-Id: I5d4f78e1f8e1881184ee3d8da87835d8a80c2ef9
 2021-06-21 16:24:23 +00:00
TreeHugger Robot
0f7c1467a9 Merge "Move ic_info_outline_24 from SettingsLib to Settings" into sc-dev am: 23222388c1 am: 9346fb4474 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15001652

Change-Id: If27d839528ca109cbdcef7d00f60be222c877226
 2021-06-21 16:18:58 +00:00
TreeHugger Robot
11c55d019d Merge "Remove the duplicated skip lock screen setting" into sc-dev am: b5b519dd85 am: 32a55b93f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928755

Change-Id: If329d76496c2a921754fe9cf0499960001b2a4ce
 2021-06-21 16:18:51 +00:00
Xin Li
41ea853ca2 [automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: a8cf9a798d -s ours am: 4d789befc6 -s ours am: 845c880234 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I792fb187e40341054129156cdf52b7762be60a30
 2021-06-21 16:14:37 +00:00