Commit Graph

84934 Commits

Author SHA1 Message Date
Joshua Mccloskey
be845d1541 Merge "Added fp_bad_calibration to fp enrollment." into sc-dev 2021-06-21 20:41:01 +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
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
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
Edgar Wang
9bac8ec684 Adjust bubbles avatar icon size to align left icon
Bug: 185596897
Test: robotest & visual
Change-Id: I5d283db7e6b7f0d8cda9689c1ead2fdd318cc8ab
2021-06-21 23:59:45 +08:00
Jason Hsu
82531a695b Merge "Improve search by adding the settings keywords for supported downloaded services" into sc-dev am: 34961821f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299190

Change-Id: I040bdb7288bb02993ebe6a9de20b2dad59e2d442
2021-06-21 13:47:18 +00:00
Jason Hsu
34961821f4 Merge "Improve search by adding the settings keywords for supported downloaded services" into sc-dev 2021-06-21 13:32:49 +00:00
TreeHugger Robot
f59cd6f8b2 Merge "Clean up unused code" into sc-dev am: 3928e0b4f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029689

Change-Id: I8a21021ec7ba09633b172262e056fd06ec531000
2021-06-21 11:43:44 +00:00
TreeHugger Robot
3928e0b4f1 Merge "Clean up unused code" into sc-dev 2021-06-21 11:25:35 +00:00
YUKAI HUNG
814dd75918 Merge "Remove legacy MIN_POWER_THRESHOLD_MILLI_AMP_HOURS threshold value" into sc-dev am: a0d61f253a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029683

Change-Id: Ib2d4e8212d39b0ab4f4098cda8ebfa37a326e310
2021-06-21 11:02:16 +00:00
YUKAI HUNG
a0d61f253a Merge "Remove legacy MIN_POWER_THRESHOLD_MILLI_AMP_HOURS threshold value" into sc-dev 2021-06-21 10:47:31 +00:00
TreeHugger Robot
52d5a488ca Merge "Fix A11y broken on Draw your pattern again page" into sc-dev am: 503219b316
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029685

Change-Id: Idecdf187bb0feb79c0c19c634a261f9816ebed63
2021-06-21 10:42:42 +00:00
TreeHugger Robot
5617cb9466 Merge "Update the image for Fingerprint Finish page" into sc-dev am: f4a1b19c12
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15027578

Change-Id: If0dd03a21b1985a1ffb37d66599f38e871a02ac4
2021-06-21 10:42:37 +00:00
TreeHugger Robot
503219b316 Merge "Fix A11y broken on Draw your pattern again page" into sc-dev 2021-06-21 10:33:34 +00:00
TreeHugger Robot
f4a1b19c12 Merge "Update the image for Fingerprint Finish page" into sc-dev 2021-06-21 10:29:34 +00:00
Tsung-Mao Fang
53f94d3289 Clean up unused code
Test: Rebuilt apk
Fix: 190142194
Change-Id: I16d18c538b612c6049f561bb524ee1e056255714
2021-06-21 18:17:27 +08:00
TreeHugger Robot
19fa17e3b4 Merge "Revert "Suppress Shared Axis transition on the SIM dialog"" into sc-dev am: dbaad0436d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029682

Change-Id: Ic5bd304be3a125627f8815cad79985521cea2783
2021-06-21 10:13:47 +00:00
TreeHugger Robot
dbaad0436d Merge "Revert "Suppress Shared Axis transition on the SIM dialog"" into sc-dev 2021-06-21 10:00:14 +00:00
TreeHugger Robot
2c3e71368f Merge "Move ic_info_outline_24 from SettingsLib to Settings" into sc-dev am: 23222388c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15001652

Change-Id: I2f11be88f23681f093b905e072c4e9f171c019ac
2021-06-21 09:35:23 +00:00
Yi-Ling Chuang
c55b2cef2a Revert "Suppress Shared Axis transition on the SIM dialog"
This reverts commit 5e8a3947d2.

Reason for revert: <b/191335572>

Bug: 191335572
Change-Id: I0d4756797914ac5bcb37dde31e80dc4cd45fcd6b
2021-06-21 09:32:01 +00:00
Mill Chen
6f93ac0eec Update the image for Fingerprint Finish page
Fix: 188733201
Test: visual verified
Change-Id: Iebb9eaa201ac5481df0104b9394dbc9959aa0c52
2021-06-21 17:20:00 +08:00
Jason Chiu
272c7627e1 Fix A11y broken on Draw your pattern again page
Fixes: 190146459
Test: manual
Change-Id: I613e1db10334c06358bfa8d84770fb083ea12095
2021-06-21 17:18:34 +08:00
TreeHugger Robot
23222388c1 Merge "Move ic_info_outline_24 from SettingsLib to Settings" into sc-dev 2021-06-21 09:17:32 +00:00
ykhung
e322f02b18 Remove legacy MIN_POWER_THRESHOLD_MILLI_AMP_HOURS threshold value
in the new design, we should store all data into the databae for showing
the battery history, we should not filter the items first from the
consumed battery value threshold

