Commit Graph

38898 Commits

Author SHA1 Message Date
Treehugger Robot
41b4d908bb Merge "Settings: Fix SparseArray null pointer issue in monkey issues" 2017-07-27 18:16:08 +00:00
TreeHugger Robot
4ab4966e7a Merge "Don't update the header when toggle menu" into oc-dr1-dev 2017-07-27 18:15:55 +00:00
Treehugger Robot
fd7dec5d4a Merge "Show Error dialog when WPS is interrupted" 2017-07-27 18:15:35 +00:00
Soroosh Mariooryad
30b6b769c3 Merge "Merge "Update suggestion ranking model coefficients." into oc-dr1-dev am: c3bb4cd8c0 am: e993ab19fc" into oc-mr1-dev-plus-aosp
am: 9c08a6cb1b

Change-Id: Ie975d26e4624a504f94ee2b633479e648012cbc9
2017-07-27 18:15:27 +00:00
jackqdyulei
d544a5b663 Merge "Add ResultPayload for Allow notification dots" into oc-mr1-dev am: ea7c30265c
am: 339c6ac7c2

Change-Id: I79b0f0eb4032260b73e8b4fe3ec4f741dbeb2e1e
2017-07-27 18:15:02 +00:00
Android Build Merger (Role)
f0184bbc35 Merge "Merge "Update suggestion ranking model coefficients." into oc-dr1-dev am: c3bb4cd8c0 am: 6f0e9273f8" into oc-mr1-dev-plus-aosp 2017-07-27 17:57:20 +00:00
Soroosh Mariooryad
5f210ec0ba Merge "Update suggestion ranking model coefficients." into oc-dr1-dev am: c3bb4cd8c0
am: 6f0e9273f8

Change-Id: I567e41b2754bbf2af7295ce3443cb0be2aa90411
2017-07-27 17:57:04 +00:00
Android Build Merger (Role)
9c08a6cb1b Merge "Merge "Update suggestion ranking model coefficients." into oc-dr1-dev am: c3bb4cd8c0 am: e993ab19fc" into oc-mr1-dev-plus-aosp 2017-07-27 17:57:03 +00:00
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
Soroosh Mariooryad
ae5aa96311 Merge "Update suggestion ranking model coefficients." into oc-dr1-dev am: c3bb4cd8c0
am: e993ab19fc

Change-Id: I5903157a27f97ac1d8f429978b400d7f22428f28
2017-07-27 17:56:43 +00:00
Soroosh Mariooryad
6f0e9273f8 Merge "Update suggestion ranking model coefficients." into oc-dr1-dev
am: c3bb4cd8c0

Change-Id: Ia59839d3b952420390896d06c030905853df92e7
2017-07-27 17:54:48 +00:00
Soroosh Mariooryad
e993ab19fc Merge "Update suggestion ranking model coefficients." into oc-dr1-dev
am: c3bb4cd8c0

Change-Id: Iad0b750eaaee29a41be6514cc29d521bc899b71a
2017-07-27 17:54:46 +00:00
TreeHugger Robot
ea7c30265c Merge "Add ResultPayload for Allow notification dots" into oc-mr1-dev 2017-07-27 17:53:54 +00:00
Doris Ling
4940539479 Limit the suggestions to be shown to 5.
- when creating the dashboard data, pass the sublist of suggestions to
cap the total number of suggestions to be shown to 5.
- if user swipe away the suggestion, it will only remove the suggestion
from the suggestion adapater, and will not trigger rebuilding the whole
UI.

Bug: 64072051
Change-Id: I1efabeb2a805c670007c631d3ccb0fdfbde7b55a
Fix: 63309218
Test: make RunSettingsRoboTests
2017-07-27 10:45:30 -07:00
Ajay Nadathur
05fcf3baf2 Update text for lock screen notifications
bug: 62844951
Test: Manually tested
Change-Id: Ie6a85c87252f073cb6dec8f3812024cfade49e1e
2017-07-27 17:43:24 +00:00
Soroosh Mariooryad
c3bb4cd8c0 Merge "Update suggestion ranking model coefficients." into oc-dr1-dev 2017-07-27 17:39:04 +00:00
Julia Reynolds
79544db727 Merge "Merge "Revert string change" into oc-dr1-dev am: 4b8f2c9ad5 am: 698ce72bc2" into oc-mr1-dev-plus-aosp
am: 7808d07be0

Change-Id: Iaef740b035f9181313430e7e0dbc35691bb6200d
2017-07-27 12:48:44 +00:00
Julia Reynolds
7b423836ea Merge "Revert string change" into oc-dr1-dev am: 4b8f2c9ad5 am: d6ab7dee09
am: 81eb0697da

Change-Id: I844a5066dabbe40161f1e10b5525458ddea49ce0
2017-07-27 12:48:21 +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
698ce72bc2 Merge "Revert string change" into oc-dr1-dev
am: 4b8f2c9ad5

Change-Id: I0dbd3d1d3efd494ef592ee1fca201bedbcea881a
2017-07-27 12:43:21 +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
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