Bill Yi
48acb04b48
[automerger skipped] Import translations. DO NOT MERGE am: f4fdb7aa6f
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I3e631a536a9e62e58375ef2d91bb940f5b018ed0
2020-04-11 21:42:13 +00:00
Bill Yi
f4fdb7aa6f
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: Ib326e867526a7b49d3134265abf3edc8293bb5f5
2020-04-11 12:06:30 -07:00
TreeHugger Robot
31888713b5
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: f95f9c9392
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I7c45466a049b54586b1d5f9336b51c74c257f862
2020-04-11 00:17:57 +00:00
TreeHugger Robot
f95f9c9392
Merge "Import translations. DO NOT MERGE" into rvc-d1-dev
2020-04-10 23:57:05 +00:00
TreeHugger Robot
c613c6cd58
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: a4225ef524
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I003a3ec11f7ff566d7cc9ed057e2875b3b5f94c4
2020-04-10 22:47:11 +00:00
TreeHugger Robot
a4225ef524
Merge "Import translations. DO NOT MERGE" into rvc-d1-dev
2020-04-10 22:40:51 +00:00
Joshua Duong
49cfa5db8e
Merge "[adbwifi] Add qstile for wireless debugging." into rvc-dev am: 99eeb00360
am: 7a0fbe20c2
...
Change-Id: I971480f5131231d0be34b2ed9d095712ac8bdabf
2020-04-10 22:31:40 +00:00
Joshua Duong
5cd4b55df6
Merge "[adbwifi] Add qstile for wireless debugging." into rvc-dev am: 99eeb00360
am: 2ae802aa4a
...
Change-Id: I3ab38093b30fa3cea522de86efba548cd83c70f5
2020-04-10 22:31:17 +00:00
Joshua Duong
2ae802aa4a
Merge "[adbwifi] Add qstile for wireless debugging." into rvc-dev am: 99eeb00360
...
Change-Id: I65671fb805807b23762954038061d7baedf8aac2
2020-04-10 22:12:20 +00:00
Joshua Duong
7a0fbe20c2
Merge "[adbwifi] Add qstile for wireless debugging." into rvc-dev am: 99eeb00360
...
Change-Id: Ifef0847142df532101d1abfb51903ddd2f126fcc
2020-04-10 22:10:39 +00:00
Joshua Duong
99eeb00360
Merge "[adbwifi] Add qstile for wireless debugging." into rvc-dev
2020-04-10 21:59:02 +00:00
Bill Yi
249b249162
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I8edf2232bd374be619ac31a6c2b71342c4023b62
2020-04-10 14:09:45 -07:00
Bill Yi
2ee020144e
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: Ie37a263449cc464c87062240472b94c9eda01ca2
2020-04-10 13:36:56 -07:00
Automerger Merge Worker
20bfa5707a
Merge "Fix padding on DND settings header am: 32f2839703
am: 1e640f4608" into rvc-d1-dev-plus-aosp
2020-04-10 20:06:19 +00:00
Beverly
3d6ffab023
Fix padding on DND settings header am: 32f2839703
am: 1e640f4608
...
Change-Id: I15551b3f9de6615af450d914f4873cdde134849c
2020-04-10 20:06:14 +00:00
Beverly
5704a262b4
Fix padding on DND settings header am: 32f2839703
am: 504f43c8fb
...
Change-Id: Ib333fab1a5183db2ed7d2059d149863f3a0064ea
2020-04-10 20:06:04 +00:00
Beverly
1e640f4608
Fix padding on DND settings header am: 32f2839703
...
Change-Id: I9aa8f7541b5ee23deec088b13a492ee6ead83461
2020-04-10 19:44:57 +00:00
Beverly
504f43c8fb
Fix padding on DND settings header am: 32f2839703
...
Change-Id: Id37351280a62f1f42727f5707883ad02f80e68cc
2020-04-10 19:43:36 +00:00
Xin Li
b19f478794
[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master am: ee75f54619
-s ours am: c6d43dd241
...
Change-Id: I63b961879721198c93248b856c2c5ea8f31e14d8
2020-04-10 19:27:41 +00:00
Joshua Duong
0f3eba36f2
[adbwifi] Add qstile for wireless debugging.
...
Bug: 153275926
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WirelessDebuggingTest
Change-Id: I6b381a7e29beec5c9c345b374e127caabdb674db
(cherry picked from commit 0c23d39f94
)
Exempt-From-Owner-Approval: cherry-pick
2020-04-10 19:12:40 +00:00
Xin Li
c6d43dd241
[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master am: ee75f54619
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I8b7e19ae4736d426d962e53a512774cee54a9be0
2020-04-10 19:07:15 +00:00
Beverly
32f2839703
Fix padding on DND settings header
...
Test: manual
Fixes: 152974082
Change-Id: Id34db63550ddc2ad89c15830e03bf9782df0a765
2020-04-10 12:30:57 -04:00
TreeHugger Robot
18709df8b1
Merge "Support click metrics logs in several pages" into rvc-dev am: afaf654a77
am: dde9ab5b62
...
Change-Id: If22d76d1d74e09127448298305ffea22c5ca3f00
2020-04-10 13:20:32 +00:00
Bonian Chen
385dd90371
Merge "[Settings] Avoid rename inactive subscription from NullPointerException" into rvc-dev am: e18904daab
am: 8a5272b307
...
Change-Id: Ia9815d0de9d01c3a362b9d1af75d620887cc240a
2020-04-10 13:20:15 +00:00
TreeHugger Robot
70f0c6a53f
Merge "Support click metrics logs in several pages" into rvc-dev am: afaf654a77
am: 976b3690fe
...
Change-Id: If078432fd8e8ab16653aedf000f6da85b9a7a327
2020-04-10 13:19:21 +00:00
Bonian Chen
5a45c3ff77
Merge "[Settings] Avoid rename inactive subscription from NullPointerException" into rvc-dev am: e18904daab
am: b72aa1c03a
...
Change-Id: I0193370f5b63f92abe6490839a571f0c6c6df422
2020-04-10 13:19:03 +00:00
TreeHugger Robot
976b3690fe
Merge "Support click metrics logs in several pages" into rvc-dev am: afaf654a77
...
Change-Id: I0cb34fead8cbcabf7eb01bd058f9604b5c7d19d0
2020-04-10 13:06:21 +00:00
TreeHugger Robot
dde9ab5b62
Merge "Support click metrics logs in several pages" into rvc-dev am: afaf654a77
...
Change-Id: I2cc663ea9aec69848bc96d6dc25e1895984b9731
2020-04-10 12:57:10 +00:00
Bonian Chen
8a5272b307
Merge "[Settings] Avoid rename inactive subscription from NullPointerException" into rvc-dev am: e18904daab
...
Change-Id: Ib2d9ecedaa764c9ea884f19f2a1db45cf62f9613
2020-04-10 12:56:32 +00:00
TreeHugger Robot
afaf654a77
Merge "Support click metrics logs in several pages" into rvc-dev
2020-04-10 12:55:10 +00:00
Bonian Chen
b72aa1c03a
Merge "[Settings] Avoid rename inactive subscription from NullPointerException" into rvc-dev am: e18904daab
...
Change-Id: Iadc2fa5c7e9ab9b15bf3105c303110c4c2c6d99b
2020-04-10 12:55:01 +00:00
Bonian Chen
e18904daab
Merge "[Settings] Avoid rename inactive subscription from NullPointerException" into rvc-dev
2020-04-10 12:37:42 +00:00
Bonian Chen
fd86a33e6e
Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: 866fa1061c
am: dc6d9e53d1
...
Change-Id: I9e3642cb2254918e6eeac768bfc55cde21e821d7
2020-04-10 12:14:26 +00:00
Bonian Chen
1031a3156f
Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: 866fa1061c
am: 369594d796
...
Change-Id: Ibd2e4ac878c48502f11a90faaad9a800b0ef3551
2020-04-10 12:12:52 +00:00
Bonian Chen
dc6d9e53d1
Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: 866fa1061c
...
Change-Id: I837ddd16902ad159d5f791c316ba4f962f754640
2020-04-10 11:51:45 +00:00
Bonian Chen
369594d796
Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: 866fa1061c
...
Change-Id: I9bbe02a684f97e50a66278b725814fc7cd9d4a7b
2020-04-10 11:50:17 +00:00
Bonian Chen
866fa1061c
Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev
2020-04-10 11:30:42 +00:00
Bonian Chen
cad93df0a4
[Settings] Avoid rename inactive subscription from NullPointerException
...
1. Init instance before accessing it
2. Re-enable test case
Bug: 147321836
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=RenameMobileNetworkDialogFragmentTest
Change-Id: Ifc245bec739b4c81d2cee04b091bcdb54d567d4a
(cherry picked from commit 1b71b5e601
)
2020-04-10 18:05:17 +08:00
TreeHugger Robot
b93584c2c3
Merge "[Settings] Add more owner" into rvc-dev am: 6e50dfc6ec
am: c865eb04bc
...
Change-Id: Ia399a97aef2c348bdd2765631431c132f8b3fd2f
2020-04-10 08:31:12 +00:00
Arc Wang
b5595ac01e
Merge "[Wi-Fi] Fix Hidden network option scrolls to bottom problem" into rvc-dev am: 57ff6599e7
am: c41420bd4e
...
Change-Id: Ia65e3e908cff4d521398eb7426ea6100c39f7c14
2020-04-10 08:31:06 +00:00
TreeHugger Robot
adde699c99
Merge "[Settings] Add more owner" into rvc-dev am: 6e50dfc6ec
am: f702bb94d0
...
Change-Id: I003ad64464a044d1fbc39431db81a4e32bcaeb37
2020-04-10 08:29:28 +00:00
Arc Wang
98d4d8a0d0
Merge "[Wi-Fi] Fix Hidden network option scrolls to bottom problem" into rvc-dev am: 57ff6599e7
am: 6253abc2ab
...
Change-Id: I5d49798c339ec62bc6b22e3a552887b1d7f38356
2020-04-10 08:29:18 +00:00
Bonian Chen
0304e5f90c
[Settings] Avoid from crash when pull out SIM
...
Avoid from crash when pull out SIM under SimStatusDialogController.
Bug: 153512823
Test: manual
Change-Id: I3869326bdfb65368827f25469ae83539a68e171f
2020-04-10 16:28:46 +08:00
TreeHugger Robot
c865eb04bc
Merge "[Settings] Add more owner" into rvc-dev am: 6e50dfc6ec
...
Change-Id: I03b72c6027dcfe40e60363d17e7ccbf5e6f7f58a
2020-04-10 08:10:50 +00:00
Arc Wang
c41420bd4e
Merge "[Wi-Fi] Fix Hidden network option scrolls to bottom problem" into rvc-dev am: 57ff6599e7
...
Change-Id: I5409c87391c8ec39bcdb1d9dcdf608b898d99cdf
2020-04-10 08:10:45 +00:00
TreeHugger Robot
f702bb94d0
Merge "[Settings] Add more owner" into rvc-dev am: 6e50dfc6ec
...
Change-Id: Ic6b440bafcb6f65dfe87f57fb5161b12c177923d
2020-04-10 08:09:20 +00:00
Arc Wang
6253abc2ab
Merge "[Wi-Fi] Fix Hidden network option scrolls to bottom problem" into rvc-dev am: 57ff6599e7
...
Change-Id: Ia6e3dfe09548e0ec83eede9c041c6a71539629ff
2020-04-10 08:09:14 +00:00
TreeHugger Robot
6e50dfc6ec
Merge "[Settings] Add more owner" into rvc-dev
2020-04-10 08:08:30 +00:00
Arc Wang
57ff6599e7
Merge "[Wi-Fi] Fix Hidden network option scrolls to bottom problem" into rvc-dev
2020-04-10 07:50:49 +00:00
Menghan Li
e530a1f597
Merge "Sets the scroll indicators for edit shortcut dialog." into rvc-dev am: 417011c6f7
am: e98d4b9971
...
Change-Id: Idac70369ee057628ff4e833a8d6f84132d2dc2f5
2020-04-10 06:53:33 +00:00