Commit Graph

34606 Commits

Author SHA1 Message Date
Peter Qiu
071119403b Merge "wifi: allow manual connection to a Passpoint provided network" into oc-dev am: 248c04001e
am: 9a5a4d881a

Change-Id: Icbd0e9c0f9adad458cf6a5f8b713077f681c9ff7
2017-04-05 21:33:34 +00:00
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
9196c67f7b Merge "Removed deprecated auto(F)ill settings." into oc-dev am: 0647c97a8e
am: 090b4e7e59

Change-Id: Ife3bc93b4da89bbb9554c8dcf78bcab073b73ec6
2017-04-05 20:36:58 +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
43b88c9e23 Merge "Revert "renaming/removing fingerprints should be reflected in UI if fingerprintservice lags"" into oc-dev am: 7ad05fb1f3
am: 5e4facb65e

Change-Id: I6f3198dace607a7a89ad312a159aaa3c2bafebeb
2017-04-05 20:19:54 +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
3ac4d429f1 Merge "Fix a unit test regression." into oc-dev am: affc8fa18e
am: 60b40a31c8

Change-Id: Ib37112094988b3837b261fb7be28f4e3cecbe4f9
2017-04-05 20:11:18 +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
7fa7935b55 Merge "RejectedExecutionException in DataUsageLIst" am: 7a8121fdd9 am: 543a98806f am: 1f9c67e982
am: 3c77ef7f29

Change-Id: I4760c500b434f2e7d0027947f42b5e482ca138f8
2017-04-05 13:48:15 +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
b969f932bd renaming/removing fingerprints should be reflected in UI if fingerprintservice lags am: bb994166cb
am: 1399eb5dee

Change-Id: Iacd8ea6a2734f81652b57948ce14e3527454c032
2017-04-05 05:00:56 +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
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
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
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