Commit Graph

67865 Commits

Author SHA1 Message Date
Automerger Merge Worker
6dc769ae3c Merge "Merge "[Settings] Adopt TelephonyBasePreferenceController" into rvc-dev am: fb015a3c24 am: 551f515e6d" into rvc-d1-dev-plus-aosp am: 01f6620449 am: 6535980f84
Change-Id: Ib0e4b33e5faf3099b3f494edd5822f1910bba268
2020-05-05 04:25:56 +00:00
Bonian Chen
d84c48b50d Merge "[Settings] Adopt TelephonyBasePreferenceController" into rvc-dev am: fb015a3c24 am: 24314ee382 am: 0e7240ae04 am: 0927ca0905
Change-Id: I846e2e25064e4d7e582e6943bb299f179a4fe8e5
2020-05-05 04:25:00 +00:00
Automerger Merge Worker
6535980f84 Merge "Merge "[Settings] Adopt TelephonyBasePreferenceController" into rvc-dev am: fb015a3c24 am: 551f515e6d" into rvc-d1-dev-plus-aosp am: 01f6620449
Change-Id: Iaee4b2085c0685128d0132925ede6927604cae70
2020-05-05 04:10:33 +00:00
Bonian Chen
0927ca0905 Merge "[Settings] Adopt TelephonyBasePreferenceController" into rvc-dev am: fb015a3c24 am: 24314ee382 am: 0e7240ae04
Change-Id: Iafeeee5e8c5beb03952294b6da1fb32eb989470d
2020-05-05 04:09:27 +00:00
Automerger Merge Worker
01f6620449 Merge "Merge "[Settings] Adopt TelephonyBasePreferenceController" into rvc-dev am: fb015a3c24 am: 551f515e6d" into rvc-d1-dev-plus-aosp 2020-05-05 03:50:57 +00:00
Bonian Chen
0e7240ae04 Merge "[Settings] Adopt TelephonyBasePreferenceController" into rvc-dev am: fb015a3c24 am: 24314ee382
Change-Id: Iccfe346e908efe77471648c7709c6f6fe196b284
2020-05-05 03:50:52 +00:00
Bonian Chen
1339c76d52 Merge "[Settings] Adopt TelephonyBasePreferenceController" into rvc-dev am: fb015a3c24 am: 551f515e6d
Change-Id: Ia6865db759bb2e28c5f248d38865fd5ed7b58369
2020-05-05 03:50:52 +00:00
Bonian Chen
24314ee382 Merge "[Settings] Adopt TelephonyBasePreferenceController" into rvc-dev am: fb015a3c24
Change-Id: I97309575254b6d316275f4365bc8fa102ae18447
2020-05-05 03:33:00 +00:00
Bonian Chen
551f515e6d Merge "[Settings] Adopt TelephonyBasePreferenceController" into rvc-dev am: fb015a3c24
Change-Id: I2875046cb301f1862e458e9e0ed806629b5aabc2
2020-05-05 03:32:51 +00:00
Bonian Chen
fb015a3c24 Merge "[Settings] Adopt TelephonyBasePreferenceController" into rvc-dev 2020-05-05 03:17:18 +00:00
Arc Wang
0ba7df0f8f Merge "[Wi-Fi] Modify NetworkRequestDialog title & summary" into rvc-dev am: 032f77052b am: 955ff8831c am: 0d01ba5a0e am: 89777d729a am: 34e4575c61
Change-Id: Id64d31740123f13b9effb31307346aed03dfa471
2020-05-05 02:06:30 +00:00
Arc Wang
363122c397 Merge "[Wi-Fi] Modify NetworkRequestDialog title & summary" into rvc-dev am: 032f77052b am: 2a1515ac9b am: 39834ef280 am: 15855616e1
Change-Id: I657f635c959c3571bb96cacdc22125132f8fed3f
2020-05-05 02:06:15 +00:00
Arc Wang
34e4575c61 Merge "[Wi-Fi] Modify NetworkRequestDialog title & summary" into rvc-dev am: 032f77052b am: 955ff8831c am: 0d01ba5a0e am: 89777d729a
Change-Id: I31a3ae2d629513c8f20df1c478789112c8e5363c
2020-05-05 02:06:08 +00:00
Arc Wang
3a1965ec55 Merge "[Wi-Fi] Modify NetworkRequestDialog title & summary" into rvc-dev am: 032f77052b am: 955ff8831c am: 7acc3f411d am: 34a9e0456d
Change-Id: Ib75386e0b85cdfb36c7895a7112046f8fe644a81
2020-05-05 02:05:58 +00:00
Arc Wang
15855616e1 Merge "[Wi-Fi] Modify NetworkRequestDialog title & summary" into rvc-dev am: 032f77052b am: 2a1515ac9b am: 39834ef280
Change-Id: I5915dcf645022f5f004ec08efb4eebad72831326
2020-05-05 01:53:11 +00:00
Arc Wang
34a9e0456d Merge "[Wi-Fi] Modify NetworkRequestDialog title & summary" into rvc-dev am: 032f77052b am: 955ff8831c am: 7acc3f411d
Change-Id: Ie31e05eedd83e7ae355c5ba9fc1dd7c5b4546f28
2020-05-05 01:52:56 +00:00
Arc Wang
89777d729a Merge "[Wi-Fi] Modify NetworkRequestDialog title & summary" into rvc-dev am: 032f77052b am: 955ff8831c am: 0d01ba5a0e
Change-Id: I73468ca36b32263572430f3745cfb629a47696d0
2020-05-05 01:52:55 +00:00
Arc Wang
39834ef280 Merge "[Wi-Fi] Modify NetworkRequestDialog title & summary" into rvc-dev am: 032f77052b am: 2a1515ac9b
Change-Id: I951cb9df4550ad11f93e97ed1e03a38e687a5fce
2020-05-05 01:37:51 +00:00
Arc Wang
7acc3f411d Merge "[Wi-Fi] Modify NetworkRequestDialog title & summary" into rvc-dev am: 032f77052b am: 955ff8831c
Change-Id: I27e9dcac6ea6c8d5927769db26c87f060cc7ebfb
2020-05-05 01:33:07 +00:00
Arc Wang
0d01ba5a0e Merge "[Wi-Fi] Modify NetworkRequestDialog title & summary" into rvc-dev am: 032f77052b am: 955ff8831c
Change-Id: Ic47da691b686c5630f58f706c3c091b10ebadc72
2020-05-05 01:33:04 +00:00
Arc Wang
2a1515ac9b Merge "[Wi-Fi] Modify NetworkRequestDialog title & summary" into rvc-dev am: 032f77052b
Change-Id: I4444ead097f2c63c6c21be92ca442e0479d0af93
2020-05-05 01:21:40 +00:00
Arc Wang
955ff8831c Merge "[Wi-Fi] Modify NetworkRequestDialog title & summary" into rvc-dev am: 032f77052b
Change-Id: I1e21a4fd28115e9fe3780e34cb878ad9936b0f6b
2020-05-05 01:21:34 +00:00
Arc Wang
032f77052b Merge "[Wi-Fi] Modify NetworkRequestDialog title & summary" into rvc-dev 2020-05-05 01:02:05 +00:00
Julia Reynolds
39abdfbdca Update some notification strings am: 9bb55e1084 am: 5e1fc5ecf5 am: 03e5b44cca am: 41a6593cf9 am: a0d605c5f8
Change-Id: I497c8b32c83d509b88b5860a4cea8968ebc64508
2020-05-04 20:23:01 +00:00
Julia Reynolds
8b4b481bbc Update some notification strings am: 9bb55e1084 am: 9da53fe3b2 am: 1652d1c455 am: f1b0fc130f
Change-Id: I05d1bfcb4dc0831aa6dc1ebd1fdc972ac2a43138
2020-05-04 20:22:46 +00:00
Julia Reynolds
a0d605c5f8 Update some notification strings am: 9bb55e1084 am: 5e1fc5ecf5 am: 03e5b44cca am: 41a6593cf9
Change-Id: I373e694c7a09e443bc7bbaa07fa821c1760bb694
2020-05-04 20:21:41 +00:00
Julia Reynolds
f17658e703 Update some notification strings am: 9bb55e1084 am: 5e1fc5ecf5 am: cfe2924395 am: 37dc376e8d
Change-Id: I21f56811d99021a159fdc7281ed8a75e72dae3ff
2020-05-04 20:21:41 +00:00
Julia Reynolds
f1b0fc130f Update some notification strings am: 9bb55e1084 am: 9da53fe3b2 am: 1652d1c455
Change-Id: I480862f9b50be138586f1767dfa1a399ec05ce27
2020-05-04 20:08:07 +00:00
Julia Reynolds
37dc376e8d Update some notification strings am: 9bb55e1084 am: 5e1fc5ecf5 am: cfe2924395
Change-Id: I55d3420141a3b4ba51b6bfedf0dcc7ca11823bd7
2020-05-04 20:07:35 +00:00
Julia Reynolds
41a6593cf9 Update some notification strings am: 9bb55e1084 am: 5e1fc5ecf5 am: 03e5b44cca
Change-Id: Ib89c5932c86c58ac88783f9215f7540722273273
2020-05-04 20:01:47 +00:00
Julia Reynolds
1652d1c455 Update some notification strings am: 9bb55e1084 am: 9da53fe3b2
Change-Id: Ida358438bb57d1f4da394a2af4e24367e4d484c0
2020-05-04 19:45:52 +00:00
Julia Reynolds
cfe2924395 Update some notification strings am: 9bb55e1084 am: 5e1fc5ecf5
Change-Id: Id041d481dad03b20e70158ec752fa17214b44d4e
2020-05-04 19:45:38 +00:00
Julia Reynolds
03e5b44cca Update some notification strings am: 9bb55e1084 am: 5e1fc5ecf5
Change-Id: I159231f0b5b7abc73b51126790311b49cd63e8c6
2020-05-04 19:45:32 +00:00
Julia Reynolds
9da53fe3b2 Update some notification strings am: 9bb55e1084
Change-Id: I967cf8a9a6b7eac95bab8e1ee90160c282ac2bcc
2020-05-04 19:27:01 +00:00
Julia Reynolds
5e1fc5ecf5 Update some notification strings am: 9bb55e1084
Change-Id: I7448f2bc4f2a0185a1d033e36b8f8c47a511d261
2020-05-04 19:26:59 +00:00
Julia Reynolds
9bb55e1084 Update some notification strings
Test: manual
Fixes: 155516603
Fixes: 155516894
Change-Id: I86058ebdb473890239236d30414cb05787832311
2020-05-04 10:25:57 -04:00
TreeHugger Robot
d9c77d8f85 Merge "Fix broken test cases" into rvc-dev am: 15254e3b5e am: 13f57006fd am: af0aff058f am: c29bee67e9 am: b6dce94019
Change-Id: Id150158b4d42e91bd10207bb1081071be1df13c9
2020-05-04 12:27:51 +00:00
TreeHugger Robot
b6dce94019 Merge "Fix broken test cases" into rvc-dev am: 15254e3b5e am: 13f57006fd am: af0aff058f am: c29bee67e9
Change-Id: Ica7f3d71b6bdd5e2662cff03b60db9ce8407b2ef
2020-05-04 12:07:07 +00:00
TreeHugger Robot
cf37b86adf Merge "Fix broken test cases" into rvc-dev am: 15254e3b5e am: f96e7d7219 am: 283b1f248f am: dd73e7b1ba
Change-Id: I4b8477e84e5259309eabcd218bfb62dc3fb24c53
2020-05-04 11:59:50 +00:00
TreeHugger Robot
4ae38ad03e Merge "Fix broken test cases" into rvc-dev am: 15254e3b5e am: 13f57006fd am: 1bef15bae0 am: 089323e029
Change-Id: Ic1e0ca504a34d351e95bbf7e109619f8bc70797e
2020-05-04 11:59:34 +00:00
TreeHugger Robot
c29bee67e9 Merge "Fix broken test cases" into rvc-dev am: 15254e3b5e am: 13f57006fd am: af0aff058f
Change-Id: Iaaad91abdce6a8bea76f6569f159bb1974ad0a5a
2020-05-04 11:53:38 +00:00
TreeHugger Robot
dd73e7b1ba Merge "Fix broken test cases" into rvc-dev am: 15254e3b5e am: f96e7d7219 am: 283b1f248f
Change-Id: I3280e8e73a167453c8922e5bd8628dd82c59639c
2020-05-04 11:50:03 +00:00
TreeHugger Robot
089323e029 Merge "Fix broken test cases" into rvc-dev am: 15254e3b5e am: 13f57006fd am: 1bef15bae0
Change-Id: Ia34a119272fa43075f38104853ab7a05ec1e86dc
2020-05-04 11:49:56 +00:00
Bonian Chen
e72bf7fd92 Merge "[Settings] Code refactor" into rvc-dev am: 1ab100e936 am: 91f2c3d931 am: b4c2f8c4d9 am: 45dbbfa3fd am: d14beedc47
Change-Id: I0fbef3f515db6a9413b49fcd046a11863a2db353
2020-05-04 11:46:14 +00:00
Bonian Chen
2d48e5781c Merge "[Settings] Enable access from non-UI thread" into rvc-dev am: 068eb89251 am: 3ce8cab000 am: 10c825bc4d am: 875eb90596 am: abc66cb99d
Change-Id: Ic4a1e7be430b7a5380d2142f1000a1f76d1dd0fe
2020-05-04 11:46:07 +00:00
Bonian Chen
d14beedc47 Merge "[Settings] Code refactor" into rvc-dev am: 1ab100e936 am: 91f2c3d931 am: b4c2f8c4d9 am: 45dbbfa3fd
Change-Id: Ic1f6a7c9e2012e054b1bcde52a71a9eded7cf38c
2020-05-04 11:46:03 +00:00
Automerger Merge Worker
1c80ef36d6 Merge "Merge "[Settings] Code refactor" into rvc-dev am: 1ab100e936 am: 32e7ea78b2" into rvc-d1-dev-plus-aosp am: 126bd277a0 am: 3e0cb5b6b4
Change-Id: I068d5de5835191baab95abeec907de946059cd9b
2020-05-04 11:46:01 +00:00
Bonian Chen
abc66cb99d Merge "[Settings] Enable access from non-UI thread" into rvc-dev am: 068eb89251 am: 3ce8cab000 am: 10c825bc4d am: 875eb90596
Change-Id: I1e62aa364773004d565ab6856c1194e9016f06b4
2020-05-04 11:45:55 +00:00
Bonian Chen
7cdfdce8f5 Merge "[Settings] Code refactor" into rvc-dev am: 1ab100e936 am: 91f2c3d931 am: 59145acf3e am: a8043fb520
Change-Id: If5a4b05426b6f465e6b14111b5ef65dc51c4f6e6
2020-05-04 11:45:52 +00:00
Bonian Chen
d55cb76f57 Merge "[Settings] Enable access from non-UI thread" into rvc-dev am: 068eb89251 am: 7bb7200eab am: 1467017836 am: 90c5ccae5f
Change-Id: I007175533159364c3166fb499c1a63a532f80b72
2020-05-04 11:45:45 +00:00