Julia Reynolds
ec93f686fc
Merge "Revert string change" into oc-dr1-dev am: 4b8f2c9ad5
...
am: 698ce72bc2
2017-07-27 12:45:52 +00:00
Julia Reynolds
698ce72bc2
Merge "Revert string change" into oc-dr1-dev
...
am: 4b8f2c9ad5
2017-07-27 12:43:21 +00:00
TreeHugger Robot
4b8f2c9ad5
Merge "Revert string change" into oc-dr1-dev
2017-07-27 12:36:55 +00:00
Android Build Merger (Role)
5bbef78325
Merge "Merge "Add ambient notifications as inline setting." into oc-dr1-dev am: 3bd56d970d -s ours am: 97ca7e473a -s ours" into oc-mr1-dev-plus-aosp
2017-07-27 05:44:43 +00:00
Andrew Sapperstein
3ff668617f
Merge "Add ambient notifications as inline setting." into oc-dr1-dev am: 3bd56d970d -s ours
...
am: 97ca7e473a
2017-07-27 05:44:26 +00:00
Andrew Sapperstein
280e3cc0d7
Merge "Add ambient notifications as inline setting." into oc-dr1-dev am: 3bd56d970d
...
am: 3b30cbee7d
2017-07-27 05:44:25 +00:00
Andrew Sapperstein
3b30cbee7d
Merge "Add ambient notifications as inline setting." into oc-dr1-dev
...
am: 3bd56d970d
2017-07-27 05:41:58 +00:00
Andrew Sapperstein
97ca7e473a
Merge "Add ambient notifications as inline setting." into oc-dr1-dev
...
am: 3bd56d970d
2017-07-27 05:41:56 +00:00
TreeHugger Robot
3bd56d970d
Merge "Add ambient notifications as inline setting." into oc-dr1-dev
2017-07-27 05:37:49 +00:00
Bill Yi
4baa6ce625
Import translations. DO NOT MERGE am: 05185952c8 -s ours am: 64ce525c6a -s ours am: e3e1e7b9d4 -s ours
...
am: a9fc19e385
2017-07-27 02:15:58 +00:00
Andrew Sapperstein
b0b1bdd02b
Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev am: 7b445d59ef
...
am: fe35c40dad
2017-07-27 02:15:36 +00:00
Bill Yi
d8667dba08
Import translations. DO NOT MERGE am: 05185952c8 -s ours am: 64ce525c6a -s ours am: b0126e3500 -s ours
...
am: 1602913a75
2017-07-27 02:15:13 +00:00
Matthew Fritze
ece8c7bfe7
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev am: c2cb0d0b9e
...
am: 9092e1a0b0
2017-07-27 02:14:54 +00:00
jackqdyulei
418bd11db3
Merge "Set minLines for battery header text" into oc-dr1-dev am: 02560caa92
...
am: 75e89dfede
2017-07-27 02:14:28 +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
Bill Yi
a9fc19e385
Import translations. DO NOT MERGE am: 05185952c8 -s ours am: 64ce525c6a -s ours
...
am: e3e1e7b9d4
2017-07-27 01:24:51 +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
Andrew Sapperstein
fe35c40dad
Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev
...
am: 7b445d59ef
2017-07-27 01:20:05 +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
Bill Yi
1602913a75
Import translations. DO NOT MERGE am: 05185952c8 -s ours am: 64ce525c6a -s ours
...
am: b0126e3500
2017-07-27 01:10:19 +00:00
Matthew Fritze
9092e1a0b0
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev
...
am: c2cb0d0b9e
2017-07-27 01:09:55 +00:00
jackqdyulei
75e89dfede
Merge "Set minLines for battery header text" into oc-dr1-dev
...
am: 02560caa92
2017-07-27 01:08:43 +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
Bill Yi
e3e1e7b9d4
Import translations. DO NOT MERGE am: 05185952c8 -s ours
...
am: 64ce525c6a
2017-07-27 00:55:32 +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
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
Andrew Sapperstein
50ca1968e6
Add ambient notifications as inline setting.
...
Bug: 62022517
Test: robotest and manual
Change-Id: I7e3faf56a1c8282017a2e84d88e7b0b788a7bfb6
Merged-In: If245f541ec3c8a1627d082b97bba9b325438cfeb
2017-07-26 20:20:19 +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
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
