Doris Ling
8071d18ad5
Merge "Update Wifi off summary text." into oc-dev am: 28e35fcf05
...
am: 0950fa569b
2017-04-06 17:20:52 +00:00
Doris Ling
766643750a
Merge "Re-order the display settings items." into oc-dev am: 5a03e321bc
...
am: 5221d1cd0a
2017-04-06 17:20:21 +00:00
Christine Franks
fbf21f4c85
Merge "Prevent apps from displaying over Settings" into oc-dev am: 24596f51d5
...
am: 8606c652d5
2017-04-06 17:19:25 +00:00
Doris Ling
0950fa569b
Merge "Update Wifi off summary text." into oc-dev
...
am: 28e35fcf05
2017-04-06 17:08:04 +00:00
Doris Ling
5221d1cd0a
Merge "Re-order the display settings items." into oc-dev
...
am: 5a03e321bc
2017-04-06 17:07:26 +00:00
Christine Franks
8606c652d5
Merge "Prevent apps from displaying over Settings" into oc-dev
...
am: 24596f51d5
2017-04-06 17:07:07 +00:00
Doris Ling
28e35fcf05
Merge "Update Wifi off summary text." into oc-dev
2017-04-06 17:04:45 +00:00
Doris Ling
5a03e321bc
Merge "Re-order the display settings items." into oc-dev
2017-04-06 17:01:46 +00:00
Christine Franks
24596f51d5
Merge "Prevent apps from displaying over Settings" into oc-dev
2017-04-06 16:47:53 +00:00
TreeHugger Robot
ab86bf8244
Merge "Fixes instant apps on the Opening links screen"
2017-04-06 15:33:40 +00:00
Amin Shaikh
ff3d3b45d3
Merge "Link to "scanning settings" when Wi-Fi is off." into oc-dev am: 0c4747401a
...
am: 0a361238d7
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
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
2017-04-06 02:03:30 +00:00
Amin Shaikh
5951f5ccf6
Merge "Update saved networks screen after forget." into oc-dev
...
am: 191d081d57
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
2017-04-06 01:37:26 +00:00
Doris Ling
3e62570b05
Merge "Add resource string for Security dashboard summary." into oc-dev
...
am: 8c215807b2
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
Christine Franks
c50403c606
Prevent apps from displaying over Settings
...
Specifically, the DrawOverlayDetails fragment only.
Bug: 36070413
Test: make RunSettingsRoboTests -j100
Change-Id: I0069f0cacf8c963c8c6878dc89a32b205983a568
2017-04-05 17:55:24 -07:00
Marie Janssen
af198e34a8
Merge "Bluetooth: only unregisterReceiver if we register" am: 4dc556bda8 am: c27d7effb0 am: f72e86f332
...
am: 097b20b453
2017-04-06 00:33:23 +00:00
Marie Janssen
097b20b453
Merge "Bluetooth: only unregisterReceiver if we register" am: 4dc556bda8 am: c27d7effb0
...
am: f72e86f332
2017-04-06 00:20:16 +00:00
Marie Janssen
f72e86f332
Merge "Bluetooth: only unregisterReceiver if we register" am: 4dc556bda8
...
am: c27d7effb0
2017-04-06 00:17:05 +00:00
Marie Janssen
c27d7effb0
Merge "Bluetooth: only unregisterReceiver if we register"
...
am: 4dc556bda8
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
2017-04-05 23:01:15 +00:00
jackqdyulei
99090544b5
Merge "Fix crash when opening battery page" into oc-dev
...
am: 418e5bffda
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
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
2017-04-05 22:36:21 +00:00
jackqdyulei
a242548be7
Merge "Ui changes in battery main page" into oc-dev
...
am: f297e843e9
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
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
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
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
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
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
2017-04-05 20:36:58 +00:00
Felipe Leme
090b4e7e59
Merge "Removed deprecated auto(F)ill settings." into oc-dev
...
am: 0647c97a8e
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
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
2017-04-05 20:16:25 +00:00
Daniel Nishi
3ac4d429f1
Merge "Fix a unit test regression." into oc-dev am: affc8fa18e
...
am: 60b40a31c8
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
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
2017-04-05 20:04:55 +00:00
