Lei Yu
88ba448b3a
Merge "Fix battery robo test" into qt-dev am: fc48118694
...
am: 87bdcd3ce2
Change-Id: I06ff2450d1757a4ae45a28866084f7bb377c8a30
2019-04-19 18:56:31 -07:00
Salvador Martinez
f0ecd2bf7d
Merge "Update battery stuff to use SettingsLib Estimate class" into qt-dev am: 022af8ca10
...
am: 72d99dd38c
Change-Id: I2b9279b3f11abef1719c6d23fa998774aa983af8
2019-04-19 18:07:31 -07:00
Fan Zhang
1b1bfc6508
Merge "Fix typo" into qt-dev am: 33f136fdec
...
am: cd576bfaae
Change-Id: I97b8d4fb843805b97317b94c85865497aac1543e
2019-04-19 18:06:38 -07:00
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
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
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
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
125ab50a55
Merge "Add SettingsPolicy to control BT feature" into qt-dev
2019-04-19 19:44:53 +00: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
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
Julia Reynolds
9c5a19319b
Fix broken tests
...
Test: robo tests
Fixes: 130871450
Change-Id: If7b01147f5680392c7635f3a3b4e558aa56a633e
2019-04-19 10:03:40 -04: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
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
Jonathan Scott
a589d0aa6e
Merge "Don't show policy transparency UI for cross-profile setting." into qt-dev am: 6e2fce6fdc
...
am: d760559474
Change-Id: I3fd6add4c45d5617b10512ba5c602f9d5f772945
2019-04-18 23:00:34 -07:00
Jonathan Scott
d760559474
Merge "Don't show policy transparency UI for cross-profile setting." into qt-dev
...
am: 6e2fce6fdc
Change-Id: Ia1b28b4dce00022ff1dfd57894f8d9b18108a6ad
2019-04-18 22:46:17 -07:00
TreeHugger Robot
6e2fce6fdc
Merge "Don't show policy transparency UI for cross-profile setting." into qt-dev
2019-04-19 05:24:24 +00:00
Stanley Wang
0fdf78cff6
Hardware version should should support copy action
...
Implement isSliceable method in HardwareRevisionPreferenceController
Fixes: 130653205
Test: manual and robotests
Change-Id: Ib872b9625c2c1984ff7b036fef5b3145c7fd8d2a
2019-04-19 11:52:32 +08:00
Cn Chen
7e379b70c6
Merge "Update fingerprint suggestion enable state when back pressed" into qt-dev am: 9588c9003f
...
am: 7b2f016be8
Change-Id: I3df778d24dfb31ae0eaab29e0e9597c05f675759
2019-04-18 19:34:35 -07:00
Cn Chen
7b2f016be8
Merge "Update fingerprint suggestion enable state when back pressed" into qt-dev
...
am: 9588c9003f
Change-Id: I37cb68e0df1abb76792122e12c91636ecf24644b
2019-04-18 19:08:01 -07:00
hughchen
d39fbe0f23
Remove all device from preference when BT is disabled
...
The issue is happened when BT is disabled then navigate to
"Connected devices". BluetoothDeviceUpdater didn't update
UI when BT is disabled. Remove all device from preference when
BT is disabled.
Bug: 80090956
Test: make -j42 RunSettingsRoboTests
Change-Id: Ia1fd8cfbcf95d712a1a702fdf101ff98186b76cd
2019-04-19 09:50:03 +08:00
Cn Chen
9588c9003f
Merge "Update fingerprint suggestion enable state when back pressed" into qt-dev
2019-04-19 01:37:13 +00:00
Julia Reynolds
c9f56810ea
Merge "Non-blockable whitelist should only control importance fields" into qt-dev am: 8bfc277f7d
...
am: 6d0c551706
Change-Id: Id178579d07e371bd78e4790b3fd28fca1e1f66ad
2019-04-18 16:21:49 -07:00
Mill Chen
451f1a2697
Merge "Revert "Add robotest modules for Settings"" into qt-dev am: d0dd6d8885
...
am: 97afe10730
Change-Id: I12f58d61303ecd5e7306675d36171c146b36f20a
2019-04-18 16:13:30 -07:00
Julia Reynolds
2306305d47
Merge "Redesign channel listing and channel page" into qt-dev am: 9496bce441
...
am: 1053e4a798
Change-Id: I863f230c5fc9e4b03a5a88b4d52b3395ea07f20c
2019-04-18 15:38:55 -07:00
Julia Reynolds
6d0c551706
Merge "Non-blockable whitelist should only control importance fields" into qt-dev
...
am: 8bfc277f7d
Change-Id: If5499e8bdb1c60f7e70c5393ee6428cbb08f608d
2019-04-18 15:20:17 -07:00
Mill Chen
97afe10730
Merge "Revert "Add robotest modules for Settings"" into qt-dev
...
am: d0dd6d8885
Change-Id: I92acba8f32bc1bbb8ae8dff21637c9b0f0db02bd
2019-04-18 15:18:51 -07:00
Julia Reynolds
1053e4a798
Merge "Redesign channel listing and channel page" into qt-dev
...
am: 9496bce441
Change-Id: I7616f9164b8178f31423e0c048700391a667f192
2019-04-18 15:05:37 -07:00