Marie Janssen
af198e34a8
Merge "Bluetooth: only unregisterReceiver if we register" am: 4dc556bda8 am: c27d7effb0 am: f72e86f332
...
am: 097b20b453
Change-Id: I9e30412565f0318ab2346d44b4c81a149904809f
2017-04-06 00:33:23 +00:00
Marie Janssen
097b20b453
Merge "Bluetooth: only unregisterReceiver if we register" am: 4dc556bda8 am: c27d7effb0
...
am: f72e86f332
Change-Id: Ic0a53a4904b11342fe89bed6d4dea69e595a6cf7
2017-04-06 00:20:16 +00:00
Marie Janssen
f72e86f332
Merge "Bluetooth: only unregisterReceiver if we register" am: 4dc556bda8
...
am: c27d7effb0
Change-Id: I2c477f40e874ad33a5e3a218370f49e744c68787
2017-04-06 00:17:05 +00:00
Marie Janssen
4dc556bda8
Merge "Bluetooth: only unregisterReceiver if we register"
2017-04-06 00:01:58 +00:00
jackqdyulei
99090544b5
Merge "Fix crash when opening battery page" into oc-dev
...
am: 418e5bffda
Change-Id: I2ea79ff502abaa99c51e1f5e2d4d359d9845a304
2017-04-05 22:55:48 +00:00
TreeHugger Robot
418e5bffda
Merge "Fix crash when opening battery page" into oc-dev
2017-04-05 22:45:46 +00:00
jackqdyulei
a242548be7
Merge "Ui changes in battery main page" into oc-dev
...
am: f297e843e9
Change-Id: I3b96043a327498f0ed935a80a24d6fffbd36c913
2017-04-05 22:25:48 +00:00
Daniel Nishi
53352cd318
Merge "Lower case the first letter of storage type." into oc-dev
...
am: 4c52af621a
Change-Id: Ie1aa5e25f13e9d906a3c7c88c8fed60626e88ffe
2017-04-05 22:25:33 +00:00
TreeHugger Robot
f297e843e9
Merge "Ui changes in battery main page" into oc-dev
2017-04-05 22:13:01 +00:00
Daniel Nishi
4c52af621a
Merge "Lower case the first letter of storage type." into oc-dev
2017-04-05 22:06:55 +00:00
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
jackqdyulei
cdbc114376
Fix crash when opening battery page
...
The settings crashes when opening battery usage detail page from
installed app page. Main reason is that it trying to open obsolete
page. This cl directs it to open AdvancedPowerUsageDetail instead.
Following cl will make InstalledAppDetail show calibrated percentage,
which is trakced in b/36816681
Bug: 36792973
Test: RunSettingsRoboTests
Change-Id: Ie63e64e543ed3b28974ffdda8b42c97e7749a0f7
(cherry picked from commit fac713318c )
2017-04-05 14:12:26 -07: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
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
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
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
Soroosh Mariooryad
1a12804aec
Merge "Adding APIs for smart search ranking."
2017-04-04 21:37:28 +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
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
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
Soroosh Mariooryad
172f888ad5
Adding APIs for smart search ranking.
...
Test: RunSettingsRoboTests
Bug: 36866337
Change-Id: I20a26e5ac7a57582cea24951120717a4f2c93ce0
2017-04-04 10:33:58 -07:00
jackqdyulei
273ad50a3a
Ui changes in battery main page
...
1. Refine the battery header view
2. Move stats section to the place above power management
3. Add last full charge battery stat
4. Add the disclaimer as a footer
Also update the method name in test file, and this ui changes
also fix the header flash problem.
Bug: 36576021
Bug: 36494178
Test: RunSettingsRoboTests
Change-Id: I9784dbbbe16e61da7287f300183347dd4eee6a2b
(cherry picked from commit edfd09d590 )
2017-04-04 10:06:35 -07: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
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
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
Maurice Lam
ca022e2b9b
Merge "Fix suggested action custom view binding"
2017-04-03 21:38:20 +00:00