Bug: 191468827
Test: make SettingsRoboTests
Change-Id: I19d971fc5cdcc40af1693dc8ba2c78586da22d49
2021-06-21 16:43:18 +08:00
TreeHugger Robot
c9887edbb2 Merge "Remove the duplicated skip lock screen setting" into sc-dev am: b5b519dd85
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928755

Change-Id: I608b43e73d04da0f15640fc3b7ce9406e83a3dde
2021-06-21 08:08:18 +00:00
jasonwshsu
87b90dfc50 Improve search by adding the settings keywords for supported downloaded services
* Use FeatureFactory to improve the search only for google overlay

Bug: 184171842
Test: atest AccessibilitySettingsTest
Change-Id: I93ed52d2579b7da35dba59f9562b6715d13dd80d
2021-06-21 16:03:37 +08:00
TreeHugger Robot
b5b519dd85 Merge "Remove the duplicated skip lock screen setting" into sc-dev 2021-06-21 07:54:30 +00:00
TreeHugger Robot
ea0673a482 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: d768d1b3b1 -s ours am: 058027f470 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I94f129d38674ea2657f8f5d65bb87d3a15d0021d
2021-06-20 18:28:09 +00:00
Bill Yi
d9fd5449d9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1e77e7c1f -s ours am: 9620fa8249 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id6a407b2a04954e646a4d632d7f25f4a90712e5f
2021-06-20 18:27:51 +00:00
TreeHugger Robot
058027f470 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: d768d1b3b1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I86a655610ea394d6612d2b4dea7dee83ed08edc1
2021-06-20 18:23:41 +00:00
Bill Yi
9620fa8249 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1e77e7c1f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0208233adf22b2cf01a19ae1c4d197a99f2090e6
2021-06-20 18:23:31 +00:00
TreeHugger Robot
576e89d615 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: e17516456f -s ours am: 64ab66344d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7bae221a987e02e2cf09c6dea184b8e0b6b162e4
2021-06-20 18:23:24 +00:00
Bill Yi
327e1a7fbd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 690868f6ec -s ours am: b9a47c348f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5b23c1d90395d443efa75437d337317f719f2c2e
2021-06-20 18:23:18 +00:00
TreeHugger Robot
6698bf6b03 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0fc2e32ecc -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia7ef72cbf2a3ae85d1bd4ab86b5eb43fd09b8455
2021-06-20 18:23:11 +00:00
Bill Yi
3bc187fdf9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 00bfaf371a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I848d48ea70fbd8a715beef444492ec118aeb3077
2021-06-20 18:23:04 +00:00
TreeHugger Robot
d768d1b3b1 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-20 18:11:44 +00:00
TreeHugger Robot
a8400bb566 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-06-20 18:10:33 +00:00
TreeHugger Robot
64ab66344d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: e17516456f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I34013563e522a7f1db4b967d4ebca58713d33752
2021-06-20 18:01:02 +00:00
Bill Yi
b9a47c348f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 690868f6ec -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6e000079fb1073019825a891eb642f9ec476d3e3
2021-06-20 18:00:52 +00:00
TreeHugger Robot
0fc2e32ecc Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-20 17:58:33 +00:00
TreeHugger Robot
e17516456f Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-20 17:56:15 +00:00
Bill Yi
00bfaf371a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ibc203bcf5b84e5e4417f919e7d27b5fb66b61e32
2021-06-20 10:45:30 +00:00
Bill Yi
850f596669 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id98f5fdc25d11e421b134c999a2fb013b9ef6b38
2021-06-20 10:36:28 +00:00
Bill Yi
09dee72fe2 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I58231a0d3bef29b32381ee5031df333c7bb9efa9
2021-06-20 10:32:25 +00:00
Bill Yi
690868f6ec Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib4dbb5fbabf25f423c50ce68f36f9a4efa3b3579
2021-06-20 10:29:02 +00:00
Bill Yi
b2c157906c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib63cebb1228a36e93dddc5d64d4f2ab8a8c72d1d
2021-06-20 10:25:05 +00:00
Bill Yi
e1e77e7c1f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib780c3fa72b2f9e7f50c0e99a3be71e857c99419
2021-06-20 10:21:37 +00:00
Bill Yi
5a8966882e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I591d43dee61e9bb80649ee0cef6a44509e86eabd
2021-06-20 10:18:14 +00:00
Bill Yi
57bd12b969 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id369ce159e6764a4709384de39ccebb780fe0d8f
2021-06-20 10:16:43 +00:00