Bonian Chen
d737972b80
Merge "[Settings] Avoid from crash" into rvc-dev am: 7ff5f56ea6 am: e96b23a251
...
Change-Id: Ic39ceb05c07e14677df62561a4deef23b695b6d2
2020-05-05 03:52:40 +00:00
SongFerng Wang
46c66b1ad7
Merge "Remove the second network scan." into rvc-dev am: 28754bf6a8 am: c2c4a49752
...
Change-Id: I5d4ce5e2077086a85a98c010a71ec143b72bdd6f
2020-05-05 03:51:32 +00:00
SongFerng Wang
a3b8126f58
Merge "Remove the second network scan." into rvc-dev am: 28754bf6a8 am: c2c4a49752
...
Change-Id: I14e38adb702a7ce281944d767601f68d8ee0f690
2020-05-05 03:51:26 +00:00
Bonian Chen
d389bc1cb4
Merge "[Settings] Avoid from crash" into rvc-dev am: 7ff5f56ea6 am: 004301ca4e
...
Change-Id: I7a6eecd90b63f1a7ec4030fae2f8d52f95975403
2020-05-05 03:51:17 +00:00
Bonian Chen
16d87ef9cc
Merge "[Settings] Avoid from crash" into rvc-dev am: 7ff5f56ea6 am: 004301ca4e
...
Change-Id: I64df699fde97b29bf9b2de3803de8c243dfa9512
2020-05-05 03:51:13 +00:00
Bonian Chen
d5c09fbced
Merge "[Settings] Adopt TelephonyBasePreferenceController" into rvc-dev am: fb015a3c24 am: 551f515e6d
...
Change-Id: Ibe3efd7833ea504fa4032d832e8355467c2973bd
2020-05-05 03:51:10 +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
SongFerng Wang
004083a21f
Merge "Remove the second network scan." into rvc-dev am: 28754bf6a8
...
Change-Id: Ic1bc6791cf56171349f81273fa9a7b7c210a194e
2020-05-05 03:33:35 +00:00
Bonian Chen
e96b23a251
Merge "[Settings] Avoid from crash" into rvc-dev am: 7ff5f56ea6
...
Change-Id: Iadad44a8f094c5e589409434dfc5ff54a9dc283b
2020-05-05 03:33:29 +00:00
SongFerng Wang
c2c4a49752
Merge "Remove the second network scan." into rvc-dev am: 28754bf6a8
...
Change-Id: I05b12d26ba3015a24e97080bb98f1be416ae60fb
2020-05-05 03:33:06 +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
004301ca4e
Merge "[Settings] Avoid from crash" into rvc-dev am: 7ff5f56ea6
...
Change-Id: I19f2b0afbc408df1ae548c50bbbadd35de399c1b
2020-05-05 03:32:59 +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
hughchen
47994dea19
Add log for debug
...
This CL use flag to decide which log should be show on.
This flag can be dynamic turn on when use below command:
adb shell setprop log.tag."your tag" VERBOSE
Bug: 155121301
Test: manually test
Change-Id: I0f3a28c11f6bd055efc84feb41d646b6c033f5b7
2020-05-05 11:26:28 +08:00
SongFerng Wang
28754bf6a8
Merge "Remove the second network scan." into rvc-dev
2020-05-05 03:20:53 +00:00
Bonian Chen
7ff5f56ea6
Merge "[Settings] Avoid from crash" into rvc-dev
2020-05-05 03:17:50 +00:00
Bonian Chen
fb015a3c24
Merge "[Settings] Adopt TelephonyBasePreferenceController" into rvc-dev
2020-05-05 03:17:18 +00:00
Tim Peng
40111a5988
Update "Play <APP> to" to "Play <APP> on"
...
-design changes
Bug: 155345595
Test: build pass
Change-Id: I860673d22c57477bd2505360f0034731b28c7208
2020-05-05 11:01:03 +08: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
SongFerngWang
b7f98f7667
Remove the second network scan.
...
Fix: 153427564
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkSelectSettingsTest
(PASS)
Change-Id: If593fc4a4dd463bbc178b4864ad0ba01bb421b09
2020-05-04 22:31:15 +08: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
