Andrew Sapperstein
71902daa81
Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev am: 7b445d59ef am: 1ee62c16a3
...
am: df916872c1
2017-07-27 05:30:09 +00:00
Bill Yi
32bb4393e0
Import translations. DO NOT MERGE am: 05185952c8 -s ours am: 64ce525c6a -s ours am: b0126e3500 -s ours am: ef36ef28d9 -s ours
...
am: 97bed117da
2017-07-27 05:29:41 +00:00
Matthew Fritze
9deb3f3c54
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev am: c2cb0d0b9e am: 68617a6f42
...
am: cba96eb672
2017-07-27 05:29:20 +00:00
Doris Ling
409091c5c9
Merge "Fix gestures summary text when there is no sensor for assit." into oc-mr1-dev am: 8e13218ec8
...
am: e866cd4825
2017-07-27 05:28:52 +00:00
jackqdyulei
24f6fc8b05
Merge "Set minLines for battery header text" into oc-dr1-dev am: 02560caa92 am: 063e87c689
...
am: 220b1f163a
2017-07-27 05:28:27 +00:00
Andrew Sapperstein
151fb83ea6
Merge "Add ambient notifications as inline setting." into oc-mr1-dev am: 5d7fab4f22
...
am: 8f25bc916a
2017-07-27 05:27:57 +00:00
Andrew Sapperstein
df916872c1
Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev am: 7b445d59ef
...
am: 1ee62c16a3
2017-07-27 01:36:57 +00:00
Bill Yi
97bed117da
Import translations. DO NOT MERGE am: 05185952c8 -s ours am: 64ce525c6a -s ours am: b0126e3500 -s ours
...
am: ef36ef28d9
2017-07-27 01:36:32 +00:00
Matthew Fritze
cba96eb672
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev am: c2cb0d0b9e
...
am: 68617a6f42
2017-07-27 01:35:04 +00:00
Doris Ling
e866cd4825
Merge "Fix gestures summary text when there is no sensor for assit." into oc-mr1-dev
...
am: 8e13218ec8
2017-07-27 01:33:52 +00:00
jackqdyulei
220b1f163a
Merge "Set minLines for battery header text" into oc-dr1-dev am: 02560caa92
...
am: 063e87c689
2017-07-27 01:33:28 +00:00
Andrew Sapperstein
8f25bc916a
Merge "Add ambient notifications as inline setting." into oc-mr1-dev
...
am: 5d7fab4f22
2017-07-27 01:32:37 +00:00
Andrew Sapperstein
1ee62c16a3
Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev
...
am: 7b445d59ef
2017-07-27 01:21:05 +00:00
Bill Yi
ef36ef28d9
Import translations. DO NOT MERGE am: 05185952c8 -s ours am: 64ce525c6a -s ours
...
am: b0126e3500
2017-07-27 01:20:25 +00:00
Matthew Fritze
68617a6f42
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev
...
am: c2cb0d0b9e
2017-07-27 01:20:02 +00:00
Andrew Sapperstein
7b445d59ef
Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev
2017-07-27 01:01:26 +00:00
Bill Yi
b0126e3500
Import translations. DO NOT MERGE am: 05185952c8 -s ours
...
am: 64ce525c6a
2017-07-27 00:55:57 +00:00
TreeHugger Robot
8e13218ec8
Merge "Fix gestures summary text when there is no sensor for assit." into oc-mr1-dev
2017-07-27 00:50:10 +00:00
Andrew Sapperstein
b3cf0a0923
Fix more config_headlineFontFamily-induced test breakages
...
Change-Id: Ic8a68a77e7ef8a3fd422e53e39d2fee74324c355
Fixes: 64024743
Test: robotests
2017-07-26 17:41:48 -07:00
TreeHugger Robot
c2cb0d0b9e
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev
2017-07-27 00:31:13 +00:00
jackqdyulei
063e87c689
Merge "Set minLines for battery header text" into oc-dr1-dev
...
am: 02560caa92
2017-07-27 00:05:53 +00:00
TreeHugger Robot
02560caa92
Merge "Set minLines for battery header text" into oc-dr1-dev
2017-07-26 23:46:42 +00:00
TreeHugger Robot
5d7fab4f22
Merge "Add ambient notifications as inline setting." into oc-mr1-dev
2017-07-26 23:34:22 +00:00
Bill Yi
64ce525c6a
Import translations. DO NOT MERGE
...
am: 05185952c8
2017-07-26 23:22:33 +00:00
Ajay Nadathur
353fb3424b
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev am: f5ebc6f7ed am: 044485b850
...
am: 06a9a033a0
2017-07-26 22:53:34 +00:00
Ajay Nadathur
040db7c4f6
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev am: f5ebc6f7ed am: 3c308aef22
...
am: 03737f1c9c
2017-07-26 22:53:03 +00:00
Bill Yi
f28d20b118
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 975d9a18f1 -s ours
...
am: fee1e54914
2017-07-26 22:52:25 +00:00
Ajay Nadathur
06a9a033a0
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev am: f5ebc6f7ed
...
am: 044485b850
2017-07-26 22:26:27 +00:00
Ajay Nadathur
03737f1c9c
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev am: f5ebc6f7ed
...
am: 3c308aef22
2017-07-26 22:16:46 +00:00
Ajay Nadathur
044485b850
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev
...
am: f5ebc6f7ed
2017-07-26 22:02:33 +00:00
Ajay Nadathur
3c308aef22
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev
...
am: f5ebc6f7ed
2017-07-26 22:02:05 +00:00
Ajay Nadathur
f5ebc6f7ed
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev
2017-07-26 21:42:12 +00:00
TreeHugger Robot
76e4804a63
Merge "Import translations. DO NOT MERGE"
2017-07-26 21:41:58 +00:00
Andrew Sapperstein
e8e65a367b
Add ambient notifications as inline setting.
...
Bug: 62022517
Test: robotest and manual
Change-Id: If245f541ec3c8a1627d082b97bba9b325438cfeb
2017-07-26 20:19:19 +00:00
Matthew Fritze
c36ec8e629
Change SwipeForNotification Payload default to Off
...
Bug: 62022517
Test: make RunSettingsRoboTests
Change-Id: Icf6b1224e0857841dcb0d9dd14948d9ef39110ee
2017-07-26 12:59:50 -07:00
Bill Yi
fee1e54914
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 975d9a18f1
2017-07-26 19:47:51 +00:00
TreeHugger Robot
975d9a18f1
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-07-26 19:39:46 +00:00
Bill Yi
85f1f40f06
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 402abcc9df -s ours am: bd429f42cb -s ours
...
am: 8c88b53dda
2017-07-26 18:49:07 +00:00
jackqdyulei
dbe6bd3984
Set minLines for battery header text
...
So the header won't grow/shrink when the text changes.
Bug: 64065456
Test: Build
Change-Id: I96bb00e81d677b1efd55afbfe5f23024d6afd71b
2017-07-26 11:24:54 -07:00
Doris Ling
9042f822a6
Fix gestures summary text when there is no sensor for assit.
...
Should exit the summary handling if sensor is not available.
Change-Id: I5918fa5ac614db48fc2c41e1de555d1ba6928bd4
Fix: 64039312
Test: make RunSettingsRoboTests
2017-07-26 11:07:19 -07:00
Bill Yi
8c88b53dda
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 402abcc9df -s ours
...
am: bd429f42cb
2017-07-26 17:48:32 +00:00
Bill Yi
d0b7e0bca9
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 402abcc9df -s ours am: eca6781a49 -s ours
...
am: db8172a4fe
2017-07-26 17:36:09 +00:00
Antony Sargent
6a6484f5f5
Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev am: 9fb7a3b8b4 am: 1e69f27a41
...
am: 2665600b75
2017-07-26 17:31:06 +00:00
Bill Yi
05185952c8
Import translations. DO NOT MERGE
...
Change-Id: I8f49a9c6acaa689f9269aaca9f22e8b4ab4a5ae0
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-26 10:27:31 -07:00
Bill Yi
67133670a6
Import translations. DO NOT MERGE
...
Change-Id: If81b78db0b3575bccde65cb54ee824b4897ddc56
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-26 10:26:10 -07:00
Bill Yi
db8172a4fe
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 402abcc9df -s ours
...
am: eca6781a49
2017-07-26 17:26:06 +00:00
Antony Sargent
2665600b75
Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev am: 9fb7a3b8b4
...
am: 1e69f27a41
2017-07-26 17:09:14 +00:00
Bill Yi
eca6781a49
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: 402abcc9df
2017-07-26 17:04:23 +00:00
Bill Yi
bd429f42cb
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: 402abcc9df
2017-07-26 16:46:51 +00:00
TreeHugger Robot
402abcc9df
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-07-26 16:31:13 +00:00
