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
Soroosh Mariooryad
a861d11027
Update suggestion ranking model coefficients.
...
- This is not a functional change and it only updates the model weights
which affects the ranking of suggestion items. The previous weights were
tuned to force the ranking to have immediate response to signal changes.
But, the current weights are tuned to maximize the user interactions
with suggestion.
Test: RunSettingsRoboTests & also manually testing suggestions
Bug: 64093782
Change-Id: I9f50ed6c4ed22d1a14110ec61156c14ba74aef64
2017-07-27 00:38:42 -07:00
Andrew Sapperstein
bf72ec4f0d
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
...
am: 5bbef78325
-s ours
Change-Id: Ic75e9b51a56261cf8f386667a0cc55c411ee8473
2017-07-27 06:50:19 +00:00
Andrew Sapperstein
784e04e574
Merge "Add ambient notifications as inline setting." into oc-dr1-dev am: 3bd56d970d
am: 3b30cbee7d
-s ours
...
am: 280e3cc0d7
-s ours
Change-Id: I2b8de97f515eeb8e3c8a4919482fd1700262c13c
2017-07-27 06:49:50 +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
0d134a61cc
Import translations. DO NOT MERGE am: 05185952c8
-s ours am: 64ce525c6a
-s ours am: e3e1e7b9d4
-s ours am: a9fc19e385
-s ours
...
am: 4baa6ce625
-s ours
Change-Id: I76cf979321b93327e2695cba6beba02f5c8df97d
2017-07-27 05:32:37 +00:00
Andrew Sapperstein
ae41c1b670
Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev am: 7b445d59ef
am: fe35c40dad
...
am: b0b1bdd02b
Change-Id: I8d1c9b5a059b68e9cecfbe80151cfdd6ef4a6791
2017-07-27 05:32:16 +00:00
Bill Yi
673ef15909
Import translations. DO NOT MERGE am: 05185952c8
-s ours am: 64ce525c6a
-s ours am: b0126e3500
-s ours am: 1602913a75
-s ours
...
am: d8667dba08
-s ours
Change-Id: I5c0bb0b72d3004f10acf00e25a43bdcdbe09a72d
2017-07-27 05:31:51 +00:00
Matthew Fritze
a495e6e718
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev am: c2cb0d0b9e
am: 9092e1a0b0
...
am: ece8c7bfe7
Change-Id: I6528cb4f24562d66aa139dc76e522b75305f340a
2017-07-27 05:31:26 +00:00
jackqdyulei
cebd4397ae
Merge "Set minLines for battery header text" into oc-dr1-dev am: 02560caa92
am: 75e89dfede
...
am: 418bd11db3
Change-Id: I73a01ad35316be7c6d66f05ba312a5c432558d3b
2017-07-27 05:30:58 +00:00
Andrew Sapperstein
71902daa81
Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev am: 7b445d59ef
am: 1ee62c16a3
...
am: df916872c1
Change-Id: Ie842bc43d7af52f3b797eba63c2ec9e5fb886381
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
-s ours
Change-Id: I50cf506341907c540c71718d933524735738cc4a
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
Change-Id: I0f6a9f3923c36553d4494a0fca00024abffb96e5
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
Change-Id: If482eb0f2229193145e2157ae76d09249e0c433b
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
Change-Id: I9f1857004f87e659fdf807bb41cec18a69c60266
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
Change-Id: Icdbd94d006b5c7bcc0251d657342ee6c90f7ef48
2017-07-27 05:27:57 +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
Ryusuke Sawa
a15be47bd5
Show Error dialog when WPS is interrupted
...
When WPS searching is interruptd by turning Wi-Fi off,
Error dialog should be displayed.
Bug: 29883134
Test: manual - tap WPS Push Button and turn Airplane mode on
Change-Id: Ie6667c6b7d09540af21b015e0d5b991d818d2c77
2017-07-27 10:53:31 +09: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
Jeff Davidson
a0b8472c4d
Remove eSIM reset checkbox and always perform the reset.
...
Due to substantial risk in landing the "retain profiles" flow that
would otherwise occur if the user elected not to wipe eSIM profiles
during a factory reset, we no longer expose this option to users
through the UI. Instead, we show affected users messaging indicating
that their eSIM will be wiped unconditionally.
The underlying plumbing is retained to keep the change small and to
make it easier to revert back to a checkbox when the rest of the
platform supports it.
Change-Id: Ida7df14d81ffc4cb6b4b414928d3ce7e5c78594b
Fixes: 64081853
Test: TreeHugger
2017-07-27 01:05: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
-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
Ajay Nadathur
cfc78d7d7c
Update text for lock screen notifications
...
bug: 62844951
Test: Manually tested
Change-Id: Ie6a85c87252f073cb6dec8f3812024cfade49e1e
2017-07-27 00:38:14 +00:00