Commit Graph

34682 Commits

Author SHA1 Message Date
TreeHugger Robot
418e5bffda Merge "Fix crash when opening battery page" into oc-dev 2017-04-05 22:45:46 +00:00
jackqdyulei
50a88bbaf2 Merge "Ui changes in battery main page" into oc-dev am: f297e843e9
am: a242548be7

Change-Id: I4984039b680ed7bdce48e8032ba58c70e445e054
2017-04-05 22:36:35 +00:00
Daniel Nishi
fec83ac591 Merge "Lower case the first letter of storage type." into oc-dev am: 4c52af621a
am: 53352cd318  -s ours

Change-Id: I26c4c1fae808a832d721821f9d6c9921f07d46e8
2017-04-05 22:36:21 +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
Sundeep Ghuman
5c2245fca3 Merge "Create Espresso test class for WifiSettings." into oc-dev am: 8b06cbd3a9
am: 904320244d

Change-Id: Icf6780556873c04819216cfd9a162234d6106978
2017-04-05 22:16:59 +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
Maurice Lam
e0e81b68c6 Make GLIF v2 available to OEMs
Rename GLIF Pixel to GLIF v2 and make available to OEMs. In this
model settings read the EXTRA_THEME from the intent and picks between
GLIF and GLIF v2.

Test: Manual
Bug: 36857917
Change-Id: I4899a3d041abaf0b97843cf14affc8d6f9587a22
2017-04-05 21:59:28 +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
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
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
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
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
Amin Shaikh
e4283dcafa Update saved networks screen after forget.
Bug: 36891459
Test: m RunSettingsRoboTests and manual testing
Change-Id: Ie125bd9e66ddbb25a1bbad93af19d4eb1e0a8c8b
2017-04-05 11:35:08 -07: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
Amin Shaikh
0820ee350f Link to "scanning settings" when Wi-Fi is off.
Always link to scanning settings when wifi is off. Previously, the link
was only shown when wifi was off and scanning settings were on.

Bug: 36033488
Test: m RunSettingsRoboTests and manually testing on device
Change-Id: I0abc6f4a25072c78fea6a971621cebc1a97b658b
2017-04-04 17:58:59 -07: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
Jesse Evans
1c218c8368 Fixes instant apps on the Opening links screen
Updates strings to the correct values.

Adds the Instant apps account preference, which launches the
instant apps accounts chooser.

Test: manual test of the settings screen.
Bug: 36514506
Change-Id: I876d0d242bf40a379a3737bc6422e2835fc17839
2017-04-04 16:03:47 -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
Daniel Nishi
d8915c5b10 Move the app_info_storage_title string.
Now it is with the other new storage titles.

Change-Id: Ia2d3338e1f0f1734fb7b65e45da1438afa8cca25
Fixes: 36601953
Test: Compiles.
2017-04-04 14:19:24 -07: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