Commit Graph

11179 Commits

Author SHA1 Message Date
Bonian Chen
a2c9b0e9f7 Merge "[Settings] Fix DataUsageSummaryPreferenceControllerTest" into rvc-dev am: 8f26e88bd9 am: 63cf333e34 am: 9193ea5b09 am: bda74bdcc9
Change-Id: I2628c9bc0904c00f03a95fb96856c4bd0506301b
2020-04-22 05:26:12 +00:00
Bonian Chen
9193ea5b09 Merge "[Settings] Fix DataUsageSummaryPreferenceControllerTest" into rvc-dev am: 8f26e88bd9 am: 63cf333e34
Change-Id: Iefefccc8e1e9ab9fb8f066fb70fe098f67f77ef0
2020-04-22 04:55:10 +00:00
Bonian Chen
8f26e88bd9 Merge "[Settings] Fix DataUsageSummaryPreferenceControllerTest" into rvc-dev 2020-04-22 04:27:43 +00:00
Zhen Zhang
f8c357a1e8 Merge "Add ethernet tether option into AllInOneTetherSettings" into rvc-dev am: 92340eb89e am: 274a4006e1 am: 98cd9d278c am: 4c20cbfbe7
Change-Id: I516f4804473ed8ba56a673451bea126a4979ad8e
2020-04-22 04:05:05 +00:00
Zhen Zhang
98cd9d278c Merge "Add ethernet tether option into AllInOneTetherSettings" into rvc-dev am: 92340eb89e am: 274a4006e1
Change-Id: I2c01ada07ec0e5ebdc38e0b9fa4ddade4b175fd5
2020-04-22 03:21:24 +00:00
Zhen Zhang
92340eb89e Merge "Add ethernet tether option into AllInOneTetherSettings" into rvc-dev 2020-04-22 02:52:58 +00:00
Bonian Chen
61b9714a34 [Settings] Fix DataUsageSummaryPreferenceControllerTest
Fix test case of DataUsageSummaryPreferenceControllerTest

Bug: 154562264
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsageSummaryPreferenceControllerTest
Change-Id: I0b3366c86b0a621b9dda88bbcde6e118d37995b7
2020-04-22 10:39:42 +08:00
tim peng
d5d0bb2967 Merge "Fix Robotest failed" into rvc-dev am: 143668668b am: aa528a6a81 am: 67529ed6eb am: 2f8c40fe15
Change-Id: I49d4bd9bae1e882841a9deeddc9d1b384d379e6f
2020-04-22 02:00:10 +00:00
tim peng
67529ed6eb Merge "Fix Robotest failed" into rvc-dev am: 143668668b am: aa528a6a81
Change-Id: I8b4ecdbb873976aefcd2e0fa6263fdfcf2b00923
2020-04-22 01:34:59 +00:00
tim peng
143668668b Merge "Fix Robotest failed" into rvc-dev 2020-04-22 00:59:38 +00:00
TreeHugger Robot
e7da00e135 Merge "Update ZenModeSettingsTest" into rvc-dev am: 0ff0929e0f am: 8d53e5888d am: c97178761f am: cf272edf73
Change-Id: I7a2cf2bceed0e3200297b038388108eac2207b0b
2020-04-21 15:10:08 +00:00
TreeHugger Robot
c97178761f Merge "Update ZenModeSettingsTest" into rvc-dev am: 0ff0929e0f am: 8d53e5888d
Change-Id: I598264e0025d8679264aa15fd4d37b59d3a3990b
2020-04-21 14:44:10 +00:00
TreeHugger Robot
0ff0929e0f Merge "Update ZenModeSettingsTest" into rvc-dev 2020-04-21 14:12:15 +00:00
Beverly
d796da16f0 Update ZenModeSettingsTest
String was updated

Test: make ROBOTEST_FILTER=ZenModeSettingsTest RunSettingsRoboTests
Fixes: 154568594
Change-Id: Ia67f7ff2e3692cc4f40b87e94e3d3952002a9e87
2020-04-21 09:31:16 -04:00
Jason Hsu
51dfd5b356 Merge "Show default description only if description and html description are empty" into rvc-dev am: 0055a74794 am: d31f5d58d8 am: 69eade7c4e am: 9103cf5254
Change-Id: I8d77752b010f610d852ada909112e160694a800f
2020-04-21 10:43:36 +00:00
Bonian Chen
a145956b50 Merge "[Settings] Refactor test case DataUsageSummaryPreferenceControllerTest" into rvc-dev am: 6fb4a18ded am: 67ff594c29 am: 70144aa952 am: 4ecc61dc8b
Change-Id: I75aa3a915d801ee6ff6fd2a15f5a8fd9212588ef
2020-04-21 09:51:22 +00:00
TreeHugger Robot
ceb7b66664 Merge "Ignore a lot of failed roboletric test cases" into rvc-dev am: a10969bfc5 am: 5362a1e8cd am: cbbb819ae3 am: 752571b52e
Change-Id: Ibe8c1473fc8c5d87d53e71c4bb3b2a74bde09e6a
2020-04-21 09:48:58 +00:00
Jason Hsu
d31f5d58d8 Merge "Show default description only if description and html description are empty" into rvc-dev am: 0055a74794
Change-Id: I4a4fa05ec2f2a1a6aa615030a446d46ef9065caf
2020-04-21 09:44:20 +00:00
Jason Hsu
0055a74794 Merge "Show default description only if description and html description are empty" into rvc-dev 2020-04-21 09:41:15 +00:00
Tim Peng
5308d5f88b Fix Robotest failed
Bug: 154578656
Test: make -j50 RunSettingsRoboTests ROBOTEST_FILTER=MediaOutputGroupSliceTest
make -j50 RunSettingsRoboTests ROBOTEST_FILTER=MediaOutputSliceTest

