Kevin Chyn
012ba13cb3
Merge "Update enrollment footer icon" into qt-dev
...
am: c9239e11b6
2019-04-22 18:00:13 -07:00
Kevin Chyn
38d44c96a0
Merge "Update introduction layout spacing" into qt-dev
...
am: 89f0d5274a
2019-04-22 17:55:21 -07:00
Lei Yu
787e15fbe5
Merge "Test fix: Add MmsPreferenceController to whitelist" into qt-dev
...
am: 357825d228
2019-04-22 17:50:40 -07:00
Fan Zhang
d1bc5895b0
Merge "Partial revert Ib2396575bbc69a7cca5e9c90e113c76ff6db00b5" into qt-dev
...
am: 5e42b894bc
2019-04-22 17:32:32 -07:00
Kevin Chyn
c9239e11b6
Merge "Update enrollment footer icon" into qt-dev
2019-04-22 23:23:16 +00:00
Kevin Chyn
89f0d5274a
Merge "Update introduction layout spacing" into qt-dev
2019-04-22 23:16:39 +00:00
Lei Yu
357825d228
Merge "Test fix: Add MmsPreferenceController to whitelist" into qt-dev
2019-04-22 22:57:24 +00:00
Lei Yu
41ad7a5bb4
Test fix: Add MmsPreferenceController to whitelist
...
Add it to grandfather_slice_controller_not_in_xml since right now
it only exists in mobile_network_settings_v2.xml, not v1.
This should be fixed automatically once we remove all old code.
Bug: 130222866
Test: RunSettingsRoboTests
Change-Id: Ib0bc976fd31818d7b39ca9f3e7427859fd7175ff
2019-04-22 15:55:16 -07:00
Fan Zhang
5e42b894bc
Merge "Partial revert Ib2396575bbc69a7cca5e9c90e113c76ff6db00b5" into qt-dev
2019-04-22 22:48:59 +00:00
Fan Zhang
d9fb048712
Merge "Fix CodeInspectionTest" into qt-dev
...
am: 4b54ad9bd5
2019-04-22 15:14:51 -07:00
TreeHugger Robot
4b54ad9bd5
Merge "Fix CodeInspectionTest" into qt-dev
2019-04-22 21:37:29 +00:00
Kevin Chyn
338883034f
Update enrollment footer icon
...
Fixes: 131094701
Test: Builds
Change-Id: I9e1a75986ffeb35791271d55bf05a2daa9af5bad
2019-04-22 12:38:33 -07:00
Fan Zhang
12533b9588
Partial revert Ib2396575bbc69a7cca5e9c90e113c76ff6db00b5
...
The previous change removed summary text for gesture settings too
aggresively. We still need summary in main Settings app, just not in
search.
Fixes: 130652619
Test: manual
Change-Id: I95ae3ca31b34a514f10993413527e987cf67d998
2019-04-22 12:28:07 -07:00
Kevin Chyn
c5ae8a7bab
Update introduction layout spacing
...
Bug: 130740990
Test: builds
Change-Id: I2c10d991097fcdb7eb0775f744b5b12af2597780
2019-04-22 11:51:29 -07:00
Lei Yu
7ec9c1db1d
Merge "Add mms preference and controller" into qt-dev
...
am: f3365e911d
2019-04-22 11:14:34 -07:00
Lei Yu
cbb86c71b6
Merge "Remove feature flag for slice injection" into qt-dev
...
am: fe393599a0
2019-04-22 11:10:37 -07:00
Lei Yu
f3365e911d
Merge "Add mms preference and controller" into qt-dev
2019-04-22 17:55:34 +00:00
Lei Yu
fe393599a0
Merge "Remove feature flag for slice injection" into qt-dev
2019-04-22 17:49:52 +00:00
Tim Peng
568520bdf5
Remove "Play media to" when no connected device
...
am: 99ed023ca4
2019-04-22 10:03:39 -07:00
Tim Peng
99ed023ca4
Remove "Play media to" when no connected device
...
Bug: 130251782
Test: make -j42 RunSettingsRoboTests
Change-Id: Id40199a67aef48b99f59cf6e04f93be2abe5e8fc
2019-04-22 06:09:36 +00:00
Bill Yi
b2e51354e7
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: f263f489e2
2019-04-20 21:50:42 -07:00
TreeHugger Robot
f263f489e2
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-04-21 04:43:31 +00:00
Bill Yi
80d2278070
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I681232854213f3b89d0543d30c640622d759a396
2019-04-20 17:58:18 -07:00
Jonathan Scott
28a697103d
Merge "Remove redundant (and failing) test getAvailabilityStatus_hasManagedUser_AVAILABLE" into qt-dev
...
am: 5a8cf48813
2019-04-20 16:24:57 -07:00
TreeHugger Robot
5a8cf48813
Merge "Remove redundant (and failing) test getAvailabilityStatus_hasManagedUser_AVAILABLE" into qt-dev
2019-04-20 23:16:25 +00:00
Mark Chien
3e4c927e60
[automerger skipped] Merge "Ignore the outdated entitlement check" into qt-dev
...
am: 77b7618138f9f0d11782
2019-04-19 22:06:49 -07:00
Mark Chien
77b7618138
Merge "Ignore the outdated entitlement check" into qt-dev
2019-04-20 04:41:52 +00:00
Mark Chien
f886be6999
Merge "Ignore the outdated entitlement check" am: d7885ca73a
...
am: 7b30503dc4
2019-04-19 21:07:49 -07:00
Mark Chien
7b30503dc4
Merge "Ignore the outdated entitlement check"
...
am: d7885ca73a
2019-04-19 20:26:15 -07:00
Mark Chien
d7885ca73a
Merge "Ignore the outdated entitlement check"
2019-04-20 02:05:33 +00:00
Beverly
08de5537ef
Merge "Allow up two lines of text on dnd restrict notif" into qt-dev
...
am: f09245150d
2019-04-19 17:28:45 -07:00
Lei Yu
87bdcd3ce2
Merge "Fix battery robo test" into qt-dev
...
am: fc48118694
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
2019-04-19 15:56:21 -07:00
Fan Zhang
cd576bfaae
Merge "Fix typo" into qt-dev
...
am: 33f136fdec
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
2019-04-19 15:53:26 -07:00
Fan Zhang
5a0629d12f
Merge "Add @Ignore for all failing tests." into qt-dev
...
am: 1830440231
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
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
