Commit Graph

68574 Commits

Author SHA1 Message Date
TreeHugger Robot
9a5f84a77e Merge "Add log for debug" into rvc-dev am: e92fbec391 am: 2c8d10d14d
Change-Id: Iac36dd6b75e71de8336a26c7b524a0b9f1853462
2020-05-05 05:41:07 +00:00
TreeHugger Robot
f6c3d52bed Merge "Add log for debug" into rvc-dev am: e92fbec391 am: 2c8d10d14d
Change-Id: I84637891626a3d944b059b73244696e628fb5c2d
2020-05-05 05:40:27 +00:00
TreeHugger Robot
d29dd6ca5e Merge "Add a keywords for "Pair new deivce"" into rvc-dev 2020-05-05 05:39:29 +00:00
TreeHugger Robot
8cd75c8398 Merge "Add log for debug" into rvc-dev am: e92fbec391
Change-Id: I07ce6d9ba6101e7c4a09084c8a88dfec20edd701
2020-05-05 05:24:55 +00:00
TreeHugger Robot
2c8d10d14d Merge "Add log for debug" into rvc-dev am: e92fbec391
Change-Id: I3b1f40a4915994863f1fcbb0ea01c8d6f44c7e08
2020-05-05 05:24:51 +00:00
TreeHugger Robot
e92fbec391 Merge "Add log for debug" into rvc-dev 2020-05-05 05:11:53 +00:00
SongFerng Wang
64c6682d7d Merge "Remove the second network scan." into rvc-dev am: 28754bf6a8 am: c2c4a49752 am: 46c66b1ad7 am: 7f0f127843 am: 34a5f25900 am: de22bf4919
Change-Id: Ic44c8ab1b1f061d1932efcb2aad4c00909fdbd84
2020-05-05 04:43:01 +00:00
Bonian Chen
4a2575d5a8 Merge "[Settings] Avoid from crash" into rvc-dev am: 7ff5f56ea6 am: 004301ca4e am: d389bc1cb4 am: ec277b8169 am: d99c69104f am: cf2a0deac6
Change-Id: I1cb59cd8068c7000eeb9764328628d359913b749
2020-05-05 04:42:55 +00:00
Bonian Chen
54ab1fe8c7 Merge "[Settings] Adopt TelephonyBasePreferenceController" into rvc-dev am: fb015a3c24 am: 551f515e6d am: d5c09fbced am: fa1927aaf0 am: e51201e478 am: 9ab1185903
Change-Id: Ib80b9eb2f119d275deb87b08e113d369f4725e81
2020-05-05 04:42:49 +00:00
SongFerng Wang
4a8d581a92 Merge "Remove the second network scan." into rvc-dev am: 28754bf6a8 am: 004083a21f am: b68d161356 am: 0fdb047d7c am: ea12097b5d
Change-Id: Ie284bb33ec844816c5d2b565d9c0e640c331b60a
2020-05-05 04:42:41 +00:00
Bonian Chen
6d96d99d4d Merge "[Settings] Avoid from crash" into rvc-dev am: 7ff5f56ea6 am: e96b23a251 am: d737972b80 am: 49b6457633 am: 56fae18451
Change-Id: I5313f05bc7c8dc6afb2b4ae1b1084ed6c182e615
2020-05-05 04:42:32 +00:00
SongFerng Wang
8f0714acc6 Merge "Remove the second network scan." into rvc-dev am: 28754bf6a8 am: c2c4a49752 am: a3b8126f58 am: db36d301bd am: 58b5e2afa1
Change-Id: If4ac37d40a8c5d454c12cd9a9260e8efd898ca26
2020-05-05 04:42:25 +00:00
Bonian Chen
1502a58525 Merge "[Settings] Avoid from crash" into rvc-dev am: 7ff5f56ea6 am: 004301ca4e am: 16d87ef9cc am: 8c3eb78196 am: d136f1a9d7
Change-Id: I2bced6bf62e749168dacd8be85f7d98c8c8044a5
2020-05-05 04:42:20 +00:00
Automerger Merge Worker
75b7ec3167 Merge "Merge "[Settings] Adopt TelephonyBasePreferenceController" into rvc-dev am: fb015a3c24 am: 551f515e6d" into rvc-d1-dev-plus-aosp am: 01f6620449 am: 6535980f84 am: 6dc769ae3c
Change-Id: I045b97b103745909c0df73843ab87b931bfc9c5f
2020-05-05 04:42:12 +00:00
Bonian Chen
b41a207df7 Merge "[Settings] Adopt TelephonyBasePreferenceController" into rvc-dev am: fb015a3c24 am: 24314ee382 am: 0e7240ae04 am: 0927ca0905 am: d84c48b50d
Change-Id: I4890b6f6c6df083f0acbd406196bc45298af8c71
2020-05-05 04:42:06 +00:00
SongFerng Wang
de22bf4919 Merge "Remove the second network scan." into rvc-dev am: 28754bf6a8 am: c2c4a49752 am: 46c66b1ad7 am: 7f0f127843 am: 34a5f25900
Change-Id: I4707e512bbe1d24ab13e76de5a90300d7a12f1b0
2020-05-05 04:28:46 +00:00
Bonian Chen
cf2a0deac6 Merge "[Settings] Avoid from crash" into rvc-dev am: 7ff5f56ea6 am: 004301ca4e am: d389bc1cb4 am: ec277b8169 am: d99c69104f
Change-Id: Ibc78a6a7958532aee03ab4d77d3c69536016dac2
2020-05-05 04:28:38 +00:00
Bonian Chen
9ab1185903 Merge "[Settings] Adopt TelephonyBasePreferenceController" into rvc-dev am: fb015a3c24 am: 551f515e6d am: d5c09fbced am: fa1927aaf0 am: e51201e478
Change-Id: I589a1c6b644fbf46c760f3bed8ca9ff7b78899c5
2020-05-05 04:28:31 +00:00
SongFerng Wang
ea12097b5d Merge "Remove the second network scan." into rvc-dev am: 28754bf6a8 am: 004083a21f am: b68d161356 am: 0fdb047d7c
Change-Id: I4cd3d7b260a6dcc6293a9281a2ad218ec978ec9b
2020-05-05 04:28:25 +00:00
Bonian Chen
56fae18451 Merge "[Settings] Avoid from crash" into rvc-dev am: 7ff5f56ea6 am: e96b23a251 am: d737972b80 am: 49b6457633
Change-Id: I33023ebf8e5e1aaf9244e7159a014fe57d5fcaf4
2020-05-05 04:28:17 +00:00
SongFerng Wang
58b5e2afa1 Merge "Remove the second network scan." into rvc-dev am: 28754bf6a8 am: c2c4a49752 am: a3b8126f58 am: db36d301bd
Change-Id: I08a4383337430927efdb4eaa9c99e9602cc542e6
2020-05-05 04:27:46 +00:00
Bonian Chen
d136f1a9d7 Merge "[Settings] Avoid from crash" into rvc-dev am: 7ff5f56ea6 am: 004301ca4e am: 16d87ef9cc am: 8c3eb78196
Change-Id: Ie085defbe32773a42e6de9f3d4293d487c065aff
2020-05-05 04:27:23 +00:00
SongFerng Wang
34a5f25900 Merge "Remove the second network scan." into rvc-dev am: 28754bf6a8 am: c2c4a49752 am: 46c66b1ad7 am: 7f0f127843
Change-Id: Ie4d03f456bff214a2a4c279dd45e9dc2042bb0f4
2020-05-05 04:26:33 +00:00
Bonian Chen
d99c69104f Merge "[Settings] Avoid from crash" into rvc-dev am: 7ff5f56ea6 am: 004301ca4e am: d389bc1cb4 am: ec277b8169
Change-Id: Ibd978464924953c29346dbbe26e9f2ca2656a505
2020-05-05 04:26:14 +00:00
Bonian Chen
e51201e478 Merge "[Settings] Adopt TelephonyBasePreferenceController" into rvc-dev am: fb015a3c24 am: 551f515e6d am: d5c09fbced am: fa1927aaf0
Change-Id: I61cb349945fa3122651dfa21e56c1f5c72665e8e
2020-05-05 04:26:05 +00:00
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
SongFerng Wang
0fdb047d7c Merge "Remove the second network scan." into rvc-dev am: 28754bf6a8 am: 004083a21f am: b68d161356
Change-Id: If618c6bcfce699ae96d69fe3656ac56a6019dfdf
2020-05-05 04:11:38 +00:00
Bonian Chen
49b6457633 Merge "[Settings] Avoid from crash" into rvc-dev am: 7ff5f56ea6 am: e96b23a251 am: d737972b80
Change-Id: Ia27abbe9c32f28727c0522118b0526d999d70c68
2020-05-05 04:11:32 +00:00
SongFerng Wang
db36d301bd Merge "Remove the second network scan." into rvc-dev am: 28754bf6a8 am: c2c4a49752 am: a3b8126f58
Change-Id: I905be25cef659d11449ff5322144f22473bee76f
2020-05-05 04:11:26 +00:00
Bonian Chen
8c3eb78196 Merge "[Settings] Avoid from crash" into rvc-dev am: 7ff5f56ea6 am: 004301ca4e am: 16d87ef9cc
Change-Id: I6b5b51244a5b8fca55671b83974eaff79e943931
2020-05-05 04:11:09 +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
SongFerng Wang
7f0f127843 Merge "Remove the second network scan." into rvc-dev am: 28754bf6a8 am: c2c4a49752 am: 46c66b1ad7
Change-Id: I197ea8cc39a5ac75bf7800fce7c89f2a513955c5
2020-05-05 04:09:12 +00:00
Bonian Chen
ec277b8169 Merge "[Settings] Avoid from crash" into rvc-dev am: 7ff5f56ea6 am: 004301ca4e am: d389bc1cb4
Change-Id: I8aafe87a3a63d70c1be15e752fd6e79f6fff3755
2020-05-05 04:09:05 +00:00
Bonian Chen
fa1927aaf0 Merge "[Settings] Adopt TelephonyBasePreferenceController" into rvc-dev am: fb015a3c24 am: 551f515e6d am: d5c09fbced
Change-Id: I071bea1df7a1e897634894ce5b6dcd6466581e01
2020-05-05 04:08:50 +00:00
Tsung-Mao Fang
67fd2e916d Add a keywords for "Pair new deivce"
In new search version, our search won't show summary anymore.
So, we should add a new keyword so that search can find this
setting with "bluetooth" query.

Test: Rebuilt rom and see "Pair new device" in search
Fix: 15575560
Change-Id: I50b5ab10aafcab423f24341229f69c06b0176643
2020-05-05 12:03:15 +08:00
SongFerngWang
abf31a44c8 There are two same items in manual selection page, remove one item
Bug: 155703755
Test: To check UI. PASS
Change-Id: I8c9fb80ab761599abdfd6640410fdccedec444d0
2020-05-05 03:59:15 +00:00
SongFerng Wang
b68d161356 Merge "Remove the second network scan." into rvc-dev am: 28754bf6a8 am: 004083a21f
Change-Id: Idaa332aa45304d0975828774c18a980b08f39942
2020-05-05 03:52:50 +00:00
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