Commit Graph

34499 Commits

Author SHA1 Message Date
Doris Ling
3e62570b05 Merge "Add resource string for Security dashboard summary." into oc-dev
am: 8c215807b2

Change-Id: Ie17257d1acae0e391a3f12edefb5dd582687ff15
2017-04-06 01:30:49 +00:00
TreeHugger Robot
8c215807b2 Merge "Add resource string for Security dashboard summary." into oc-dev 2017-04-06 01:25:06 +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
c27d7effb0 Merge "Bluetooth: only unregisterReceiver if we register"
am: 4dc556bda8

Change-Id: I3df22131a424007c5e0448166787598c7d77ea92
2017-04-06 00:14:07 +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
Sundeep Ghuman
904320244d Merge "Create Espresso test class for WifiSettings." into oc-dev
am: 8b06cbd3a9

Change-Id: Ia26a458def122f40a162a77a6387e5d22c8d4241
2017-04-05 21:33:43 +00:00
TreeHugger Robot
8b06cbd3a9 Merge "Create Espresso test class for WifiSettings." into oc-dev 2017-04-05 21:27:40 +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
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
Doris Ling
dcb6023bd6 Add resource string for Security dashboard summary.
Add the summary text to be shown when fingerprint sensor is not
available.

Bug: 36889582
Test: builds
Change-Id: I868ced81ad3b3177c8ca366adba937342b67ce65
2017-04-05 12:57:58 -07: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
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