Amin Shaikh
ff3d3b45d3
Merge "Link to "scanning settings" when Wi-Fi is off." into oc-dev am: 0c4747401a
...
am: 0a361238d7
Change-Id: I00a3da90f3d5693ea76e1c10d89b1ad792f77b95
2017-04-06 03:09:06 +00:00
Amin Shaikh
920ad23f80
Merge "Update saved networks screen after forget." into oc-dev am: 191d081d57
...
am: 5951f5ccf6
Change-Id: I28af85fab41a5770dcd5ed48248925d281765b6c
2017-04-06 03:08:49 +00:00
Amin Shaikh
0a361238d7
Merge "Link to "scanning settings" when Wi-Fi is off." into oc-dev
...
am: 0c4747401a
Change-Id: Ia60bf563b0719b1abf8c336addba620ec17abe32
2017-04-06 02:03:30 +00:00
Amin Shaikh
5951f5ccf6
Merge "Update saved networks screen after forget." into oc-dev
...
am: 191d081d57
Change-Id: I439a7dc573bcc37a540d1bf63dedb7392604e371
2017-04-06 02:03:14 +00:00
TreeHugger Robot
0c4747401a
Merge "Link to "scanning settings" when Wi-Fi is off." into oc-dev
2017-04-06 01:41:43 +00:00
TreeHugger Robot
191d081d57
Merge "Update saved networks screen after forget." into oc-dev
2017-04-06 01:41:28 +00:00
Doris Ling
e149201d89
Merge "Add resource string for Security dashboard summary." into oc-dev am: 8c215807b2
...
am: 3e62570b05
Change-Id: Ibd3b335828773d14d2f0e8e9f188fc7cc7e079d3
2017-04-06 01:37:26 +00:00
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
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
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
423d28ac90
Merge "Fix crash when opening battery page" into oc-dev am: 418e5bffda
...
am: 99090544b5
Change-Id: I83a69efda6f4351625c8b1f28792b7530ca2b6ef
2017-04-05 23:01:15 +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
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
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