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
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
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
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
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
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
92f864565d
Merge "Remove odd spacing after the divider" into qt-dev
...
am: fb250122f8
Change-Id: I99f5aab97be9a32fdeec857bf2875ae05b5ac9a9
2019-04-19 00:55:49 -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
Yi-Ling Chuang
db237a6ade
Fix the break of repo hook color check.
...
Add the missing color for notification importance button
Fixes: 130850328
Test: manual
Change-Id: I6c070fad42d5fb0e6d5e3aa00d66b32708dde605
2019-04-19 14:02:35 +08: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
Julia Reynolds
ef5d654d53
Merge "Updates to main notification page" into qt-dev
...
am: 51d16f2368
Change-Id: Ie7ca2cf7ed6ee0144820e360903345cb48c0a4b4
2019-04-18 18:11:47 -07:00
Yiwei Zhang
3e3fb21167
[automerger skipped] Merge changes from topic "GameDriver2" am: 44ab00de7f
...
am: 730c10c93e
-s ours
am skip reason: change_id Iffbe3355b37763d4fa71b96271c1ba448fb6cdc5 with SHA1 ccc81a83cc
is in history
Change-Id: I8f91ed2a8ed8a6f40b060af1f9e67599814eb357
2019-04-18 17:58:24 -07:00
Yiwei Zhang
667b4f6159
[automerger skipped] Game Driver: rename GUP to Game Driver am: 046b9a8ca2
...
am: eb5f8b1139
-s ours
am skip reason: change_id Ia7b9e3978ad96436a66843e6b5d1bd1e15f367c9 with SHA1 bf854fc41b
is in history
Change-Id: I9f7b40977c4464ff5605c490d11deab8061095aa
2019-04-18 17:57:36 -07:00
TreeHugger Robot
51d16f2368
Merge "Updates to main notification page" into qt-dev
2019-04-19 00:57:32 +00:00
Yiwei Zhang
6a3e7b3812
[automerger skipped] Game Driver: Add footer to the dashboard am: 34986f5ba5
...
am: b168f16bfd
-s ours
am skip reason: change_id I9788d4c64b06deb099a43e8db7eecab20a85f494 with SHA1 8aa568f1f5
is in history
Change-Id: Ibe54a2abac4b7162b82ffaf87ed3725bb92c6a66
2019-04-18 17:56:58 -07:00
Yiwei Zhang
7b7188b907
[automerger skipped] Game Driver: Add SwitchBar to control GUP feature am: b15cc090d1
...
am: ceb8551cd1
-s ours
am skip reason: change_id Ice9ded17c759791a3728c552f79881e2215ac081 with SHA1 51691ab0d0
is in history
Change-Id: Iab4e744884a45e8fa77517e26036e578dd066535
2019-04-18 17:56:07 -07:00
Yiwei Zhang
6047cf86a4
[automerger skipped] GUP: Add global switch for all apps am: 75548c4a33
...
am: c37c07ba99
-s ours
am skip reason: change_id Iebf6c5eceb323d03332169eeb0a4a0d1f9c2c493 with SHA1 15bb7944a5
is in history
Change-Id: Ib866bd29edf02141b3b9c7db6401fbcd9f2b837c
2019-04-18 17:55:27 -07:00
Yiwei Zhang
536542927e
[automerger skipped] GUP: Fixed some typos and update some values am: d0bbbfeeea
...
am: e506f9d7f5
-s ours
am skip reason: change_id I7b1e42cd3a823a72bcd6d61b26c4954c237ff6d0 with SHA1 5735199641
is in history
Change-Id: I0642e07bed6da847b16738f7e14f7aec2cb0632a
2019-04-18 17:54:49 -07:00
Yiwei Zhang
09a45e5cd0
[automerger skipped] GUP: Display a list of Apps and dialogs am: dc62028e85
...
am: f0b7bf7cca
-s ours
am skip reason: change_id Ide4934c0dd3901532723e77e74663e5a7b639026 with SHA1 83c030f1cd
is in history
Change-Id: I34b7e2c2ef9afba6baee101ddc29ba7b9e022be0
2019-04-18 17:54:12 -07:00
Yiwei Zhang
c82b531871
[automerger skipped] GUP: Add stub UI am: a2754c515b
...
am: 329a5e938e
-s ours
am skip reason: change_id I1f7cc66790e1d1e1de5113e28a055ec5d1679013 with SHA1 c81a03b60e
is in history
Change-Id: I8be0f7ee8f61a455d1503554101e18b7b15c7ce8
2019-04-18 17:53:34 -07: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
Yiwei Zhang
c37c07ba99
GUP: Add global switch for all apps
...
am: 75548c4a33
Change-Id: I12d7ff1e9959eb3e5e88c9f9e9f8bab2d88f7e95
2019-04-18 17:35:09 -07:00
Yiwei Zhang
e506f9d7f5
GUP: Fixed some typos and update some values
...
am: d0bbbfeeea
Change-Id: I0d23b978d62c2c0eaced50c878e874844d7862db
2019-04-18 17:33:07 -07:00
Yiwei Zhang
f0b7bf7cca
GUP: Display a list of Apps and dialogs
...
am: dc62028e85
Change-Id: I3d13512fda47d401444f665636d83dff2fb23882
2019-04-18 17:30:54 -07:00
Yiwei Zhang
329a5e938e
GUP: Add stub UI
...
am: a2754c515b
Change-Id: Ia9d6d44d106b7dc3b54218921039e9ee03967533
2019-04-18 17:28:33 -07:00
Treehugger Robot
44ab00de7f
Merge changes from topic "GameDriver2"
...
* changes:
Game Driver: Fix EnableForAllApps switch and test
Game Driver: rename GUP to Game Driver
Game Driver: Add footer to the dashboard
Game Driver: Add SwitchBar to control GUP feature
GUP: Add global switch for all apps
GUP: Fixed some typos and update some values
GUP: Display a list of Apps and dialogs
GUP: Add stub UI
2019-04-19 00:06:39 +00: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
TreeHugger Robot
8bfc277f7d
Merge "Non-blockable whitelist should only control importance fields" into qt-dev
2019-04-18 21:56:02 +00:00
Mill Chen
d0dd6d8885
Merge "Revert "Add robotest modules for Settings"" into qt-dev
2019-04-18 21:49:51 +00:00
Mill Chen
db9f07850f
Revert "Add robotest modules for Settings"
...
This reverts commit ce09f58360
.
Reason for revert: will build break on run_host_tests
Bug: 130774632
Change-Id: Id2ee52ffb0689059da9cbdadd5bdae5b6a04a589
2019-04-18 21:48:42 +00:00
Julia Reynolds
9496bce441
Merge "Redesign channel listing and channel page" into qt-dev
2019-04-18 21:34:36 +00:00