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
32a55b93f7
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: Ic89e741a337b42ea80d686c3db57615a7b8a8bc2
2021-06-21 08:08:27 +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
Xin Li
845c880234
[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: a8cf9a798d
-s ours am: 4d789befc6
-s ours
...
am skip reason: Merged-In I73964718e9b3d66dbe189f48bfe6d1b16ec921f4 with SHA-1 e774cf9cd3
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1741495
Change-Id: I35f835fd2ccff7e61822cbfd94839b0702beefea
2021-06-21 06:42:48 +00:00
Xin Li
4d789befc6
[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: a8cf9a798d
-s ours
...
am skip reason: Merged-In I73964718e9b3d66dbe189f48bfe6d1b16ec921f4 with SHA-1 e774cf9cd3
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1741495
Change-Id: I5c526745444d10d77df6fe6496f2e0a0af1fab69
2021-06-21 06:10:20 +00:00
Xin Li
a8cf9a798d
Merge "DO NOT MERGE - Merge RQ3A.210605.005"
2021-06-21 05:49:05 +00:00
TreeHugger Robot
86ee46b1f8
[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: Ia9f79a1a1f4b49280964393c3d71033b9df29e6c
2021-06-20 18:24:06 +00:00
Bill Yi
3b1538a6d6
[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: I2d93ab997dcd38a768a54b258658cb428689e75d
2021-06-20 18:23:59 +00:00
TreeHugger Robot
2ac1b8e36e
[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: I419c63910d6d1376bb22668a610a2465c9cb6cde
2021-06-20 18:23:53 +00:00
Bill Yi
3df426dc72
[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: I60514f5df9d03178f3345ae636b2c2379777e8e5
2021-06-20 18:23: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
TreeHugger Robot
a4f4365870
[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: I129610529d884d3c6e0b162fe7fd62047d87f9a6
2021-06-20 18:23:39 +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
Bill Yi
34c7574de2
[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: Iabd4632097659e873f0dea5899a19d1a2341221a
2021-06-20 18:23:18 +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
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
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
da2cdce082
[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: I76d543e751a4f3791a011d81ebcc17a6b08493ec
2021-06-20 01:30:21 +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
Bill Yi
8d9970bd1b
[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: I90585d6c88a3bedef0b51ab569520ee90e1f4ebd
2021-06-20 01:25:35 +00:00
Bill Yi
ef4d7891fc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4491f38fe
-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: I8eae3603e7571d8d25da53f842adf74730ea4a47
2021-06-20 01:13:22 +00:00
Bill Yi
8c036009fa
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6e25ad9d0e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15038495
Change-Id: I7e4ba4299522579c1a263314c2b459d50c2759fc
2021-06-20 00:57:02 +00:00
Bill Yi
6e25ad9d0e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Icab92cfaa703d3b2eef26acef9a60a846dc7cf4c
2021-06-19 21:10:37 +00:00
Bill Yi
c4acab637e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I21e8f76e5783f6c7ef9387905ac612e4807fb7fd
2021-06-19 21:06:18 +00:00
Bill Yi
e4491f38fe
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibbd38194fc7cd9d2de7c28a8dc424b54e912904a
2021-06-19 20:55:30 +00:00
TreeHugger Robot
bca9de1a1f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f64fbb6830
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15032709
Change-Id: I829eedaff2f52c88faf65133fa0153e71c89fe14
2021-06-19 04:58:56 +00:00
Bill Yi
e1a2aaaeee
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5fd0405e56
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15032890
Change-Id: I28888e778a57ee2ed30a7e86645ab2d8d797bf5c
2021-06-19 04:58:23 +00:00
TreeHugger Robot
f64fbb6830
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-06-19 04:47:11 +00:00
Bill Yi
5fd0405e56
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id6aad69dfd45e4ba4a299002bfa12893e3845e4b
2021-06-19 02:49:49 +00:00
Bill Yi
91f62efa71
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I04288f7d2a660dbcf875f6e7ca997414868ac819
2021-06-19 02:46:21 +00:00
Joe Bolinger
24f6ac00a0
Merge "Minor language changes for enrollment flow." into sc-dev am: 18c58e9c11
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029786
Change-Id: I249e368ccdf54d31912bde1c07ed8acee8f43f86
2021-06-18 20:43:29 +00:00
Joe Bolinger
18c58e9c11
Merge "Minor language changes for enrollment flow." into sc-dev
2021-06-18 20:31:28 +00:00
Joe Bolinger
2976b9bc14
Add new enum for parental consent UI.
...
Bug: 188847063
Test: manual
Change-Id: I7b101f0d7cda415695ecdb7963a0e514c875b95c
2021-06-18 13:30:23 -07:00
Julia Reynolds
7c5f01e560
Clean up notification settings am: 6a603e7f4b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029783
Change-Id: Id71b02bdc58f92e8c7cf170d1613d3bfc49c81ab
2021-06-18 19:59:09 +00:00
Xin Li
88f92cb4db
DO NOT MERGE - Merge RQ3A.210605.005
...
Bug: 190855093
Merged-In: I73964718e9b3d66dbe189f48bfe6d1b16ec921f4
Change-Id: Id888e72e86cbc130fec23dd7645d1ceea1ce319d
2021-06-18 12:24:37 -07:00
Joe Bolinger
f030dfe110
Minor language changes for enrollment flow.
...
Bug: 188847063
Test: manual
Change-Id: I3014255e45dbe2e07de505b3ab80258ab1903281
2021-06-18 11:57:39 -07:00
Joshua Mccloskey
3bd11c302a
Added fp_bad_calibration to fp enrollment.
...
Test: Verified error message shows during enrollment.
Bug: 189133688
Change-Id: Ib1b47f5fff16d801b88247cc01a32de88c2ecd66
2021-06-18 11:49:55 -07:00
Julia Reynolds
6a603e7f4b
Clean up notification settings
...
- Reorganize settings
- Fix dividers
- Add icons
- Fix titles
- Fix colors
- Fix indentation
- Add summaries
Fixes: 190079590
Test: manual inspection, robotests
Change-Id: Ia03219575d3b0c78f9f9b088aa3cdaa29cfdf412
2021-06-18 14:36:20 -04:00
Joe Bolinger
fb515ed608
Add handoff activity to parental consent flow.
...
Bug: 188847063
Test: manual
Change-Id: Ib6f38aae487a536fb8e85d608a22378a17c1bc64
2021-06-18 10:35:35 -07:00
Joe Bolinger
d1935d9166
Merge changes from topic "unicorn-1" into sc-dev am: 0fcac8bf0d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972492
Change-Id: If0c6901245d3d99af5c16dd3f1304222f6fd1e82
2021-06-18 16:42:03 +00:00
Joe Bolinger
d93f9c0df3
Add plumbing and placeholder screens for parental consent flow. am: a8808f7368
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14939648
Change-Id: Ic145a1ccf5f1655d60832c740cfb14112fa4dd58
2021-06-18 16:42:01 +00:00