Wei Wang
98d02620a0
Merge "Fix build failure"
2017-04-04 22:26:40 +00:00
Kenny Guy
1a0ca1a62a
Merge "Merge intent filters so intent forwarding works." into oc-dev am: dc43b64c54
...
am: 6f802c0af3
Change-Id: Ib0957812744aea02e9d4710c39ff3a7d300b0976
2017-04-04 21:46:57 +00:00
Soroosh Mariooryad
1a12804aec
Merge "Adding APIs for smart search ranking."
2017-04-04 21:37:28 +00:00
Kenny Guy
6f802c0af3
Merge "Merge intent filters so intent forwarding works." into oc-dev
...
am: dc43b64c54
Change-Id: Ideeda9cbd861a39649281b3f192f303820a4468b
2017-04-04 21:36:58 +00:00
Wei Wang
803914375f
Fix build failure
...
Test: m
Change-Id: I3a007a52a86c0d6dbe1d3fb055d9259baad9daf1
2017-04-04 14:36:15 -07:00
TreeHugger Robot
dc43b64c54
Merge "Merge intent filters so intent forwarding works." into oc-dev
2017-04-04 21:25:17 +00:00
Tony Mantler
311a686572
Merge "Add AvailableVirtualKeyboardFragment to TV" into oc-dev am: 30ce1bee20
...
am: c7956d80e6
Change-Id: I8476b0dbaf59eca645a82ca7d2d367a8b8658dba
2017-04-04 20:43:29 +00:00
Tony Mantler
c7956d80e6
Merge "Add AvailableVirtualKeyboardFragment to TV" into oc-dev
...
am: 30ce1bee20
Change-Id: I0ce18920155bf9f51ae49382d40731e5020c0906
2017-04-04 20:38:23 +00:00
TreeHugger Robot
30ce1bee20
Merge "Add AvailableVirtualKeyboardFragment to TV" into oc-dev
2017-04-04 20:31:48 +00:00
Colin Cross
cdd5863e2d
Revert "Merge "Removes instant apps from certain screens" into oc-dev am: 1c956b304a"
...
This reverts commit d7da58ade5
, reversing
changes made to 6d539dc7a4
.
Bad automerge of an already-present patch caused a duplicate definition
of LIST_TYPES_WITH_INSTANT.
Test: none
Change-Id: I98e74d1c0db739dd425c945652251a1050d26c63
2017-04-04 13:21:54 -07:00
Jesse Evans
7ca25cf04e
Merge "Adds the Clear App dialog for Instant Apps" into oc-dev am: c8e06b3fb6
...
am: 5ae795e83a
-s ours
Change-Id: I98841feb42ce563c2509374f22c3194887a60526
2017-04-04 18:53:00 +00:00
Maurice Lam
90cb8a1224
Merge "Sticky footer for GLIF theme"
2017-04-04 18:42:30 +00:00
Kenny Guy
f9f279ef9c
Merge intent filters so intent forwarding works.
...
Settings forwards intent filters from work to
personal profile based on intent filter returned
from resolving activities.
Test: CTSVerifier, Open BYOD Managed Provisioning test, Click on "Cross profile intent filters are set " test.
Bug: 36275359
Change-Id: I83b7112c4a00a08f0af2be59669a073691fbda0b
2017-04-04 18:15:59 +00:00
Jesse Evans
d7da58ade5
Merge "Removes instant apps from certain screens" into oc-dev am: 1c956b304a
...
am: 1a8318c7ed
Change-Id: I2d6da7bd72d49218097c9135f78f14089b35a14c
2017-04-04 18:13:20 +00:00
Jesse Evans
5ae795e83a
Merge "Adds the Clear App dialog for Instant Apps" into oc-dev
...
am: c8e06b3fb6
Change-Id: I8396ba9d20e25b40044850a532681adbde3e0354
2017-04-04 17:59:54 +00:00
Jesse Evans
1a8318c7ed
Merge "Removes instant apps from certain screens" into oc-dev
...
am: 1c956b304a
Change-Id: I22d49523e95c4ed7dae7aa4a1a756d2ecf8938f0
2017-04-04 17:59:37 +00:00
TreeHugger Robot
c8e06b3fb6
Merge "Adds the Clear App dialog for Instant Apps" into oc-dev
2017-04-04 17:50:00 +00:00
TreeHugger Robot
1c956b304a
Merge "Removes instant apps from certain screens" into oc-dev
2017-04-04 17:49:55 +00:00
Christine Franks
6d539dc7a4
Merge "Changed description for system alert window setting" into oc-dev am: 48c2d516de
...
am: c259cee35f
Change-Id: I38cf663bd966013dacf0d7255bab0e4b434beffc
2017-04-04 17:38:29 +00:00
Sean Stout
87350960d7
Merge "Added Night Light Suggestion and tests" into oc-dev am: 1512b07a9b
...
am: c2ed9f8b7e
Change-Id: I70ce8e5ae91c3eebc8322ebc0f495b572247c8f0
2017-04-04 17:38:14 +00:00
Soroosh Mariooryad
172f888ad5
Adding APIs for smart search ranking.
...
Test: RunSettingsRoboTests
Bug: 36866337
Change-Id: I20a26e5ac7a57582cea24951120717a4f2c93ce0
2017-04-04 10:33:58 -07:00
Christine Franks
c259cee35f
Merge "Changed description for system alert window setting" into oc-dev
...
am: 48c2d516de
Change-Id: If350524f65a14de2f7c95919f85657a5e2476469
2017-04-04 17:30:39 +00:00
Sean Stout
c2ed9f8b7e
Merge "Added Night Light Suggestion and tests" into oc-dev
...
am: 1512b07a9b
Change-Id: Ia680639585eb6f196b6f3d2cb23b5772224286c4
2017-04-04 17:30:22 +00:00
Christine Franks
48c2d516de
Merge "Changed description for system alert window setting" into oc-dev
2017-04-04 17:24:40 +00:00
Sean Stout
1512b07a9b
Merge "Added Night Light Suggestion and tests" into oc-dev
2017-04-04 17:19:44 +00:00
Tony Mantler
d9db7dfc28
Add AvailableVirtualKeyboardFragment to TV
...
Allows enabling/disabling IMEs on TV.
Moves InputMethodPreference to SettingsLib.
Also minor code tidying
Bug: 36079941
Test: Keyboard settings still work on Fugu and Ryu
Change-Id: Idf42cf5c46d5bb32db59924819d64f73d533d105
(cherry picked from commit 2ec69563cd
)
2017-04-04 15:49:47 +00:00
Jesse Evans
804854cdfe
Removes instant apps from certain screens
...
Removes instant apps from the Special Access screens, as well as
notifications.
Test: make RunSettingsRoboTests
Bug: 36515324
Change-Id: I5b2f0ee3219acd89e2cbdcefed4d9608450395c0
(cherry picked from commit 1c9b6092ee
)
2017-04-04 08:34:57 -07:00
Jesse Evans
5c9f7a88b4
Adds the Clear App dialog for Instant Apps
...
Adds a confirmation dialog for the user when tapping clear app.
From this dialog the user can either cancel, or confirm they
want to clear the app.
Test: make RunSettingsRoboTests
Bug: 36536695
Change-Id: Idffcf5ef318578ae2e075ea2cbb35323d41acade
2017-04-04 08:30:38 -07:00
Christine Franks
3bec2c3c25
Changed description for system alert window setting
...
Bug: 36070413
Test: make -j100, updated string appears in Settings
Change-Id: I962b17344ea5fc948c35e4d779ed5686df0d09a3
2017-04-04 15:05:16 +00:00
Jack He
fa183f7a49
Fix a crash when an app requests Bluetooth to be discoverable am: ebbfce0bf1
...
am: 4b27231fd4
Change-Id: Id383dca443a09dd25b520978b9fbe8f5791eb46f
2017-04-04 04:17:31 +00:00
Jack He
4b27231fd4
Fix a crash when an app requests Bluetooth to be discoverable
...
am: ebbfce0bf1
Change-Id: I3fcdf1abcf7ce42b7f95dc9ca34aad6dac03daff
2017-04-04 04:12:08 +00:00
Jack He
ebbfce0bf1
Fix a crash when an app requests Bluetooth to be discoverable
...
* When an app requests Bluetooth to be discoverable with a timeout and a
non null EXTRA_PACKAGE_NAME, Settings app should put in the correct
timeout values in the dialog string
Bug: 36870303
Test: make, try making Bluetooth discoverable via
ACTION_REQUEST_DISCOVERABLE intent
Change-Id: I0cebc2f20371c9de5f28feb26425422c0777aa45
2017-04-04 01:53:20 +00:00
Jeff Sharkey
5a13d2fc4d
Merge "Don't try using a detached fragment." into oc-dev am: b59337c0eb
...
am: 019946868e
Change-Id: I5e60e805cda5e7210d18027dfd4ddf9382ce50b8
2017-04-04 01:31:09 +00:00
Jeff Sharkey
019946868e
Merge "Don't try using a detached fragment." into oc-dev
...
am: b59337c0eb
Change-Id: I7b52324981b9f6bd71a1497b0d93afbd4dcb7ef9
2017-04-04 01:26:59 +00:00
TreeHugger Robot
b59337c0eb
Merge "Don't try using a detached fragment." into oc-dev
2017-04-04 01:18:11 +00:00
Jeff Sharkey
5e2fc68668
Don't try using a detached fragment.
...
Test: builds, boots
Bug: 36486843
Change-Id: I3e2d2bcd56edcc86370f4b64dabdf155d63f40d3
2017-04-03 17:19:19 -06:00
TreeHugger Robot
b4e7b17223
Merge "Add AvailableVirtualKeyboardFragment to TV"
2017-04-03 22:04:18 +00:00
Sean Stout
062512641e
Added Night Light Suggestion and tests
...
Bug: 34900174
Test: make ROBOTEST_FILTER=SettingsSuggestionsTest RunSettingsRoboTests
Change-Id: I5b2d4e5debc1403cfcbf9c6ecf9397d1074e3a29
2017-04-03 14:46:25 -07:00
Maurice Lam
ca022e2b9b
Merge "Fix suggested action custom view binding"
2017-04-03 21:38:20 +00:00
Maurice Lam
68d6bcd18a
Merge "Rebuild suggestions when suggestions are dismissed"
2017-04-03 21:37:59 +00:00
Stephen Chen
fb3bdd7ed4
Merge "Add friction icon for metered networks." into oc-dev am: 9b271041a9
...
am: c1288e2630
Change-Id: If0a2c01310b5d899fcda40f88d6c22c6db445c00
2017-04-03 18:51:58 +00:00
Stephen Chen
c1288e2630
Merge "Add friction icon for metered networks." into oc-dev
...
am: 9b271041a9
Change-Id: Ic78a948751317a5536a8ee52825c74672b9a7996
2017-04-03 18:40:34 +00:00
Hemant Gupta
06dc823fb7
Merge "Bluetooth: Fix Resource Leak in OPP (1/2)" am: e270a6aa85
am: 2ffab51c0e
am: b5e14d5f30
...
am: ec6815ea7c
Change-Id: I7a49313949a334776b69d12f09c807251005aacd
2017-04-03 18:40:19 +00:00
TreeHugger Robot
9b271041a9
Merge "Add friction icon for metered networks." into oc-dev
2017-04-03 18:24:02 +00:00
Hemant Gupta
ec6815ea7c
Merge "Bluetooth: Fix Resource Leak in OPP (1/2)" am: e270a6aa85
am: 2ffab51c0e
...
am: b5e14d5f30
Change-Id: Ie2246c812f6a34086c19561f62e73f714bdd8eff
2017-04-03 17:57:42 +00:00
Hemant Gupta
b5e14d5f30
Merge "Bluetooth: Fix Resource Leak in OPP (1/2)" am: e270a6aa85
...
am: 2ffab51c0e
Change-Id: I96e6196c6e1417c3115946d483d6f822367aca11
2017-04-03 17:54:06 +00:00
Hemant Gupta
2ffab51c0e
Merge "Bluetooth: Fix Resource Leak in OPP (1/2)"
...
am: e270a6aa85
Change-Id: Ia5108737add480f2cce52663f13d496653c37320
2017-04-03 17:50:36 +00:00
Treehugger Robot
e270a6aa85
Merge "Bluetooth: Fix Resource Leak in OPP (1/2)"
2017-04-03 17:43:42 +00:00
Amin Shaikh
fa04ad4e8f
Fix NPE when forgetting networks. am: 3c0d5ff3d1
...
am: f73b263583
Change-Id: Ieb5ee707cb977c1bfe8803fb4678c5b8fda0337c
2017-04-02 21:36:50 +00:00
Amin Shaikh
f73b263583
Fix NPE when forgetting networks.
...
am: 3c0d5ff3d1
Change-Id: I713d50e7ecf31b95990afba7c26e2c0d54177f10
2017-04-02 21:33:55 +00:00