Andrew Zeng
233d88a277
Use MIN_LOCK_PASSWORD_SIZE as min password length.
...
Currently MIN_LOCK_PASSWORD_SIZE=MIN_LOCK_PATTERN_SIZE, so there
shouldn't be any behavior changes stemming from this.
Change-Id: I15369723e7fd0cc3fe8230c9b450faf929fefd00
2017-04-06 15:39:58 -07:00
Bill Yi
06a20f2be9
Merge "Import translations. DO NOT MERGE" into oc-dev am: d67a6d7176 -s ours
...
am: 3f52ee79d7
2017-04-06 21:54:47 +00:00
Bill Yi
3f52ee79d7
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: d67a6d7176
2017-04-06 21:49:40 +00:00
TreeHugger Robot
d67a6d7176
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-04-06 21:44:11 +00:00
Doris Ling
76c325d46c
Merge "Add summary text to Display->Brightness level." into oc-dev am: ad69c46712
...
am: c48ef6dda1
2017-04-06 20:37:22 +00:00
Doris Ling
c48ef6dda1
Merge "Add summary text to Display->Brightness level." into oc-dev
...
am: ad69c46712
2017-04-06 20:33:14 +00:00
Doris Ling
ad69c46712
Merge "Add summary text to Display->Brightness level." into oc-dev
2017-04-06 20:03:24 +00:00
Bill Yi
e224be20a1
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 36981734
Change-Id: I2d0ef02f962fd737c6269feb97dc9ca9336671a5
2017-04-06 12:36:34 -07:00
Doris Ling
eff691280a
Merge "Update summary for Connected devices->Printing." into oc-dev am: 4bbfdb13e7
...
am: 38fc861a62
2017-04-06 19:21:53 +00:00
Doris Ling
38fc861a62
Merge "Update summary for Connected devices->Printing." into oc-dev
...
am: 4bbfdb13e7
2017-04-06 18:43:14 +00:00
Maurice Lam
0ed1d928d4
Merge "Make GLIF v2 available to OEMs"
2017-04-06 18:42:38 +00:00
Doris Ling
4bbfdb13e7
Merge "Update summary for Connected devices->Printing." into oc-dev
2017-04-06 18:35:53 +00:00
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
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
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
