Wang Han
719b573173
Fix NPE if default supervisor is not defined
...
* Checking for null does not work sadly. This fixes NPE at
calling who.compareTo(supervisorComponent).
Change-Id: Ie49df625b1514b1d1e5f8063db66dce4a5050039
2020-05-15 14:06:11 +00:00
Automerger Merge Worker
cda2c58f1e
Merge "Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: 8b3c7b20b5 am: 2b8702ad88" into rvc-qpr-dev-plus-aosp am: dc6d6624ba am: ec28e4e674
...
Change-Id: I81546501e3889bfc2fde84089bf0a84942f9f725
2020-05-15 13:07:38 +00:00
Yanting Yang
9ed7204d8b
Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: b9104da715 am: b30ae28c9f am: 360fdd8886 am: f28b7d3bbc
...
Change-Id: Iabd9554db4c55ad8fe2723bc2259aa75560eb4da
2020-05-15 13:07:24 +00:00
Yanting Yang
046925a043
Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: b9104da715 am: 8a20f65064 am: fa064bf433 am: 838957c0f9
...
Change-Id: I6aa1512a8d07bf65c7ab5ef5d15664010187b10a
2020-05-15 13:07:12 +00:00
Automerger Merge Worker
ec28e4e674
Merge "Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: 8b3c7b20b5 am: 2b8702ad88" into rvc-qpr-dev-plus-aosp am: dc6d6624ba
...
Change-Id: Ia919586571ea06e7776a0911b520f85f6192aff7
2020-05-15 12:54:32 +00:00
Yanting Yang
f28b7d3bbc
Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: b9104da715 am: b30ae28c9f am: 360fdd8886
...
Change-Id: I238d957b0980000598efa6a58e0a4f2bb36116a5
2020-05-15 12:54:13 +00:00
Yanting Yang
838957c0f9
Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: b9104da715 am: 8a20f65064 am: fa064bf433
...
Change-Id: Ia51c13206f46b78aa7f23a86eb80683cc03d8af2
2020-05-15 12:53:51 +00:00
Automerger Merge Worker
dc6d6624ba
Merge "Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: 8b3c7b20b5 am: 2b8702ad88" into rvc-qpr-dev-plus-aosp
2020-05-15 12:31:46 +00:00
Yanting Yang
3fee8e0c8f
Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: 8b3c7b20b5 am: 2b8702ad88
...
Change-Id: I17b96ff3b0cb78823bea64d709e41e56c50fe16c
2020-05-15 12:31:41 +00:00
Yanting Yang
360fdd8886
Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: b9104da715 am: b30ae28c9f
...
Change-Id: I8bdcb7e50dd65f57870eef048519624bdb49aad5
2020-05-15 12:31:37 +00:00
Yanting Yang
fa064bf433
Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: b9104da715 am: 8a20f65064
...
Change-Id: Ie94785c96d827bd401c5cfc01e420770eed36f60
2020-05-15 12:31:26 +00:00
Yanting Yang
2b8702ad88
Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: 8b3c7b20b5
...
Change-Id: If84a87337bb5ecd5d8380111415188cc2a99cd54
2020-05-15 12:14:06 +00:00
Yanting Yang
b30ae28c9f
Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: b9104da715
...
Change-Id: I22020bae8d96593a3944745b3bde5448c2638aef
2020-05-15 12:13:56 +00:00
Yanting Yang
8a20f65064
Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7 am: b9104da715
...
Change-Id: Ifd6e80cd31be4654f250d040c43b133157d5a865
2020-05-15 12:13:32 +00:00
Treehugger Robot
8c1924d9c2
Merge "Settings performance testing" am: 9446266f4f am: 5797829fa6 am: f4383db1b7 am: a4bc83b985 am: 7f1f96ac92 am: d0b06f5bee
...
Change-Id: Ifaec6bdabbb5f55461804bd6ee1b5e714077c0ac
2020-05-15 12:08:00 +00:00
Yanting Yang
8b3c7b20b5
Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7
...
Change-Id: If322e9049dc828a406533694cd2062f4fe6456ac
2020-05-15 12:01:28 +00:00
Yanting Yang
b9104da715
Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev am: 5812014ff7
...
Change-Id: I21ed82dc007d52cd0e4d157ca20d07198830fbdc
2020-05-15 12:00:56 +00:00
Treehugger Robot
d0b06f5bee
Merge "Settings performance testing" am: 9446266f4f am: 5797829fa6 am: f4383db1b7 am: a4bc83b985 am: 7f1f96ac92
...
Change-Id: I7a40ddb61b37c66c5d621ace1b0a651398a108ef
2020-05-15 11:52:14 +00:00
Yanting Yang
5812014ff7
Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev
2020-05-15 11:44:20 +00:00
Treehugger Robot
7f1f96ac92
Merge "Settings performance testing" am: 9446266f4f am: 5797829fa6 am: f4383db1b7 am: a4bc83b985
...
Change-Id: I2626f40f54a84bed005cc0c5568c9e9b7776e990
2020-05-15 11:40:29 +00:00
Treehugger Robot
a4bc83b985
Merge "Settings performance testing" am: 9446266f4f am: 5797829fa6 am: f4383db1b7
...
Change-Id: I50203efaf62eb49dec858314befe635cd2f1c030
2020-05-15 11:14:13 +00:00
Treehugger Robot
f4383db1b7
Merge "Settings performance testing" am: 9446266f4f am: 5797829fa6
...
Change-Id: I84c0d95de3f1cc108197cc3f8ab88a9a1d08b0bc
2020-05-15 10:57:57 +00:00
Treehugger Robot
5797829fa6
Merge "Settings performance testing" am: 9446266f4f
...
Change-Id: Ie761e966d27c4aaf7e28850b0a01fc06650c4738
2020-05-15 10:43:29 +00:00
Treehugger Robot
9446266f4f
Merge "Settings performance testing"
2020-05-15 10:28:54 +00:00
govenliu
23d91663f6
[Wi-Fi] Enhance AddAppNetworksFragment unit test cases
...
Add new unit test cases in AddAppNetworksFragmentTest.java
The coverage rate of com.android.settings.wifi.addappnetworks will raise from 65% to 81%
Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AddAppNetworksFragmentTest
Change-Id: Iae15b5ad27b20f90cbf8b0318a24a9069b738a33
2020-05-15 16:05:45 +08:00
youtengliang
1bf3f1c26a
Settings performance testing
...
1. Change TEST_TIME to 10 to avoid timeout fail.
Test: atest SettingsPerfTests:LaunchSettingsTest
Change-Id: Id1ec855196b3e8b5fdd28c0d683aa95b002a8462
2020-05-15 14:26:14 +08:00
Tim Peng
77bec31eb5
Output switcher shows the device list by an incorrect package name
...
-Reset package name when it is different with previous one
-Add test case
Bug: 156561856
Test: make -j50 RunSettingsRoboTests
Change-Id: I7931ebbc59ab404f12473fe29f2735ad3a8197fd
2020-05-15 06:26:03 +00:00
Tim Peng
a5280fcc51
"Play null on" displayed under media volume
...
-Reset package name when it is different with previous one
-Add test case
Bug: 156224161
Test: make -j50 RunSettingsRoboTests
Change-Id: Ifcacc171d86017b702f51343036e0ebf0e0d1989
2020-05-15 06:25:54 +00:00
Bill Yi
252a7e787a
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: Id8b4468f197b5ce37e87fa9c838f4f1f8a1b300a
2020-05-14 23:24:04 -07:00
Edgar Wang
45256dee2f
Update string to keep On-screen keyboard naming consistent
...
Bug: 153675083
Test: manual
Change-Id: I64a193435bbf189cc417410e736f73d789fbbe1e
2020-05-15 13:42:24 +08:00
Bill Yi
77ca378baf
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I8cec3fe3f700c506f7dcc823108aea9ab3a4dbc6
2020-05-14 22:40:02 -07:00
Peter_Liang
606479bc81
Add the content description for accessibility tutorial pages.
...
Bug: 155833961
Test: manual test & robo test
Change-Id: Iec86a6478706dcf6ce224046e8439a3d3b68144a
2020-05-15 13:34:36 +08:00
Bill Yi
c1bb4c3045
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: If1e3664a49ff6fa6582310eb0b3bc7aa8a620423
2020-05-14 21:56:56 -07:00
Automerger Merge Worker
ec43732292
Merge "Merge "In Media Switch output panel, Switch access shouldn't select the first device when selecting the device list" into rvc-dev am: 764387772f am: 0eec352212 am: 0311911672" into rvc-qpr-dev-plus-aosp am: 13fda9098e am: fd10e640b9
...
Change-Id: I3f595f0a664b040f5fedaf4b4eeba096601bc17c
2020-05-15 04:23:08 +00:00
tim peng
418f12ab80
Merge "In Media Switch output panel, Switch access shouldn't select the first device when selecting the device list" into rvc-dev am: 764387772f am: bd75d389e9 am: 8913b46ff5 am: 2ad13b6ad6 am: ca7f6d053a
...
Change-Id: Ia8660d6a0eefea08eef79c608f0ff5e741e4f980
2020-05-15 04:22:49 +00:00
tim peng
1964164294
Merge "In Media Switch output panel, Switch access shouldn't select the first device when selecting the device list" into rvc-dev am: 764387772f am: 0eec352212 am: 7c834b43dc am: 2e9f24c131 am: 71972d0d54
...
Change-Id: I817ce009d4c76d57322a8157fdb68181ff40f802
2020-05-15 04:22:25 +00:00
Bill Yi
5f50215f6b
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I5f3e159c71ba612729b775ce6e9a43ea56ce5a15
2020-05-14 21:13:24 -07:00
Automerger Merge Worker
fd10e640b9
Merge "Merge "In Media Switch output panel, Switch access shouldn't select the first device when selecting the device list" into rvc-dev am: 764387772f am: 0eec352212 am: 0311911672" into rvc-qpr-dev-plus-aosp am: 13fda9098e
...
Change-Id: I8cc99b168aff5ecc37c9758d25e4f59c1d052636
2020-05-15 04:09:51 +00:00
tim peng
ca7f6d053a
Merge "In Media Switch output panel, Switch access shouldn't select the first device when selecting the device list" into rvc-dev am: 764387772f am: bd75d389e9 am: 8913b46ff5 am: 2ad13b6ad6
...
Change-Id: Ifcdbeb620293afd0a84b4e337710c0aa09ef1e28
2020-05-15 04:09:27 +00:00
tim peng
71972d0d54
Merge "In Media Switch output panel, Switch access shouldn't select the first device when selecting the device list" into rvc-dev am: 764387772f am: 0eec352212 am: 7c834b43dc am: 2e9f24c131
...
Change-Id: Ia5200dc1bf0c5fd175bae2235709ffaa4e7ef6ca
2020-05-15 04:08:51 +00:00
Automerger Merge Worker
13fda9098e
Merge "Merge "In Media Switch output panel, Switch access shouldn't select the first device when selecting the device list" into rvc-dev am: 764387772f am: 0eec352212 am: 0311911672" into rvc-qpr-dev-plus-aosp
2020-05-15 03:50:56 +00:00
tim peng
5c217c8208
Merge "In Media Switch output panel, Switch access shouldn't select the first device when selecting the device list" into rvc-dev am: 764387772f am: 0eec352212 am: 0311911672
...
Change-Id: If02ab431efd362db7adbb70abe5aac77edfc23ab
2020-05-15 03:50:46 +00:00
tim peng
2ad13b6ad6
Merge "In Media Switch output panel, Switch access shouldn't select the first device when selecting the device list" into rvc-dev am: 764387772f am: bd75d389e9 am: 8913b46ff5
...
Change-Id: I7776b58202c63e6200edba089d07c7c0448dd9e9
2020-05-15 03:50:45 +00:00
tim peng
2e9f24c131
Merge "In Media Switch output panel, Switch access shouldn't select the first device when selecting the device list" into rvc-dev am: 764387772f am: 0eec352212 am: 7c834b43dc
...
Change-Id: Ie41ec89197ad37f3f95a54ee78acfbc99dfb0ca3
2020-05-15 03:50:21 +00:00
tim peng
a20d54fe7f
Merge "Display previous active media information" into rvc-dev am: 72638462e1 am: 317f7358e5 am: 0bb6fa1f2e am: f56d85628b am: 3fe52bfe4e
...
Change-Id: Ib38e6763ef0ba22b6e6b232a3c297013282fc050
2020-05-15 03:34:22 +00:00
Automerger Merge Worker
d257fd977d
Merge "Merge "Display previous active media information" into rvc-dev am: 72638462e1 am: 56ed13a15b" into rvc-d1-dev-plus-aosp am: 17a295a69c am: 3abf9019f3 am: 63d0cea97e
...
Change-Id: I128ef8acff227c0c6a146ae12a5e691e2eea4801
2020-05-15 03:34:04 +00:00
tim peng
0311911672
Merge "In Media Switch output panel, Switch access shouldn't select the first device when selecting the device list" into rvc-dev am: 764387772f am: 0eec352212
...
Change-Id: I4048a2543c12b3e3567a8b79129653c11809c968
2020-05-15 03:33:41 +00:00
tim peng
8913b46ff5
Merge "In Media Switch output panel, Switch access shouldn't select the first device when selecting the device list" into rvc-dev am: 764387772f am: bd75d389e9
...
Change-Id: Id8a0a41f34ef140941ad8af0931f6c1396cec732
2020-05-15 03:33:41 +00:00
tim peng
bb35664aa4
Merge "Display previous active media information" into rvc-dev am: 72638462e1 am: 317f7358e5 am: 435d8f80f1 am: af633d3916 am: 84ed686f8c
...
Change-Id: I7d67893302b6e487080fa5c9aebf3cc9f250c297
2020-05-15 03:33:40 +00:00
tim peng
7c834b43dc
Merge "In Media Switch output panel, Switch access shouldn't select the first device when selecting the device list" into rvc-dev am: 764387772f am: 0eec352212
...
Change-Id: Ie2ece21e9907a8582e96b1b8a921780fa70b892d
2020-05-15 03:33:15 +00:00
