Peter Qiu
9a5a4d881a
Merge "wifi: allow manual connection to a Passpoint provided network" into oc-dev
...
am: 248c04001e
Change-Id: I96798d7c1ad75210e0484e818ba3982b713a46f7
2017-04-05 21:25:02 +00:00
TreeHugger Robot
248c04001e
Merge "wifi: allow manual connection to a Passpoint provided network" into oc-dev
2017-04-05 21:20:10 +00:00
Felipe Leme
090b4e7e59
Merge "Removed deprecated auto(F)ill settings." into oc-dev
...
am: 0647c97a8e
Change-Id: I423df9ac9fd928a021151e952865f01fe51f9c62
2017-04-05 20:32:26 +00:00
TreeHugger Robot
0647c97a8e
Merge "Removed deprecated auto(F)ill settings." into oc-dev
2017-04-05 20:25:41 +00:00
Daniel Nishi
5e4facb65e
Merge "Revert "renaming/removing fingerprints should be reflected in UI if fingerprintservice lags"" into oc-dev
...
am: 7ad05fb1f3
Change-Id: Ica969821c115e9b251589295bfbbc4097dda7d2d
2017-04-05 20:16:25 +00:00
Daniel Nishi
7ad05fb1f3
Merge "Revert "renaming/removing fingerprints should be reflected in UI if fingerprintservice lags"" into oc-dev
2017-04-05 20:10:59 +00:00
Daniel Nishi
60b40a31c8
Merge "Fix a unit test regression." into oc-dev
...
am: affc8fa18e
Change-Id: Iaf1f3515a4bd8ace3a86fdf5b30075c4275c7d10
2017-04-05 20:05:55 +00:00
Daniel Nishi
2acf0c1125
Revert "renaming/removing fingerprints should be reflected in UI if fingerprintservice lags"
...
This reverts commit bb994166cb
.
Change-Id: I713012a3c449311b5daf8af81b97c050889560c7
2017-04-05 20:04:55 +00:00
Daniel Nishi
affc8fa18e
Merge "Fix a unit test regression." into oc-dev
2017-04-05 19:59:17 +00:00
Robin Lee
3c77ef7f29
Merge "RejectedExecutionException in DataUsageLIst" am: 7a8121fdd9
am: 543a98806f
...
am: 1f9c67e982
Change-Id: I1d4c00df6867b9034b21d6d490323364f77c37db
2017-04-05 13:45:49 +00:00
Robin Lee
1f9c67e982
Merge "RejectedExecutionException in DataUsageLIst" am: 7a8121fdd9
...
am: 543a98806f
Change-Id: Idc1ac1b3628afb4bdee4192305980f4dc03eeb5a
2017-04-05 13:43:17 +00:00
Robin Lee
543a98806f
Merge "RejectedExecutionException in DataUsageLIst"
...
am: 7a8121fdd9
Change-Id: I787cbc2abf247206d6945bdd4bda33479f78b634
2017-04-05 13:40:46 +00:00
Robin Lee
7a8121fdd9
Merge "RejectedExecutionException in DataUsageLIst"
2017-04-05 13:35:52 +00:00
Kevin Chyn
1399eb5dee
renaming/removing fingerprints should be reflected in UI if fingerprintservice lags
...
am: bb994166cb
Change-Id: Ib054102c845f680576ac93d47a103627f9058531
2017-04-05 04:58:28 +00:00
Kevin Chyn
bb994166cb
renaming/removing fingerprints should be reflected in UI if fingerprintservice lags
...
Bug: 30252265
Test: manual
Change-Id: I27761608e52f1437fc7a43bfb48a1f09922d1c0f
2017-04-05 02:34:49 +00:00
Felipe Leme
41789c1e03
Removed deprecated auto(F)ill settings.
...
Bug: 35956626
Test: manual verification
Test: mmm -j90 packages/apps/Settings/tests/robotest
Change-Id: I5d0a02477204d273f331d8af93737c88e5af90e8
2017-04-04 16:40:43 -07: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
TreeHugger Robot
dc43b64c54
Merge "Merge intent filters so intent forwarding works." into oc-dev
2017-04-04 21:25:17 +00:00
Peter Qiu
36b68df4d4
wifi: allow manual connection to a Passpoint provided network
...
While connected to other WiFi network, a Passpoint AP with its
provider installed will shown as "<SSID> available via
<Provider Name>", since the installed provider contained
necessary credentials needed to connect to that AP.
This CL will trigger a connection to that AP when the user
taps on it for manual connection.
Bug: 36357280
Test: manual connecting to a Passpoint network while connected
to other network
Change-Id: Idec440aa1606e80bcea56054e77ef2dc50a7ac93
2017-04-04 14:06:28 -07: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
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
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
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
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
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
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
Daniel Nishi
38a2a5f425
Fix a unit test regression.
...
This fixes a StorageSettingsTest regression where the percentage
was no longer being formatted correctly for the test.
Change-Id: I71e03926ad8b3691cebc26aea11e8557c2ba0fea
Fixes: 36858638
Test: Settings Robotest
2017-04-03 13:01:27 -07: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
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
f73b263583
Fix NPE when forgetting networks.
...
am: 3c0d5ff3d1
Change-Id: I713d50e7ecf31b95990afba7c26e2c0d54177f10
2017-04-02 21:33:55 +00:00
Amin Shaikh
3c0d5ff3d1
Fix NPE when forgetting networks.
...
- Fixed disablement of ephemeral networks
- Exit out of the fragment when Forget is pressed
Bug: 36723238
Test: m RunSettingsRoboTests and manual testing
Change-Id: I83c09a44dbef0f02a452dc8c3163523a27bd4b63
2017-04-02 12:19:42 -07:00
Jesse Evans
6ecbdadd6a
Merge "Removes summary text from Instant Apps details" into oc-dev
...
am: 8fc0d1f948
Change-Id: I806826bd2b7ee5435f132d9f3db234878b9b429f
2017-04-02 16:17:35 +00:00