Arc Wang
4ba2bfbc72
Merge "[Wi-Fi] Enhance com.android.settings.wifi.p2p unit test cases." into rvc-dev am: 7e40584e5d am: 9aff7f5d0f am: 40eb2f6d21
...
Change-Id: Ib1a598e6826a09b35485ce521c376c10ffbaf1d7
2020-05-01 05:37:55 +00:00
Arc Wang
40eb2f6d21
Merge "[Wi-Fi] Enhance com.android.settings.wifi.p2p unit test cases." into rvc-dev am: 7e40584e5d am: 9aff7f5d0f
...
Change-Id: Id62927c762c18569f1936bd9deb5d32b5058fa2f
2020-05-01 05:21:18 +00:00
Arc Wang
9aff7f5d0f
Merge "[Wi-Fi] Enhance com.android.settings.wifi.p2p unit test cases." into rvc-dev am: 7e40584e5d
...
Change-Id: Id77ca934c98b189bb2634b17e53ff580025fe2bd
2020-05-01 05:06:19 +00:00
Arc Wang
7e40584e5d
Merge "[Wi-Fi] Enhance com.android.settings.wifi.p2p unit test cases." into rvc-dev
2020-05-01 04:52:30 +00:00
govenliu
4d74ae2e67
[Wi-Fi] Enhance com.android.settings.wifi.p2p unit test cases.
...
Add new unit test cases in WifiP2pSettingsTest.java, the coverage rate will raise from 30% to 71%.
Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiP2pSettingsTest
Change-Id: I214866efae47a99e75178beca48deb398b70f9bd
2020-05-01 09:00:10 +08:00
Xiangyu/Malcolm Chen
818066d62b
[automerger skipped] Merge "Fix Robo test failure in NrDisabledInDsdsFooterPreferenceControllerTest." am: 6819a64e45 am: 30792ed811 -s ours am: 8e35cc2c37 -s ours am: 9f07b1fcc2 -s ours
...
am skip reason: Change-Id I77dfa6eb61ee7b2cf2eb4fd8d8a392a43f7035b3 with SHA-1 08cc6396b2 is in history
Change-Id: I85f8af736d9b3609a38fd14aa8f3028180983913
2020-04-30 18:36:02 +00:00
Xiangyu/Malcolm Chen
9f07b1fcc2
[automerger skipped] Merge "Fix Robo test failure in NrDisabledInDsdsFooterPreferenceControllerTest." am: 6819a64e45 am: 30792ed811 -s ours am: 8e35cc2c37 -s ours
...
am skip reason: Change-Id I77dfa6eb61ee7b2cf2eb4fd8d8a392a43f7035b3 with SHA-1 08cc6396b2 is in history
Change-Id: Iee0e20457a4bb3bda387a4b09f968b9539e7ac73
2020-04-30 18:23:34 +00:00
Xiangyu/Malcolm Chen
8e35cc2c37
[automerger skipped] Merge "Fix Robo test failure in NrDisabledInDsdsFooterPreferenceControllerTest." am: 6819a64e45 am: 30792ed811 -s ours
...
am skip reason: Change-Id I77dfa6eb61ee7b2cf2eb4fd8d8a392a43f7035b3 with SHA-1 08cc6396b2 is in history
Change-Id: I2104d827861e2a8f04f61de8d93b47429aac2efb
2020-04-30 18:04:26 +00:00
Xiangyu/Malcolm Chen
30792ed811
Merge "Fix Robo test failure in NrDisabledInDsdsFooterPreferenceControllerTest." am: 6819a64e45
...
Change-Id: I6e2235612a27168fc095773e0638da0c9602addd
2020-04-30 17:38:16 +00:00
Xiangyu/Malcolm Chen
6819a64e45
Merge "Fix Robo test failure in NrDisabledInDsdsFooterPreferenceControllerTest."
2020-04-30 17:16:55 +00:00
TreeHugger Robot
296b354f52
Merge "Add keyword for app pinning setting" into rvc-dev am: 6debb6a775 am: 631944fe1d am: 944fac2735 am: abbbd8ca2f
...
Change-Id: I25b9574190301ad6f41534f461d58641994ab1d3
2020-04-30 16:58:37 +00:00
TreeHugger Robot
b2455df251
Merge "Add keyword for app pinning setting" into rvc-dev am: 6debb6a775 am: 503685b948 am: 9bdd888646
...
Change-Id: I9724b58560cf36b12a02910eaee4a973706410f5
2020-04-30 16:41:58 +00:00
TreeHugger Robot
abbbd8ca2f
Merge "Add keyword for app pinning setting" into rvc-dev am: 6debb6a775 am: 631944fe1d am: 944fac2735
...
Change-Id: I1318f9f1772843cfa1b4e3b27e55fc9b48d7e137
2020-04-30 16:40:37 +00:00
TreeHugger Robot
e347559116
Merge "Add keyword for app pinning setting" into rvc-dev am: 6debb6a775 am: 631944fe1d am: 45775e72b4
...
Change-Id: If1613e7fb84be641d6f5141682e4364cfe317d8b
2020-04-30 16:40:35 +00:00
TreeHugger Robot
9bdd888646
Merge "Add keyword for app pinning setting" into rvc-dev am: 6debb6a775 am: 503685b948
...
Change-Id: I4c601de6632493a37f4f18eb57f8ee948e81f271
2020-04-30 16:26:57 +00:00
TreeHugger Robot
944fac2735
Merge "Add keyword for app pinning setting" into rvc-dev am: 6debb6a775 am: 631944fe1d
...
Change-Id: If0c9c0ca60ff02fdff41cd1fe8bc09f1409fa899
2020-04-30 16:26:50 +00:00
TreeHugger Robot
45775e72b4
Merge "Add keyword for app pinning setting" into rvc-dev am: 6debb6a775 am: 631944fe1d
...
Change-Id: I3700b532220fe0a3e421b58a260bd66740e36220
2020-04-30 16:26:33 +00:00
TreeHugger Robot
503685b948
Merge "Add keyword for app pinning setting" into rvc-dev am: 6debb6a775
...
Change-Id: I86f6aa578c2224c8069333b5ebf593b5415b1459
2020-04-30 16:07:57 +00:00
TreeHugger Robot
631944fe1d
Merge "Add keyword for app pinning setting" into rvc-dev am: 6debb6a775
...
Change-Id: I3d8a9c7bcb1963f40be9dfd651f52df8dc0032b6
2020-04-30 16:07:39 +00:00
TreeHugger Robot
6debb6a775
Merge "Add keyword for app pinning setting" into rvc-dev
2020-04-30 15:49:19 +00:00
TreeHugger Robot
06e92f7a84
[automerger skipped] Merge "Fix missing zone strings in some cases" into rvc-dev am: 4f244f6b88 am: 6b77190291 am: 5d31959c05 am: a2bf50fb82 -s ours
...
am skip reason: Change-Id Ia89c777a832f8b41c8d56d3327a9b7370ba44b52 with SHA-1 a21962b3c9 is in history
Change-Id: Ie7da23fab8ae3019945dc892288d589b1ecdb373
2020-04-30 15:27:30 +00:00
Edgar Wang
8bc680c331
Merge "Add metrics log for special cases in Lanugages & About page" into rvc-dev am: cf654356d6 am: db6bf67b32 am: 680b374dea am: 97e849fbb2
...
Change-Id: I067f80c8c0398f95d419898204025f612b77a5c5
2020-04-30 15:26:56 +00:00
TreeHugger Robot
a2bf50fb82
Merge "Fix missing zone strings in some cases" into rvc-dev am: 4f244f6b88 am: 6b77190291 am: 5d31959c05
...
Change-Id: Id601ff3855dd1b75def0233ca908fc1f539e96dc
2020-04-30 15:14:36 +00:00
Edgar Wang
97e849fbb2
Merge "Add metrics log for special cases in Lanugages & About page" into rvc-dev am: cf654356d6 am: db6bf67b32 am: 680b374dea
...
Change-Id: Icfefba456a0c18a400852b75c12c48011c6c6725
2020-04-30 15:12:17 +00:00
TreeHugger Robot
f33898e350
[automerger skipped] Merge "Fix missing zone strings in some cases" into rvc-dev am: 4f244f6b88 am: 6b77190291 -s ours am: 734a147598 -s ours
...
am skip reason: Change-Id Ia89c777a832f8b41c8d56d3327a9b7370ba44b52 with SHA-1 a21962b3c9 is in history
Change-Id: Id416bb7b730507fe9eaa8575dfa32ceb053c9232
2020-04-30 15:12:01 +00:00
Edgar Wang
2c36a8ff21
Merge "Add metrics log for special cases in Lanugages & About page" into rvc-dev am: cf654356d6 am: db6bf67b32 am: d356187270
...
Change-Id: I322219da4d9be35e475f676c136b5e13bfb89741
2020-04-30 15:09:39 +00:00
TreeHugger Robot
fb9dbe5ddc
[automerger skipped] Merge "Fix missing zone strings in some cases" into rvc-dev am: 4f244f6b88 -s ours am: 53f3cdbba4 -s ours am: 18f9fdc976 -s ours
...
am skip reason: Change-Id Ia89c777a832f8b41c8d56d3327a9b7370ba44b52 with SHA-1 eafec7a244 is in history
Change-Id: I49da940d993b2e909b9ba6c292b2115d6633498d
2020-04-30 15:08:49 +00:00
Edgar Wang
7bf033dc66
Merge "Add metrics log for special cases in Lanugages & About page" into rvc-dev am: cf654356d6 am: 15e89819cb am: 29fea828bb
...
Change-Id: I677ef494962e01960c3a36c7113dc02361f360e2
2020-04-30 15:06:24 +00:00
TreeHugger Robot
5d31959c05
Merge "Fix missing zone strings in some cases" into rvc-dev am: 4f244f6b88 am: 6b77190291
...
Change-Id: I43434b52458c37d8bb426221fa0a6bb96083c0d8
2020-04-30 14:51:38 +00:00
Edgar Wang
680b374dea
Merge "Add metrics log for special cases in Lanugages & About page" into rvc-dev am: cf654356d6 am: db6bf67b32
...
Change-Id: I3aeb2bf7f3c82193a98275f8e7171f9aebbf0a45
2020-04-30 14:51:17 +00:00
TreeHugger Robot
734a147598
[automerger skipped] Merge "Fix missing zone strings in some cases" into rvc-dev am: 4f244f6b88 am: 6b77190291 -s ours
...
am skip reason: Change-Id Ia89c777a832f8b41c8d56d3327a9b7370ba44b52 with SHA-1 a21962b3c9 is in history
Change-Id: I84e8b90dd0391cd434fdccc27a4c5692c047e2e0
2020-04-30 14:51:13 +00:00
Edgar Wang
d356187270
Merge "Add metrics log for special cases in Lanugages & About page" into rvc-dev am: cf654356d6 am: db6bf67b32
...
Change-Id: If5389f4b62942b11e68a985476639fcbadc42c5f
2020-04-30 14:50:51 +00:00
TreeHugger Robot
18f9fdc976
[automerger skipped] Merge "Fix missing zone strings in some cases" into rvc-dev am: 4f244f6b88 -s ours am: 53f3cdbba4 -s ours
...
am skip reason: Change-Id Ia89c777a832f8b41c8d56d3327a9b7370ba44b52 with SHA-1 eafec7a244 is in history
Change-Id: I2c1886c3486cb0b0a6a12a2cebde4eb52b9b3cab
2020-04-30 14:50:24 +00:00
Edgar Wang
29fea828bb
Merge "Add metrics log for special cases in Lanugages & About page" into rvc-dev am: cf654356d6 am: 15e89819cb
...
Change-Id: I7b687f44de73ea4e72ed9f708b8d134cc610fdd5
2020-04-30 14:50:09 +00:00
TreeHugger Robot
6b77190291
Merge "Fix missing zone strings in some cases" into rvc-dev am: 4f244f6b88
...
Change-Id: I0edc70f57a615a544d3aafd0561a8cf928c3c44d
2020-04-30 14:43:31 +00:00
TreeHugger Robot
53f3cdbba4
[automerger skipped] Merge "Fix missing zone strings in some cases" into rvc-dev am: 4f244f6b88 -s ours
...
am skip reason: Change-Id Ia89c777a832f8b41c8d56d3327a9b7370ba44b52 with SHA-1 eafec7a244 is in history
Change-Id: I98b0ebfea641e858072c260a9a5f7fa7550132a4
2020-04-30 14:42:58 +00:00
Edgar Wang
db6bf67b32
Merge "Add metrics log for special cases in Lanugages & About page" into rvc-dev am: cf654356d6
...
Change-Id: I3241d5cd6a29013c29313059af555e8bd0ac8ee2
2020-04-30 14:37:31 +00:00
Edgar Wang
15e89819cb
Merge "Add metrics log for special cases in Lanugages & About page" into rvc-dev am: cf654356d6
...
Change-Id: I61e0f2152f3d7249c7ed4c833bd0da04f066a996
2020-04-30 14:37:31 +00:00
TreeHugger Robot
4f244f6b88
Merge "Fix missing zone strings in some cases" into rvc-dev
2020-04-30 14:32:40 +00:00
Edgar Wang
cf654356d6
Merge "Add metrics log for special cases in Lanugages & About page" into rvc-dev
2020-04-30 14:27:23 +00:00
Yanting Yang
24f476235d
Merge "Fix NPE crash when opening the app info from shortcut suggestion" into rvc-dev am: 459e5e1636 am: e3840fbc2d am: 2b6b05a4e2 am: 1997ecffa3
...
Change-Id: Iecf67ad4a52ecf78a00fe8fba5b910f8a920d9ca
2020-04-30 14:18:04 +00:00
Yanting Yang
d95d98120d
Merge "Fix NPE crash when opening the app info from shortcut suggestion" into rvc-dev am: 459e5e1636 am: fb2ef59a3c am: 8b491171b2
...
Change-Id: I4a22019e4dda779789b3067ed73a8eeec1430e50
2020-04-30 14:06:54 +00:00
Yanting Yang
1997ecffa3
Merge "Fix NPE crash when opening the app info from shortcut suggestion" into rvc-dev am: 459e5e1636 am: e3840fbc2d am: 2b6b05a4e2
...
Change-Id: I923d2e1a422705089436ad1e5b0dcc06f0ece68a
2020-04-30 14:06:34 +00:00
Yanting Yang
bfbf2a4c6a
Merge "Fix NPE crash when opening the app info from shortcut suggestion" into rvc-dev am: 459e5e1636 am: e3840fbc2d am: b15a93f76e
...
Change-Id: I775bcc321766a137b20ee553f1ed1ab9db945842
2020-04-30 14:06:33 +00:00
Yanting Yang
8b491171b2
Merge "Fix NPE crash when opening the app info from shortcut suggestion" into rvc-dev am: 459e5e1636 am: fb2ef59a3c
...
Change-Id: I706d01daae16f6bb4f28f55d3b116709303726a7
2020-04-30 13:50:43 +00:00
Yanting Yang
2b6b05a4e2
Merge "Fix NPE crash when opening the app info from shortcut suggestion" into rvc-dev am: 459e5e1636 am: e3840fbc2d
...
Change-Id: Ib76fc89d78adfcdd91d7d7e641a352941e317f61
2020-04-30 13:50:38 +00:00
Yanting Yang
b15a93f76e
Merge "Fix NPE crash when opening the app info from shortcut suggestion" into rvc-dev am: 459e5e1636 am: e3840fbc2d
...
Change-Id: Ib47a3ae99217d7db51da3d8a0b52299ff9a093d0
2020-04-30 13:50:25 +00:00
Yanting Yang
fb2ef59a3c
Merge "Fix NPE crash when opening the app info from shortcut suggestion" into rvc-dev am: 459e5e1636
...
Change-Id: Iffcf5b68b1efb84ee0467480f68ef1cdb5d196e7
2020-04-30 13:37:42 +00:00
Yanting Yang
e3840fbc2d
Merge "Fix NPE crash when opening the app info from shortcut suggestion" into rvc-dev am: 459e5e1636
...
Change-Id: Ifd6305cadbc27da4e72c2ee94f1b7fe03e93f812
2020-04-30 13:37:36 +00:00
Tsung-Mao Fang
d3b4b1043b
Add keyword for app pinning setting
...
We change the "screen pinning" to "app pinning",
and we still want to let user can get same search result
when they query "screen pinning".
Test: Open search and query "screen pinning", see the app pinning result
Bug: 151332926
Change-Id: Ice49d6db39ce89aa84508587262d9529df726784
2020-04-30 21:24:53 +08:00