jackqdyulei
|
339c6ac7c2
|
Merge "Add ResultPayload for Allow notification dots" into oc-mr1-dev
am: ea7c30265c
Change-Id: Ice74f01d0e7a4e5675383a5abe89d0b3ccab4de7
|
2017-07-27 17:56:44 +00:00 |
|
TreeHugger Robot
|
ea7c30265c
|
Merge "Add ResultPayload for Allow notification dots" into oc-mr1-dev
|
2017-07-27 17:53:54 +00:00 |
|
Android Build Merger (Role)
|
7808d07be0
|
Merge "Merge "Revert string change" into oc-dr1-dev am: 4b8f2c9ad5 am: 698ce72bc2" into oc-mr1-dev-plus-aosp
|
2017-07-27 12:46:13 +00:00 |
|
Julia Reynolds
|
ec93f686fc
|
Merge "Revert string change" into oc-dr1-dev am: 4b8f2c9ad5
am: 698ce72bc2
Change-Id: I25c8649c4dbe40ccc721332b08f4a9b65332c0fd
|
2017-07-27 12:45:52 +00:00 |
|
Julia Reynolds
|
81eb0697da
|
Merge "Revert string change" into oc-dr1-dev am: 4b8f2c9ad5
am: d6ab7dee09
Change-Id: Ic8517b370329586cad908283d94928f1b8c3c308
|
2017-07-27 12:45:50 +00:00 |
|
Julia Reynolds
|
d6ab7dee09
|
Merge "Revert string change" into oc-dr1-dev
am: 4b8f2c9ad5
Change-Id: I7460c5c8ad88e7a504b8b246fbbf50d2757f3df6
|
2017-07-27 12:43:21 +00:00 |
|
Julia Reynolds
|
698ce72bc2
|
Merge "Revert string change" into oc-dr1-dev
am: 4b8f2c9ad5
Change-Id: I0dbd3d1d3efd494ef592ee1fca201bedbcea881a
|
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 -s ours
Change-Id: I083ead6fff77b2b319d6c13b9ff95d2679149c2b
|
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 -s ours
Change-Id: I979838abf7aa8a6b5e69bda495ca08edd6110f0d
|
2017-07-27 05:44:25 +00:00 |
|
Andrew Sapperstein
|
3b30cbee7d
|
Merge "Add ambient notifications as inline setting." into oc-dr1-dev
am: 3bd56d970d
Change-Id: I339952e598c48b1fedd0ecdaa05db164484d94cf
|
2017-07-27 05:41:58 +00:00 |
|
Andrew Sapperstein
|
97ca7e473a
|
Merge "Add ambient notifications as inline setting." into oc-dr1-dev
am: 3bd56d970d -s ours
Change-Id: If5bdc4ddce79552eb06001f29afb550cc48ebd83
|
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 -s ours
Change-Id: Iaaa737d1fad0e56d13799452af97cd91c8266c94
|
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
Change-Id: I018aa267ca72d8b8c42fa6e0e39c5cc454fb4d20
|
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 -s ours
Change-Id: Iad694020c5ab0c0e4105940da1cc1a0b3854c435
|
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
Change-Id: I44bc5c7f3576eeba51913a8a852b6ecfc5f5fbd5
|
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
Change-Id: I718c78a47392273db4cff54abe6a2f80067f4d7e
|
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
Change-Id: I7f051180f0938d3eb467e87c522fc9fb4b12e5f5
|
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 -s ours
Change-Id: Iec10999409679807df916e04ca9413385c33093f
|
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
Change-Id: Ibe30aace8256cc25a1856f90877ea57a73f60419
|
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
Change-Id: Ie0b5b306e00e6bb62e5385caabdf306c98fb8c05
|
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
Change-Id: I641556b2baa47690a616dc0e4fec91070a8e4565
|
2017-07-27 01:33:28 +00:00 |
|
Andrew Sapperstein
|
8f25bc916a
|
Merge "Add ambient notifications as inline setting." into oc-mr1-dev
am: 5d7fab4f22
Change-Id: I2654f7820dda35f45b3c4fe1f4792e68736b00ef
|
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 -s ours
Change-Id: I851c408375fa08799cc3be2330e18a928abd89e3
|
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
Change-Id: Ibe7f73e37c446d908e8b69b2a3789c7b22f34509
|
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 -s ours
Change-Id: Id66f31e0cb7118122723aa5f7ac87837d8075e8a
|
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
Change-Id: I44d837dd039a13ef7f2bf236657a5fae3640b0be
|
2017-07-27 01:20:05 +00:00 |
|
Matthew Fritze
|
68617a6f42
|
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev
am: c2cb0d0b9e
Change-Id: I0c11d28b60492723f985c606253a0a9dc6c07595
|
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 -s ours
Change-Id: Ie1a52928c7d6a8f8da3444e74249da90a62d7b00
|
2017-07-27 01:10:19 +00:00 |
|
Matthew Fritze
|
9092e1a0b0
|
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev
am: c2cb0d0b9e
Change-Id: I701fb6fc2d74fef1fce1f4b0d21c86d79012b76d
|
2017-07-27 01:09:55 +00:00 |
|
jackqdyulei
|
75e89dfede
|
Merge "Set minLines for battery header text" into oc-dr1-dev
am: 02560caa92
Change-Id: I0bc848b91594cb0adfd2900ce2678f6acc6ef66e
|
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 -s ours
Change-Id: Idfd7931360bf1ac57a9bc7937ceb36ade0839963
|
2017-07-27 00:55:57 +00:00 |
|
Bill Yi
|
e3e1e7b9d4
|
Import translations. DO NOT MERGE am: 05185952c8 -s ours
am: 64ce525c6a -s ours
Change-Id: Ided1154cb4002792a68ddfed98dd057d7f88e620
|
2017-07-27 00:55:32 +00:00 |
|
jackqdyulei
|
aa5618fd82
|
Add ResultPayload for Allow notification dots
Bug: 62022517
Test: robotests
Change-Id: I86caa1c8604ae8eff27574ca45b5e9f3f6830f8f
|
2017-07-26 17:55:11 -07: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
Change-Id: I2a4d3ed816a7bb938b5613154b8a4bc8f3114142
|
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 -s ours
Change-Id: I2fcf9dbc20ad0600ac924d106e5a87d49752f379
|
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
Change-Id: Ifae5025374a37d1bf8cc07a8af013bff9267f8d5
|
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
Change-Id: Idc7a3f732ca5977ad14dfb9e05db3d80898dc822
|
2017-07-26 22:16:46 +00:00 |
|
Ajay Nadathur
|
044485b850
|
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev
am: f5ebc6f7ed
Change-Id: Ia91197e1d6ee74fd890887330da1eaeb932cd5cb
|
2017-07-26 22:02:33 +00:00 |
|
Ajay Nadathur
|
3c308aef22
|
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev
am: f5ebc6f7ed
Change-Id: I106b98a55eec646959a4f00c44074efc9f0dbe39
|
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 |
|