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
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
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
5ae801442d
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: I72b11f39dd09ddc92b21fbfea62dcadc6ee7dbaf
2021-06-21 13:48:09 +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
251d3a27f3
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: I3c1d23136d733282b2cbc7215f94d88449fbc852
2021-06-21 12:21:40 +00:00
YUKAI HUNG
2c8ffaa10e
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: I752da2c44a477cfc86fe3c8e80ffdffebb63e32e
2021-06-21 12:21:17 +00:00
TreeHugger Robot
189a5dfb7b
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: Idabfa542612b20df39f51d06cd5838729c1e31ce
2021-06-21 12:20:44 +00:00
TreeHugger Robot
73f3a0d290
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: Iec1e16c2bf5f4568c589da8d4c9dc0282abba813
2021-06-21 12:15:32 +00:00
TreeHugger Robot
7514aebc80
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: I71b6663e9580e72f382b465d53904698e18c2f5d
2021-06-21 12:15:02 +00:00
TreeHugger Robot
54bb0bd2fb
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: I672d10f3e7549026a9a9cff35237e4c53001ad58
2021-06-21 12:14:42 +00:00
TreeHugger Robot
3928e0b4f1
Merge "Clean up unused code" into sc-dev
2021-06-21 11:25:35 +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
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
dbaad0436d
Merge "Revert "Suppress Shared Axis transition on the SIM dialog"" into sc-dev
2021-06-21 10:00:14 +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
33eb3bf53e
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: I0feef8ebc111c93654cb621e78a59392028c2dae
2021-06-21 08:09:30 +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
b80251b7bc
[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: I6cc2691368444aebf7ba33328f30af422e54d6bc
2021-06-20 18:27:56 +00:00
Bill Yi
afab5c94b9
[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: I10449f2b10ace91a79a6d8764bc493298d9964b4
2021-06-20 18:27:37 +00:00
TreeHugger Robot
d942057a8c
[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: Ia76a689c910e87296a09d9136e91441f1c6969ab
2021-06-20 18:27:11 +00:00
Bill Yi
eb1b956aae
[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: Ic5577954c0ac2b855e64f4c27efd24775d4fecdd
2021-06-20 18:26:39 +00:00
TreeHugger Robot
90ea72a84c
[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: I02281c85a6c689dffbc517327c3c99f30d939268
2021-06-20 18:25:59 +00:00
Bill Yi
44b78dc633
[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: I20bd2ba4d5264fdcb9f83cf9d22a8c1a8869c3d4
2021-06-20 18:24:46 +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
d768d1b3b1
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-06-20 18:11:44 +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
TreeHugger Robot
8237b4510d
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-06-20 17:41:40 +00:00
Bill Yi
55ef19a28e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia0f88a709ad6a6d00fe86dd0141fb325694fc339
2021-06-20 10:48:57 +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
6cb17b2688
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I847984e756fe6b8d27be1674b918434e701e44b7
2021-06-20 10:37:59 +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
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
57bd12b969
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id369ce159e6764a4709384de39ccebb780fe0d8f
2021-06-20 10:16:43 +00:00
Bill Yi
cc6166a718
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c4acab637e
-s ours am: b4f59a75d5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15038493
Change-Id: I84564a8e7972c85c1cd49d0243e159a9c83480c2
2021-06-20 01:26:33 +00:00
Bill Yi
d872d81418
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4491f38fe
-s ours am: ef4d7891fc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15038491
Change-Id: Id95b977b19d7e1e71471ea4ce4c451ba4a41f624
2021-06-20 01:26:26 +00:00
Bill Yi
b4f59a75d5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c4acab637e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15038493
Change-Id: I3105c704d4375b849821e110ec5bd667c7a79a79
2021-06-20 01:25:35 +00:00