Fan Zhang
d1bc5895b0
Merge "Partial revert Ib2396575bbc69a7cca5e9c90e113c76ff6db00b5" into qt-dev
...
am: 5e42b894bc
Change-Id: Id3fc9e6a6e211d530d4b33a0050fafd0de11e2d7
2019-04-22 17:32:32 -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
Change-Id: I9f5885c5c9e52019ea9142337b18722e903a459c
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
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
Lei Yu
7ec9c1db1d
Merge "Add mms preference and controller" into qt-dev
...
am: f3365e911d
Change-Id: I7d564e576a0ce387f376e71af54839794a3281cd
2019-04-22 11:14:34 -07:00
Lei Yu
cbb86c71b6
Merge "Remove feature flag for slice injection" into qt-dev
...
am: fe393599a0
Change-Id: I8cb5753b3d809811464b8410e3b26be35e0efca6
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
Change-Id: I462ce390a7addc95ceacb0f0a4e48382ac34aed5
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
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
Change-Id: I294f9f2e9ca239cb8f1c689580ce266ddead8f5b
2019-04-19 21:07:49 -07:00
Mark Chien
7b30503dc4
Merge "Ignore the outdated entitlement check"
...
am: d7885ca73a
Change-Id: If610c3233137562571eeff0b2d73b2bdd946ebd9
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
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
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
Salvador Martinez
022af8ca10
Merge "Update battery stuff to use SettingsLib Estimate class" into qt-dev
2019-04-19 22:00:27 +00: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
ac76a480bd
Merge "Add a way to suppress injected tiles for OEMs" into qt-dev
2019-04-19 20:30:24 +00: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
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
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
e69a25caad
Merge "Remove all device from preference when BT is disabled" into qt-dev
2019-04-19 16:25:26 +00: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
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
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
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
Yiwei Zhang
730c10c93e
Merge changes from topic "GameDriver2"
...
am: 44ab00de7f
Change-Id: I4ffdd92469ccd67907a169bead5d1473a5a6777c
2019-04-18 17:40:42 -07:00
Yiwei Zhang
eb5f8b1139
Game Driver: rename GUP to Game Driver
...
am: 046b9a8ca2
Change-Id: I58e48a8893ad5cac202bf9bf2afd3db120ae23cc
2019-04-18 17:39:38 -07:00
Yiwei Zhang
b168f16bfd
Game Driver: Add footer to the dashboard
...
am: 34986f5ba5
Change-Id: Id046f661896bdd068519fb96524e6ab455229025
2019-04-18 17:38:20 -07:00
Yiwei Zhang
ceb8551cd1
Game Driver: Add SwitchBar to control GUP feature
...
am: b15cc090d1
Change-Id: Icd1b593294426db2d8ffda3cad926fffb32cd4d5
2019-04-18 17:36:46 -07:00