Fan Zhang
812db12067
Merge "Add a way to suppress injected tiles for OEMs" into qt-dev am: ac76a480bd
...
am: 4a4b2a5b00
Change-Id: I9873cb57e2bc2fd7584527d39215b80a2381161b
2019-04-19 18:05:50 -07:00
Fan Zhang
85e4de5122
Merge "Add @Ignore for all failing tests." into qt-dev am: 1830440231
...
am: 5a0629d12f
Change-Id: I9d7e1906b3e5b0b213d5d3d4e1e90ca1acf4f4a9
2019-04-19 18:04:49 -07:00
Beverly
08de5537ef
Merge "Allow up two lines of text on dnd restrict notif" into qt-dev
...
am: f09245150d
Change-Id: I159f4c670c2a103fe5c3fdb87e62e0e21a42bc5b
2019-04-19 17:28:45 -07:00
Lei Yu
87bdcd3ce2
Merge "Fix battery robo test" into qt-dev
...
am: fc48118694
Change-Id: Id0bcad14d216bb2718435dffdb802e105af440d4
2019-04-19 17:20:53 -07:00
TreeHugger Robot
f09245150d
Merge "Allow up two lines of text on dnd restrict notif" into qt-dev
2019-04-19 23:20:10 +00:00
TreeHugger Robot
fc48118694
Merge "Fix battery robo test" into qt-dev
2019-04-19 23:13:51 +00:00
Salvador Martinez
72d99dd38c
Merge "Update battery stuff to use SettingsLib Estimate class" into qt-dev
...
am: 022af8ca10
Change-Id: Ie0e16d985ef878e9989ad4037947ff57e34749fc
2019-04-19 15:56:21 -07:00
Lei Yu
5fbde81391
Merge "Add SettingsPolicy to control BT feature" into qt-dev am: 125ab50a55
...
am: 142ca23949
Change-Id: I7f9b2c921651ba9e6163fb7ecc22db370a52196d
2019-04-19 15:55:15 -07:00
Fan Zhang
cd576bfaae
Merge "Fix typo" into qt-dev
...
am: 33f136fdec
Change-Id: If6ba4153c8f642643054e1f7e949d4111a6e3b7e
2019-04-19 15:54:48 -07:00
Fan Zhang
4a4b2a5b00
Merge "Add a way to suppress injected tiles for OEMs" into qt-dev
...
am: ac76a480bd
Change-Id: I5d72983c4c9cda2a6cfb36fb5931dfdff00ac45f
2019-04-19 15:53:26 -07:00
Fan Zhang
5a0629d12f
Merge "Add @Ignore for all failing tests." into qt-dev
...
am: 1830440231
Change-Id: Ic779b72c3bf3a06e32c7dbe11f87e654baf70664
2019-04-19 15:21:59 -07:00
Salvador Martinez
022af8ca10
Merge "Update battery stuff to use SettingsLib Estimate class" into qt-dev
2019-04-19 22:00:27 +00:00
Jonathan Scott
4316259aa0
Remove redundant (and failing) test getAvailabilityStatus_hasManagedUser_AVAILABLE
...
This is already covered by
getAvailabilityStatus_somePackagesAllowed_shouldBeAvailable and
getAvailabilityStatus_allPackagesAllowed_shouldBeAvailable.
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=CrossProfileCalendarPreferenceControllerTest
Fixes: 130896049
Change-Id: I3dbbbde693750c69e042f7c19143730cc8e313ff
2019-04-19 22:19:21 +01:00
Fan Zhang
5c9db0cb5e
Fix CodeInspectionTest
...
Fixes: 130897640
Test: robo
Change-Id: Ic2d952e4d76bb0a2be6eab7ddc999b56656132a6
2019-04-19 14:14:51 -07:00
Lei Yu
2632f45010
Fix battery robo test
...
Fixes: 130896701
Test: RunSettingsRoboTests
Change-Id: Iffb7874250335db81181b23f96fe7b50a2dd0062
2019-04-19 13:41:22 -07:00
Fan Zhang
33f136fdec
Merge "Fix typo" into qt-dev
2019-04-19 20:32:37 +00:00
Fan Zhang
5d705839f2
Fix typo
...
Bug: 130897882
Test: rebuild
Change-Id: I066b69634214cd25c4acbd173e8fe82cd73d4e97
2019-04-19 13:31:52 -07:00
Fan Zhang
ac76a480bd
Merge "Add a way to suppress injected tiles for OEMs" into qt-dev
2019-04-19 20:30:24 +00:00
Fan Zhang
1830440231
Merge "Add @Ignore for all failing tests." into qt-dev
2019-04-19 20:28:47 +00:00
Fan Zhang
ef2e91913b
Add @Ignore for all failing tests.
...
Bug: 130896210
Bug: 130896218
Bug: 130896701
Bug: 130897882
Bug: 130897305
Bug: 130897640
Bug: 130896049
Test: robo
Change-Id: I77143d504501b358c2103aa736cd2aad13ed4c5c
2019-04-19 13:23:29 -07:00
Lei Yu
142ca23949
Merge "Add SettingsPolicy to control BT feature" into qt-dev
...
am: 125ab50a55
Change-Id: I46f37c9a1ac92bd3e77e2a2f8ff185a72436851e
2019-04-19 13:18:15 -07:00
Lei Yu
acb617855a
Remove feature flag for slice injection
...
Since we already use SettingsUIDeviceConfig in this case, we can remove
feature flag safely.
Fixes: 121154979
Test: Manual
Change-Id: Ibf71f1109fd506feba5a02bf6ecd804c6b7ee8d4
2019-04-19 13:13:03 -07:00
Lei Yu
125ab50a55
Merge "Add SettingsPolicy to control BT feature" into qt-dev
2019-04-19 19:44:53 +00:00
Lei Yu
5d85dfb123
Add mms preference and controller
...
Only visible when it is metered and mobile data off.
Also refactor one mobile data observer so we can reuse it.
Bug: 130222866
Test: RunSettingsRoboTests
Change-Id: Id218f51da3c373fad98c1a39cfadd6b0e8c46a88
2019-04-19 11:25:14 -07:00
Linda Tseng
7e8d682188
Merge "Set max num of slices allowed in panel view" into qt-dev am: ae344faf4a
...
am: 67928018b3
Change-Id: Idbab620c65b8dbd65b721caca3e669f89baeed36
2019-04-19 11:07:16 -07:00
Linda Tseng
67928018b3
Merge "Set max num of slices allowed in panel view" into qt-dev
...
am: ae344faf4a
Change-Id: Id9ffef1fd7a7007a143661b221dd9d82dc9858b5
2019-04-19 10:36:41 -07:00
Salvador Martinez
6a81e41c7c
Update battery stuff to use SettingsLib Estimate class
...
This will make the upcoming consistency Cl easier to implement.
Test: Robotests still pass
Bug: 124030091
Change-Id: Ief4989e2b5f9b83b5c3b93d17f9f9fa12136f3ee
2019-04-19 17:35:23 +00:00
Yanting Yang
4e56cb2917
Add a way to suppress injected tiles for OEMs
...
Create a config resource for OEMs to add suppressed tile's key, then
DashboardFragment will filter related tiles out from Settings.
OEMs can use this way to suppress security patch injected tile if they
don't use Google OTA.
Fixes: 130734771
Test: visual, robotests
Change-Id: I4cab79c8672048fa543d39b2a8f38ffe338189c8
2019-04-20 01:31:07 +08:00
Beverly
34bc05ccee
Allow up two lines of text on dnd restrict notif
...
Test: manual
Bug: 130848971
Change-Id: I1d32963f0e291d42c8b98ba8ca39eba749a26989
2019-04-19 13:26:03 -04:00
Linda Tseng
ae344faf4a
Merge "Set max num of slices allowed in panel view" into qt-dev
2019-04-19 17:19:59 +00:00
Julia Reynolds
12712a8358
Merge "Fix broken tests" into qt-dev am: 1115d61c0b
...
am: 4ca871a8bd
Change-Id: Id1599af2007f7127b65ac6d1ddb4f6bd62899976
2019-04-19 10:02:48 -07:00
hughchen
6e148d336d
Merge "Remove all device from preference when BT is disabled" into qt-dev am: e69a25caad
...
am: 8fcce3e5ca
Change-Id: I26ce994197c1b85e23f00f81227f359e4bd4ed29
2019-04-19 10:01:12 -07:00
Julia Reynolds
4ca871a8bd
Merge "Fix broken tests" into qt-dev
...
am: 1115d61c0b
Change-Id: I16026c2a7306fecb02230d1403f31efd50e297e2
2019-04-19 09:51:37 -07:00
hughchen
8fcce3e5ca
Merge "Remove all device from preference when BT is disabled" into qt-dev
...
am: e69a25caad
Change-Id: I84cb23ab372c897121ea239aa8f1f4c337f5d59d
2019-04-19 09:46:50 -07:00
TreeHugger Robot
1115d61c0b
Merge "Fix broken tests" into qt-dev
2019-04-19 16:32:15 +00:00
TreeHugger Robot
e69a25caad
Merge "Remove all device from preference when BT is disabled" into qt-dev
2019-04-19 16:25:26 +00:00
Yi-Ling Chuang
85a7d4723e
Merge "Fix the break of repo hook color check." into qt-dev am: 73ab8fcb63
...
am: bff5746cd5
Change-Id: If0fccdb354d9b251d5362a6fec5faf3f6cf49cb1
2019-04-19 09:13:20 -07:00
Yi-Ling Chuang
bff5746cd5
Merge "Fix the break of repo hook color check." into qt-dev
...
am: 73ab8fcb63
Change-Id: Iacab2b9a297bc17826d8eb2c17d45e9bf1d5f416
2019-04-19 08:53:31 -07:00
TreeHugger Robot
73ab8fcb63
Merge "Fix the break of repo hook color check." into qt-dev
2019-04-19 15:38:03 +00:00
Julia Reynolds
9c5a19319b
Fix broken tests
...
Test: robo tests
Fixes: 130871450
Change-Id: If7b01147f5680392c7635f3a3b4e558aa56a633e
2019-04-19 10:03:40 -04:00
Beverly Tai
46b00f6b58
Merge "Show correct text for old zen modes" into qt-dev am: 60eb96cd29
...
am: ece7d9b88d
Change-Id: I06422941e7087f347b3ce917e004fc2c4063fc10
2019-04-19 06:37:06 -07:00
Beverly Tai
ece7d9b88d
Merge "Show correct text for old zen modes" into qt-dev
...
am: 60eb96cd29
Change-Id: I0bec770e82f3ee0aa0a9110f9a42c8fa63ec0da0
2019-04-19 06:27:31 -07:00
Beverly Tai
60eb96cd29
Merge "Show correct text for old zen modes" into qt-dev
2019-04-19 13:17:20 +00:00
tmfang
1dae5a0c11
Merge "Remove odd spacing after the divider" into qt-dev am: fb250122f8
...
am: 92f864565d
Change-Id: Ib658d0a2e4ad325681dbc6ce5b5b3f8b9d0ef951
2019-04-19 01:07:11 -07:00
tmfang
92f864565d
Merge "Remove odd spacing after the divider" into qt-dev
...
am: fb250122f8
Change-Id: I99f5aab97be9a32fdeec857bf2875ae05b5ac9a9
2019-04-19 00:55:49 -07:00
Stanley Wang
11e6eb756b
Merge "Hardware version should should support copy action" into qt-dev am: 7f46c8714e
...
am: cb525e5fad
Change-Id: I10bcce4a113cc1ba759e9da33606f24073491302
2019-04-19 00:45:47 -07:00
TreeHugger Robot
fb250122f8
Merge "Remove odd spacing after the divider" into qt-dev
2019-04-19 07:45:02 +00:00
Stanley Wang
cb525e5fad
Merge "Hardware version should should support copy action" into qt-dev
...
am: 7f46c8714e
Change-Id: I1b397e2c12fc0b3a07d5382b70b8e4dd08ede20a
2019-04-19 00:40:46 -07:00
Stanley Wang
7f46c8714e
Merge "Hardware version should should support copy action" into qt-dev
2019-04-19 07:35:46 +00:00
Arc Wang
3940c331df
Add action metrics for Wi-Fi provision features
...
// ACTION: Share a Wi-Fi network by generating a QR code
ACTION_SETTINGS_SHARE_WIFI_QR_CODE
// ACTION: Connect to a Wi-Fi network by scanning a QR code
ACTION_SETTINGS_ENROLL_WIFI_QR_CODE
// ACTION: Share Wi-Fi hotspot by generating a QR code
ACTION_SETTINGS_SHARE_WIFI_HOTSPOT_QR_CODE
Bug: 130521826
Test: manual
Change-Id: I4204307dd5318eb7c47e4136dc7d8700d43e4da1
2019-04-19 15:28:29 +08:00