Automerger Merge Worker
1012257cdc
Merge "Merge "[Wi-Fi] Add IMSI privacy protection warning summary" into rvc-dev am: 0a98937baf
am: beacdf9774" into rvc-d1-dev-plus-aosp
2020-04-24 08:57:02 +00:00
TreeHugger Robot
f306df38f2
Merge "[Wi-Fi] Add IMSI privacy protection warning summary" into rvc-dev am: 0a98937baf
am: beacdf9774
...
Change-Id: Ic2f98d74f765f3d9f261be5a555bef218419b4ff
2020-04-24 08:56:57 +00:00
TreeHugger Robot
46917ef154
Merge "[Wi-Fi] Add IMSI privacy protection warning summary" into rvc-dev am: 0a98937baf
am: 204c1bc8f5
...
Change-Id: I18fd9c5bcfd70db343fb9ecd0eefda724f47c3b7
2020-04-24 08:56:46 +00:00
TreeHugger Robot
beacdf9774
Merge "[Wi-Fi] Add IMSI privacy protection warning summary" into rvc-dev am: 0a98937baf
...
Change-Id: Idb79edf5ef01ab33bcbd6625279f2eb21cd44c68
2020-04-24 08:40:06 +00:00
TreeHugger Robot
204c1bc8f5
Merge "[Wi-Fi] Add IMSI privacy protection warning summary" into rvc-dev am: 0a98937baf
...
Change-Id: I061f46e5d5c3f42d8265ad490858398469f0a6b6
2020-04-24 08:40:02 +00:00
TreeHugger Robot
0a98937baf
Merge "[Wi-Fi] Add IMSI privacy protection warning summary" into rvc-dev
2020-04-24 08:32:55 +00:00
Tim Peng
c433a867b3
Dynamic grouping failed the first time
...
-Check if Worker is null
-Add test case
Bug: 154875482
Test: make -j50 RunSettingsRoboTests
Change-Id: I84572ef77cc9a48c3133d96fd2255754bc1cf67c
2020-04-24 07:45:24 +00:00
TreeHugger Robot
7732407cd2
Merge "Cast device missing from output switcher list" into rvc-dev am: c38c02eec8
am: 6a61af8835
...
Change-Id: I0e1a3588203163db4e7b84bed1e481890a634fba
2020-04-24 06:53:13 +00:00
Automerger Merge Worker
b0251be0e2
Merge "Merge "[Wi-Fi] Add new unit test file WifiP2pSettingsTest.java." into rvc-dev am: a4590dc227
am: ab43d59d5d" into rvc-d1-dev-plus-aosp
2020-04-24 06:53:11 +00:00
TreeHugger Robot
c791db3025
Merge "[Wi-Fi] Add new unit test file WifiP2pSettingsTest.java." into rvc-dev am: a4590dc227
am: ab43d59d5d
...
Change-Id: I7d9e16f579a1984aeca9c39c00c04ab92162032c
2020-04-24 06:53:06 +00:00
TreeHugger Robot
c5f2e1defb
Merge "Cast device missing from output switcher list" into rvc-dev am: c38c02eec8
am: e313fb3f87
...
Change-Id: Id26d166bcc98295be1fb1dd746a336354fa84e4e
2020-04-24 06:53:02 +00:00
TreeHugger Robot
1292188a56
Merge "[Wi-Fi] Add new unit test file WifiP2pSettingsTest.java." into rvc-dev am: a4590dc227
am: 1bb16670c6
...
Change-Id: Iecf8ef5d296089b5db46ca0d6beb1f6ed939cce1
2020-04-24 06:52:52 +00:00
TreeHugger Robot
6a61af8835
Merge "Cast device missing from output switcher list" into rvc-dev am: c38c02eec8
...
Change-Id: I3b4fe4f42696714a5db28bee5e8cb17fa18e3ead
2020-04-24 06:41:35 +00:00
TreeHugger Robot
ab43d59d5d
Merge "[Wi-Fi] Add new unit test file WifiP2pSettingsTest.java." into rvc-dev am: a4590dc227
...
Change-Id: I959183b22cb6b33a8f2ae9f28d2c6130c47447df
2020-04-24 06:41:28 +00:00
TreeHugger Robot
e313fb3f87
Merge "Cast device missing from output switcher list" into rvc-dev am: c38c02eec8
...
Change-Id: I7ce674115efa5c6feec33e2a53946ab1876ea52f
2020-04-24 06:41:23 +00:00
TreeHugger Robot
1bb16670c6
Merge "[Wi-Fi] Add new unit test file WifiP2pSettingsTest.java." into rvc-dev am: a4590dc227
...
Change-Id: I21cd0fe886eecedd3474f0ff77c76d730a7bd82d
2020-04-24 06:41:16 +00:00
TreeHugger Robot
c38c02eec8
Merge "Cast device missing from output switcher list" into rvc-dev
2020-04-24 06:25:04 +00:00
TreeHugger Robot
a4590dc227
Merge "[Wi-Fi] Add new unit test file WifiP2pSettingsTest.java." into rvc-dev
2020-04-24 06:23:06 +00:00
TreeHugger Robot
5b6c790fc2
Merge "Update low battery level for advance bluetooth device" into rvc-dev am: 5eeec19464
am: f315f49a91
...
Change-Id: Iea5452b935575cc5def2bb6542deb92fdfb16e64
2020-04-24 05:48:01 +00:00
TreeHugger Robot
f98b6fe342
Merge "Update low battery level for advance bluetooth device" into rvc-dev am: 5eeec19464
am: 254de52561
...
Change-Id: Ia0809929827852856411ca3eb5483743eaac3b95
2020-04-24 05:47:44 +00:00
TreeHugger Robot
f315f49a91
Merge "Update low battery level for advance bluetooth device" into rvc-dev am: 5eeec19464
...
Change-Id: I986571d0650157becbf1efd11a9891eb5478e4bf
2020-04-24 05:35:09 +00:00
TreeHugger Robot
254de52561
Merge "Update low battery level for advance bluetooth device" into rvc-dev am: 5eeec19464
...
Change-Id: Iaab07a1e88463a4c1e346aaae2de83cf39383b57
2020-04-24 05:34:57 +00:00
TreeHugger Robot
5eeec19464
Merge "Update low battery level for advance bluetooth device" into rvc-dev
2020-04-24 05:25:59 +00:00
govenliu
d59d32e106
[Wi-Fi] Add new unit test file WifiP2pSettingsTest.java.
...
Add new unit test file WifiP2pSettingsTest.java.
Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiP2pSettingsTest
Change-Id: I686658969a801e385a102022c6854d8bb8972d3c
2020-04-24 13:03:09 +08:00
Menghan Li
69b80f5d0b
Merge "Refines accessibility button in shortcut summary strings" into rvc-dev am: 5cb20b91b2
am: ff664b00ca
...
Change-Id: I21c50002809ed996aee2feb2c892a77fe6db4fe2
2020-04-24 04:48:19 +00:00
Tim Peng
f04061372e
Cast device missing from output switcher list
...
-Slice max height is not enough
-Set 1.5x max height
Bug: 154876307
Test: manual test
Change-Id: I720af9e324c830f9faf55ac4066f990379fc32f4
2020-04-24 12:42:55 +08:00
Menghan Li
39ddda3cda
Merge "Refines accessibility button in shortcut summary strings" into rvc-dev am: 5cb20b91b2
am: 739cc4f500
...
Change-Id: I57711b2a916406c8dc63fe2abc3287ff35cfeeb0
2020-04-24 04:38:47 +00:00
Menghan Li
ff664b00ca
Merge "Refines accessibility button in shortcut summary strings" into rvc-dev am: 5cb20b91b2
...
Change-Id: I725e2eb30c286676ea8679083b5702457f623e41
2020-04-24 04:27:35 +00:00
Menghan Li
739cc4f500
Merge "Refines accessibility button in shortcut summary strings" into rvc-dev am: 5cb20b91b2
...
Change-Id: I4150acb13d7832c37ea01923f43623ab1c9f09c6
2020-04-24 04:27:24 +00:00
Menghan Li
5cb20b91b2
Merge "Refines accessibility button in shortcut summary strings" into rvc-dev
2020-04-24 04:18:05 +00:00
Bonian Chen
8a0f3d8ff5
Merge "[Settings] Support the display of data usage when SIM inactive" into rvc-dev am: a26a7afe8e
am: 9a283d43c5
...
Change-Id: I89d5251e71a522d83790d7dbf6a03a95b5ee3aa5
2020-04-24 03:48:27 +00:00
Bonian Chen
cbd37d7b85
Merge "[Settings] Support the display of data usage when SIM inactive" into rvc-dev am: a26a7afe8e
am: bb30fbedcd
...
Change-Id: I4b57d56ee06bed635829b53d3558104e98a99b09
2020-04-24 03:47:33 +00:00
hughchen
828ccaf399
Update low battery level for advance bluetooth device
...
Bug: 154569936
Test: build pass
Change-Id: I52bb8eea4f69ae55a6902e3afb862aa8c7319785
2020-04-24 11:41:59 +08:00
Bonian Chen
87a4577472
[Settings] Support re-init DataUsageSummaryPreferenceController
...
Support re-init DataUsageSummaryPreferenceController without
re-constructing it.
Bug: 151751844
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsageSummaryPreferenceControllerTest
Change-Id: If72a521c5fbaec8b8902fb80b13d9d0f07c716af
2020-04-24 11:35:44 +08:00
Bonian Chen
bb30fbedcd
Merge "[Settings] Support the display of data usage when SIM inactive" into rvc-dev am: a26a7afe8e
...
Change-Id: I3e0635913a13a91737626820bb543d0d0df1f440
2020-04-24 03:28:49 +00:00
Bonian Chen
9a283d43c5
Merge "[Settings] Support the display of data usage when SIM inactive" into rvc-dev am: a26a7afe8e
...
Change-Id: Ia456660917ae589ec162804d8e582ae2ce5100b5
2020-04-24 03:28:47 +00:00
Jason Hsu
7afa4dd1be
Merge "Use new setting key to maintain the list of user assigned shortcut targets." into rvc-dev am: 79d73eaa59
am: 2dc9e9ad76
...
Change-Id: If6daebd9b285fe2a369009c3c68a31656085bff6
2020-04-24 03:17:03 +00:00
Bonian Chen
a26a7afe8e
Merge "[Settings] Support the display of data usage when SIM inactive" into rvc-dev
2020-04-24 03:16:14 +00:00
Jason Hsu
4d2022a4d9
Merge "Use new setting key to maintain the list of user assigned shortcut targets." into rvc-dev am: 79d73eaa59
am: faa9c3b033
...
Change-Id: I58a15bad18d310302ac02e4dd906feca738d8c24
2020-04-24 03:15:36 +00:00
Jason Hsu
faa9c3b033
Merge "Use new setting key to maintain the list of user assigned shortcut targets." into rvc-dev am: 79d73eaa59
...
Change-Id: Iaa61f1e8e9c24aae3c5438ae0b86d1d8be745603
2020-04-24 03:10:45 +00:00
Jason Hsu
2dc9e9ad76
Merge "Use new setting key to maintain the list of user assigned shortcut targets." into rvc-dev am: 79d73eaa59
...
Change-Id: I519d11ebd2ae4e7a29b62c7b93338f50ee28a9b0
2020-04-24 03:10:06 +00:00
Jason Hsu
79d73eaa59
Merge "Use new setting key to maintain the list of user assigned shortcut targets." into rvc-dev
2020-04-24 03:07:39 +00:00
Bonian Chen
76627e415d
[Settings] Fix DataUsageUtilsTest
...
Fix DataUsageUtilsTest
Bug: 154564365
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsageUtilsTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsageSummaryTest
Change-Id: Iff614135dfb0015deb5220fbf7f9338322def507
2020-04-24 10:46:30 +08:00
Bonian Chen
ccc50761e5
Merge "[Settings] Fix DataUsageSummaryTest" into rvc-dev am: 4908511b17
am: 8c87a8c0d6
...
Change-Id: I087e5bf8580e8a35b41f66cf93c38115ce727dbe
2020-04-24 01:51:09 +00:00
Bonian Chen
d6471bfe2b
Merge "[Settings] Fix DataUsageSummaryTest" into rvc-dev am: 4908511b17
am: da77a404c0
...
Change-Id: I8b32cf4028d715a3c295a993e20b6cbbda189509
2020-04-24 01:48:36 +00:00
menghanli
2869235a86
Refines accessibility button in shortcut summary strings
...
Root cause: we plan to only capitalize the first letter only, it would cause
this sentence has new capitalized issue.
Next: Refines the sentence.
Bug: 148837311
Test: Manual test
Change-Id: I0f6d3d1a3713701b4e2cd09eb49706bbe4604ce9
2020-04-24 01:41:49 +00:00
Bonian Chen
da77a404c0
Merge "[Settings] Fix DataUsageSummaryTest" into rvc-dev am: 4908511b17
...
Change-Id: I888b0bd6b7f8280816046d31549d132091e6fa4e
2020-04-24 01:34:06 +00:00
Bonian Chen
8c87a8c0d6
Merge "[Settings] Fix DataUsageSummaryTest" into rvc-dev am: 4908511b17
...
Change-Id: I96c1398a6e680884ba52f1e8181d0248359469f1
2020-04-24 01:33:34 +00:00
Bonian Chen
4908511b17
Merge "[Settings] Fix DataUsageSummaryTest" into rvc-dev
2020-04-24 01:18:25 +00:00
TreeHugger Robot
2a6d9643a2
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 58d4aab3c2
-s ours am: 9e2cc1c981
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I2dbc763bf1dfa28fe13e3fb24893ab6724e562ec
2020-04-24 00:20:44 +00:00