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
Jason Hsu
1ff9797a13
Merge "Improve search by adding the settings keywords for supported downloaded services" into sc-dev am: 34961821f4
am: 5ae801442d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299190
Change-Id: Icbea561601335307469ee8d655457ec0b4516063
2021-06-21 14:02:45 +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
34e7bde17f
Merge "Clean up unused code" into sc-dev am: 3928e0b4f1
am: 251d3a27f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029689
Change-Id: I24a07e793fa1bca59b023002587b602ee37b0789
2021-06-21 12:30:08 +00:00
YUKAI HUNG
c077641fc0
Merge "Remove legacy MIN_POWER_THRESHOLD_MILLI_AMP_HOURS threshold value" into sc-dev am: a0d61f253a
am: 2c8ffaa10e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029683
Change-Id: Id5bad44827d97323fcd9867ddd45e20b2b56f247
2021-06-21 12:30:04 +00:00
TreeHugger Robot
5a3d92624f
Merge "Fix A11y broken on Draw your pattern again page" into sc-dev am: 503219b316
am: 189a5dfb7b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029685
Change-Id: I357bb8eefbfdd375b34425c3cd0c60d217bf3409
2021-06-21 12:29:59 +00:00
TreeHugger Robot
a658e81ea3
Merge "Update the image for Fingerprint Finish page" into sc-dev am: f4a1b19c12
am: 73f3a0d290
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15027578
Change-Id: I18f41523d1d1d514afd710eec00505960facc4bb
2021-06-21 12:29:54 +00:00
TreeHugger Robot
ab0bb410a3
Merge "Revert "Suppress Shared Axis transition on the SIM dialog"" into sc-dev am: dbaad0436d
am: 7514aebc80
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029682
Change-Id: Ie8906f73efc1c7591f7e53e26d94001b14080d52
2021-06-21 12:29:47 +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
184ca3591f
Merge "Move ic_info_outline_24 from SettingsLib to Settings" into sc-dev am: 23222388c1
am: 54bb0bd2fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15001652
Change-Id: I721768e83c6e45c5f6386cd6308fea6e6d8dd38a
2021-06-21 12:18:24 +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
3909722588
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: I51bebf3bb069e00aa7628d395d3d6c264e7ff544
2021-06-21 10:13:46 +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
9346fb4474
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: Ia0887bbe17c6abd8d069b3a6185efb15827eea07
2021-06-21 09:35:30 +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
c88a3b34c6
Merge "Remove the duplicated skip lock screen setting" into sc-dev am: b5b519dd85
am: 33eb3bf53e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928755
Change-Id: I2e4b14305fd92fb6c69d1ff1285c7afb83a164ca
2021-06-21 08:24:25 +00: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
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
08cdb43331
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: d768d1b3b1
-s ours am: 058027f470
-s ours am: 86ee46b1f8
-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: Icaee3dffdf23ccda730390da8c1cbbbb7e58b550
2021-06-20 18:39:10 +00:00
Bill Yi
c54f7381cc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1e77e7c1f
-s ours am: 9620fa8249
-s ours am: 3b1538a6d6
-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: I54f941512c2d22867eadaaa233adc828dc00a9fe
2021-06-20 18:39:04 +00:00
TreeHugger Robot
58a9735197
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: e17516456f
-s ours am: 64ab66344d
-s ours am: 2ac1b8e36e
-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: Ia621227460f8609a71cf93f1fe7faffa4a133564
2021-06-20 18:38:57 +00:00
Bill Yi
5c6b65645d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 690868f6ec
-s ours am: b9a47c348f
-s ours am: 3df426dc72
-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: If97223a508a52472800383c7df8672b343aafab0
2021-06-20 18:38:49 +00:00
Automerger Merge Worker
43de77e6b0
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0fc2e32ecc
-s ours am: a4f4365870
-s ours" into sc-v2-dev-plus-aosp
2021-06-20 18:38:38 +00:00
TreeHugger Robot
3c85cd471f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0fc2e32ecc
-s ours am: a4f4365870
-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: I1441940c6dd52b967d2e137990f37e361f90ec93
2021-06-20 18:38:36 +00:00
TreeHugger Robot
85ebd314aa
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: d768d1b3b1
-s ours am: 058027f470
-s ours am: b80251b7bc
-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: I9a4b536540a0d1acf3bbe5172e882d275fab481d
2021-06-20 18:38:34 +00:00
Bill Yi
db8f6e743a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1e77e7c1f
-s ours am: 9620fa8249
-s ours am: afab5c94b9
-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: Ia856129f4fbccd21278cb2070eb7e19560475fe9
2021-06-20 18:38:30 +00:00
TreeHugger Robot
984efdef5f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: e17516456f
-s ours am: 64ab66344d
-s ours am: d942057a8c
-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: I90ef2c9f0a2cf412f551465406824fb6ba643aaa
2021-06-20 18:38:23 +00:00
Automerger Merge Worker
142ee38e5e
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 690868f6ec
-s ours am: b9a47c348f
-s ours am: eb1b956aae
-s ours" into sc-v2-dev-plus-aosp
2021-06-20 18:38:18 +00:00