Change-Id: If675c27ac412c2a49f9ed1c9b71a84c172f54fd6
2020-04-21 17:14:13 +08:00
Bonian Chen
70144aa952 Merge "[Settings] Refactor test case DataUsageSummaryPreferenceControllerTest" into rvc-dev am: 6fb4a18ded am: 67ff594c29
Change-Id: I470d81f8bc4ffdb34a633b2dfb03ad9b04955ed1
2020-04-21 09:09:12 +00:00
TreeHugger Robot
cbbb819ae3 Merge "Ignore a lot of failed roboletric test cases" into rvc-dev am: a10969bfc5 am: 5362a1e8cd
Change-Id: I0783bcb8de705d22f1d00d7a4a6673d81ce5d908
2020-04-21 09:08:57 +00:00
Bonian Chen
f09a56e322 Merge "[Settings] Refactor test case DataUsageSummaryPreferenceControllerTest" into rvc-dev am: 6fb4a18ded
Change-Id: I6d8e2ed82aba6c03763128d311de5b9d7b42f1c0
2020-04-21 08:57:45 +00:00
TreeHugger Robot
cc468908f4 Merge "Ignore a lot of failed roboletric test cases" into rvc-dev am: a10969bfc5
Change-Id: I9d4529017b38ff89746d496553f4179e3564fd38
2020-04-21 08:57:30 +00:00
Bonian Chen
6fb4a18ded Merge "[Settings] Refactor test case DataUsageSummaryPreferenceControllerTest" into rvc-dev 2020-04-21 08:48:36 +00:00
Bonian Chen
dcef423720 [Settings] Refactor test case DataUsageSummaryPreferenceControllerTest
Refactor test case of DataUsageSummaryPreferenceControllerTest

Bug: 141833767
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsageSummaryPreferenceControllerTest
Change-Id: Ieb551a32d87c53cbd0765e19e710f1f0469da9d5
2020-04-21 15:08:27 +08:00
Sunny Shao
5094248487 Ignore a lot of failed roboletric test cases
Bug: 154568213
Bug: 154568594
Bug: 154567856
Bug: 154566065
Bug: 154566012
Bug: 154566007
Bug: 154564960
Bug: 154564366
Bug: 154564361
Bug: 154564994
Bug: 154563784
Bug: 154564243
Bug: 154563562
Bug: 154564136
Bug: 154564211
Bug: 154563778
Bug: 154563910
Bug: 154562715
Bug: 154563116
Bug: 154562264
Bug: 154562785
Bug: 154563290
Bug: 154561690
Bug: 154562361
Bug: 154560878
Bug: 154560145
Test: make RunSettingsRoboTests
Change-Id: I220540d519b222ad7d3b69070a9262bb25f22d23
2020-04-21 15:00:30 +08:00
jasonwshsu
f74c0a72b6 Show default description only if description and html description are empty
* AccessibilitySettings only get the description to pass to the
ToggleFeaturePreferenceFragment
* ToggleFeaturePreferenceFragment handle the default description logic

Bug: 154092127
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.accessibility.AccessibilitySettingsTest"
Change-Id: I516a393aeef1472ca5d185d477a2b0b108fc5342
2020-04-21 01:34:22 +00:00
Zhen Zhang
c10ec56e0f Add ethernet tether option into AllInOneTetherSettings
Create controller for ethernet tether preference in
AllInOneTetherSettings and corresponding test.

Test: AllInOneTetherSettingsTest; UsbTetherPreferenceControllerTest;
BluetoothTetherPreferenceControllerTest;
EthernetTetherPreferenceControllerTest;
WifiTetherDisablePreferenceControllerTest; TetherEnablerTest
Bug: 153690620

