Commit Graph

65834 Commits

Author SHA1 Message Date
Arc Wang
f50711aa7c Merge "Set usage graph LTR layout direction for Persian & Urdu" into rvc-dev am: 0a8c3b0420 am: 58989cd6ef am: bf0a4449a2
Change-Id: If862dc50ad0f42276bf75a10c71f5b2b55e26e85
2020-05-01 13:59:15 +00:00
Arc Wang
9c76b20c3b Merge "Set usage graph LTR layout direction for Persian & Urdu" into rvc-dev am: 0a8c3b0420 am: 099685206b am: ff739eb2aa
Change-Id: Ie9bd12b3b506b72f370c51c901f92975b3b29950
2020-05-01 13:59:08 +00:00
Arc Wang
bf0a4449a2 Merge "Set usage graph LTR layout direction for Persian & Urdu" into rvc-dev am: 0a8c3b0420 am: 58989cd6ef
Change-Id: Icaf588e9776eb3b5d132d106aca71351e37f9e54
2020-05-01 13:43:26 +00:00
Arc Wang
ff739eb2aa Merge "Set usage graph LTR layout direction for Persian & Urdu" into rvc-dev am: 0a8c3b0420 am: 099685206b
Change-Id: I816467abc7caea295d29f3007c6bd5fd11c2d5d2
2020-05-01 13:43:12 +00:00
Arc Wang
58989cd6ef Merge "Set usage graph LTR layout direction for Persian & Urdu" into rvc-dev am: 0a8c3b0420
Change-Id: I476979d15356f25fdb3c76ee05721ee647ded7cc
2020-05-01 13:32:18 +00:00
Arc Wang
099685206b Merge "Set usage graph LTR layout direction for Persian & Urdu" into rvc-dev am: 0a8c3b0420
Change-Id: Id2e7b98fe3e461119ab9a8e4573361f800a53328
2020-05-01 13:32:06 +00:00
Arc Wang
0a8c3b0420 Merge "Set usage graph LTR layout direction for Persian & Urdu" into rvc-dev 2020-05-01 13:16:08 +00:00
Alex Johnston
a346681bd6 Merge "Update work challenge header in Settings" into rvc-dev am: cf342c9581 am: d228e68e5d am: 3f0c3e900c am: d9ff4c126c
Change-Id: Ibcb3aec1316d7cc5d41e38368eddf4fe55d840c1
2020-05-01 11:09:55 +00:00
Alex Johnston
290e2f19dc Merge "Update work challenge header in Settings" into rvc-dev am: cf342c9581 am: f9e6cd001b am: dfbec87e86
Change-Id: Ifb9d1a2173d7b5be1a9873b917f9ef37e7fd5c9b
2020-05-01 10:58:34 +00:00
Alex Johnston
01a52651be Merge "Update work challenge header in Settings" into rvc-dev am: cf342c9581 am: d228e68e5d am: 50639850ef
Change-Id: I1ed2d49a2cadfe652fd519c6e69c0ee061c5194e
2020-05-01 10:58:27 +00:00
Alex Johnston
d9ff4c126c Merge "Update work challenge header in Settings" into rvc-dev am: cf342c9581 am: d228e68e5d am: 3f0c3e900c
Change-Id: I3b854c9af047721f0cae6cacbbcaac2fe4e3988f
2020-05-01 10:57:51 +00:00
Alex Johnston
3f0c3e900c Merge "Update work challenge header in Settings" into rvc-dev am: cf342c9581 am: d228e68e5d
Change-Id: I4fed17fb3a43035a8d4dd21a16262795a2fd9a9a
2020-05-01 10:45:35 +00:00
Alex Johnston
dfbec87e86 Merge "Update work challenge header in Settings" into rvc-dev am: cf342c9581 am: f9e6cd001b
Change-Id: I491cf085523f62c8930473cc827e77f08a87727c
2020-05-01 10:45:26 +00:00
Alex Johnston
50639850ef Merge "Update work challenge header in Settings" into rvc-dev am: cf342c9581 am: d228e68e5d
Change-Id: I21441661c6b925fe68a13b321a75cf3c6e42730d
2020-05-01 10:45:09 +00:00
Alex Johnston
f9e6cd001b Merge "Update work challenge header in Settings" into rvc-dev am: cf342c9581
Change-Id: Ia2d0a042eb8161ef8e8f779fd70454a3e31b86e8
2020-05-01 10:31:04 +00:00
Alex Johnston
d228e68e5d Merge "Update work challenge header in Settings" into rvc-dev am: cf342c9581
Change-Id: Id61362adab4df33881d0eb7d9675cbf46c2236c6
2020-05-01 10:30:55 +00:00
Alex Johnston
cf342c9581 Merge "Update work challenge header in Settings" into rvc-dev 2020-05-01 10:10:49 +00:00
Arc Wang
63c891fa03 Merge "[Wi-Fi] Enhance com.android.settings.wifi.p2p unit test cases." into rvc-dev am: 7e40584e5d am: 9aff7f5d0f am: 3860223c02 am: 86f48566ae
Change-Id: Id7cc935ffd5df8c2730ef18610800c5b261f7a6d
2020-05-01 05:49:56 +00:00
Arc Wang
c24d677fe1 Merge "[Wi-Fi] Enhance com.android.settings.wifi.p2p unit test cases." into rvc-dev am: 7e40584e5d am: 46a6ac052b am: 0ff6a0a766
Change-Id: I704bfeee1d985a9a8670d20737230b66d04d7627
2020-05-01 05:38:03 +00:00
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
86f48566ae Merge "[Wi-Fi] Enhance com.android.settings.wifi.p2p unit test cases." into rvc-dev am: 7e40584e5d am: 9aff7f5d0f am: 3860223c02
Change-Id: Ie55f5540bf57fe8a16bd6b05fab697db7795aba2
2020-05-01 05:37:36 +00:00
Arc Wang
0ff6a0a766 Merge "[Wi-Fi] Enhance com.android.settings.wifi.p2p unit test cases." into rvc-dev am: 7e40584e5d am: 46a6ac052b
Change-Id: I27cadf1b27215c540d7865da297b9a4aff2bd456
2020-05-01 05:21:46 +00:00
Arc Wang
3860223c02 Merge "[Wi-Fi] Enhance com.android.settings.wifi.p2p unit test cases." into rvc-dev am: 7e40584e5d am: 9aff7f5d0f
Change-Id: I8e1e45e0e65ecb3537317ca7b3e93229d9eccdc6
2020-05-01 05:21:36 +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
46a6ac052b Merge "[Wi-Fi] Enhance com.android.settings.wifi.p2p unit test cases." into rvc-dev am: 7e40584e5d
Change-Id: I9eda6563c28388f20c3acaf10d0d4569fccc7e7b
2020-05-01 05:06:30 +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