Change-Id: I8918d5c8a82c521b00eb3c712af80c2041778595
2020-04-20 13:53:58 -07:00
Julia Reynolds
37e316a427 Update configure notifications screen am: f43cf08634 am: b84e194474 am: fa8f3a84dd am: 245a2af879
Change-Id: I572c46d4847973262e28171256ee6529f5f5d8c6
2020-04-17 22:13:09 +00:00
Julia Reynolds
fa8f3a84dd Update configure notifications screen am: f43cf08634 am: b84e194474
Change-Id: I8844a5951be6d1932d40bd00c872d96d8e15dc56
2020-04-17 21:17:24 +00:00
Julia Reynolds
9cbee26069 Update configure notifications screen am: f43cf08634
Change-Id: I1892d5d51bbf24ab2109e841c649a578de78500d
2020-04-17 20:59:37 +00:00
Julia Reynolds
f43cf08634 Update configure notifications screen
Test: atest
Bug: 153150072
Change-Id: I99ebe2cad5036a154c40bce54dbd6ddbd23c2323
2020-04-17 12:47:06 -04:00
Yanting Yang
8356672f57 Merge "Do not generate copyable slices for Settings Search" into rvc-dev am: 674e2c23a3 am: e611ebfb33 am: aefa9ea849 am: 0bef3161a7
Change-Id: I0e5cda5fdad841388ee14138aef6bc0ddb999008
2020-04-17 10:18:57 +00:00
Yanting Yang
aefa9ea849 Merge "Do not generate copyable slices for Settings Search" into rvc-dev am: 674e2c23a3 am: e611ebfb33
Change-Id: I0296e6afd75136175907f6dbf7ee80b30762d31f
2020-04-17 09:46:48 +00:00
Yanting Yang
47e38c8260 Merge "Do not generate copyable slices for Settings Search" into rvc-dev am: 674e2c23a3
Change-Id: I08128e064ed1e31c162f990f018ce272bf528f48
2020-04-17 09:26:51 +00:00
Yanting Yang
674e2c23a3 Merge "Do not generate copyable slices for Settings Search" into rvc-dev 2020-04-17 09:06:28 +00:00
Yanting Yang
b6c30a2c31 Do not generate copyable slices for Settings Search
Copyable slices is to provide user a quickly sub-text copying way on
Settings Search. Since we plan to remove all sub-text from Settings
Search, the copying feature is no longer available.

Therefore, we don't need to generate copyable slices in Settings
anymore.

Impact search result:
Build number, Phone number, Hardware version, Serial number and IMEI

Bug: 143118037
Test: visual and robotests
Change-Id: I81474aed994678c42d73cc59e169573880de1378
2020-04-17 13:25:22 +08:00
Tom Hsu
77ea4e4f92 Merge "Fix failures on com.android.settings.network.ApnEditorTest" into rvc-dev am: 7c84dc9959 am: 68f1de2a53 am: 4cf73d2013 am: a1eeca3949
Change-Id: Idea1197a5437680b3812cd4ad22a670fb1fd1215
2020-04-17 05:12:28 +00:00
Tom Hsu
68f1de2a53 Merge "Fix failures on com.android.settings.network.ApnEditorTest" into rvc-dev am: 7c84dc9959
Change-Id: I3f950f8a09bc89fe6769206ac5d2d2c1e2648478
2020-04-17 04:22:44 +00:00
tom hsu
969a6a613c Fix failures on com.android.settings.network.ApnEditorTest
Bug: 152376182
Test: make RunSettingsRoboTests
Change-Id: Ib718a4ed0163e07be748857a0dc7b2af92036c3f
2020-04-17 03:45:40 +08:00
TreeHugger Robot
88ab771034 Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0 am: 8f39c1380c am: bafc52f0f0 am: 5e159c017c
Change-Id: I9ce7751d0ae92ba6dc13c8204a5882364a62fb0c
2020-04-16 16:55:33 +00:00
TreeHugger Robot
bafc52f0f0 Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0 am: 8f39c1380c
Change-Id: I3c86265ed7e91afe94b7b36ec2252f998758ea2c
2020-04-16 16:29:43 +00:00
TreeHugger Robot
8f6de85b27 Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0
Change-Id: I21981e1ceb800febebd1f4e5d819ea4831eb3896
2020-04-16 16:16:22 +00:00
TreeHugger Robot
afbf9e60c0 Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev 2020-04-16 16:01:43 +00:00
Tom Hsu
b22f5daf13 Merge "Revert "Fix failures on com.android.settings.network.ApnEditorTest"" 2020-04-16 15:05:40 +00:00
Julia Reynolds
dbef46a5d5 Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: f1801907d8 am: d2d8115ac9 am: fb328c7bc6
Change-Id: I8384671d90c0bb08df14840ddd9813129da63bfd
2020-04-16 14:53:53 +00:00
Julia Reynolds
d2d8115ac9 Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: f1801907d8
Change-Id: Iddf2bda7005bffe799b76f9a21d8937925fee693
2020-04-16 14:25:55 +00:00
Julia Reynolds
27d039315f Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1
Change-Id: I739234dc3861dba8de2502424dbca9ee454c5b50
2020-04-16 14:12:43 +00:00
Julia Reynolds
0c99ecaec1 Merge "Launch subscreens with the correct user" into rvc-dev 2020-04-16 13:57:50 +00:00