Commit Graph

38872 Commits

Author SHA1 Message Date
Doris Ling
98b39af411 Merge "Limit the suggestions to be shown to 5." into oc-mr1-dev am: 1f34a5cf46
am: a374e1062c

Change-Id: I7773754b0f262f2256735de3d98cc4e64d9f7be6
2017-07-27 21:26:31 +00:00
Doris Ling
a374e1062c Merge "Limit the suggestions to be shown to 5." into oc-mr1-dev
am: 1f34a5cf46

Change-Id: I165b63605b7a55ea0b64c56f87a7ace291a44a28
2017-07-27 21:21:01 +00:00
TreeHugger Robot
1f34a5cf46 Merge "Limit the suggestions to be shown to 5." into oc-mr1-dev 2017-07-27 21:14:43 +00:00
TreeHugger Robot
6e4ebc3b74 Merge "Update text for lock screen notifications" 2017-07-27 21:03:42 +00:00
Android Build Merger (Role)
4b21566ce3 Merge "Merge "Don't update the header when toggle menu" into oc-dr1-dev am: 4ab4966e7a am: 8541d8905a am: e4c555fcb8" 2017-07-27 18:45:53 +00:00
jackqdyulei
f5da9a9a15 Merge "Don't update the header when toggle menu" into oc-dr1-dev am: 4ab4966e7a am: 8541d8905a
am: e4c555fcb8

Change-Id: Id7631f3d4d190a6d29272cdaf52c6d3b0b330c25
2017-07-27 18:45:39 +00:00
Android Build Merger (Role)
2514f87fd6 Merge "Merge "Settings: Fix SparseArray null pointer issue in monkey issues" am: 41b4d908bb am: 3aee5e1ad0 am: 86535a3d15 am: 62bb1e75ac am: 8071e11d87" 2017-07-27 18:45:32 +00:00
Maurice Lam
0b71195dd0 Merge "Raise CHAR LIMIT and update description" 2017-07-27 18:45:25 +00:00
Jian Zhou
3521974b8a Merge "Settings: Fix SparseArray null pointer issue in monkey issues" am: 41b4d908bb am: 3aee5e1ad0 am: 86535a3d15 am: 62bb1e75ac
am: 8071e11d87

Change-Id: I60ffd8a6328b64952176c91922411000e86a9d31
2017-07-27 18:45:20 +00:00
Ryusuke Sawa
f26d2ced82 Merge "Show Error dialog when WPS is interrupted" am: fd7dec5d4a am: b0e008841f am: 6b46a9df49 am: 775c1c8eb5
am: 653ef15253

Change-Id: I4b48899bd33466742cbe3bf93d9b5fe01d4472ea
2017-07-27 18:44:55 +00:00
jackqdyulei
66b633b71d Merge "Don't update the header when toggle menu" into oc-dr1-dev am: 4ab4966e7a am: 16afa828c7
am: 9b6a6e903d

Change-Id: I7705b7a64bfd8487d9e2d00ad1eba293ec8f096a
2017-07-27 18:44:26 +00:00
jackqdyulei
e4c555fcb8 Merge "Don't update the header when toggle menu" into oc-dr1-dev am: 4ab4966e7a
am: 8541d8905a

Change-Id: I533528c9bd97d517357a7f7babd5e756b5d97bc3
2017-07-27 18:31:56 +00:00
Jian Zhou
8071e11d87 Merge "Settings: Fix SparseArray null pointer issue in monkey issues" am: 41b4d908bb am: 3aee5e1ad0 am: 86535a3d15
am: 62bb1e75ac

Change-Id: I9dc6da68107514e839b4284a4aeab47f43f745e6
2017-07-27 18:29:03 +00:00
Ryusuke Sawa
653ef15253 Merge "Show Error dialog when WPS is interrupted" am: fd7dec5d4a am: b0e008841f am: 6b46a9df49
am: 775c1c8eb5

Change-Id: Ib66a063ebbee94370f69be336d82706da39be427
2017-07-27 18:28:17 +00:00
Jian Zhou
62bb1e75ac Merge "Settings: Fix SparseArray null pointer issue in monkey issues" am: 41b4d908bb am: 3aee5e1ad0
am: 86535a3d15

Change-Id: Ia6f34a3cf6e9b64669ca494c5088791ae5021092
2017-07-27 18:26:35 +00:00
jackqdyulei
9b6a6e903d Merge "Don't update the header when toggle menu" into oc-dr1-dev am: 4ab4966e7a
am: 16afa828c7

Change-Id: I16bcd80c82ed42f65b1490f1f8189e5e55844688
2017-07-27 18:26:24 +00:00
Ryusuke Sawa
775c1c8eb5 Merge "Show Error dialog when WPS is interrupted" am: fd7dec5d4a am: b0e008841f
am: 6b46a9df49

Change-Id: I80fff447ce87a40d7180b9e25cb53888f681b469
2017-07-27 18:26:18 +00:00
Jian Zhou
86535a3d15 Merge "Settings: Fix SparseArray null pointer issue in monkey issues" am: 41b4d908bb
am: 3aee5e1ad0

Change-Id: I2b3686a91254fd6f0a1050cf8be68304a70a03f5
2017-07-27 18:24:10 +00:00
Ryusuke Sawa
6b46a9df49 Merge "Show Error dialog when WPS is interrupted" am: fd7dec5d4a
am: b0e008841f

Change-Id: I31f65d59a105db0fc49e73c4e3d7005d0102906d
2017-07-27 18:23:51 +00:00
Jian Zhou
3aee5e1ad0 Merge "Settings: Fix SparseArray null pointer issue in monkey issues"
am: 41b4d908bb

Change-Id: If3c634811506bdc9f3de5501e60f6a662ac2873a
2017-07-27 18:22:21 +00:00
Ryusuke Sawa
b0e008841f Merge "Show Error dialog when WPS is interrupted"
am: fd7dec5d4a

Change-Id: I5ff4247745eba606c22481466f2b9a49e1c604d3
2017-07-27 18:21:19 +00:00
jackqdyulei
8541d8905a Merge "Don't update the header when toggle menu" into oc-dr1-dev
am: 4ab4966e7a

Change-Id: I3a814981c648d9b777d2fbf5a2d243864aaaee3c
2017-07-27 18:21:16 +00:00
jackqdyulei
16afa828c7 Merge "Don't update the header when toggle menu" into oc-dr1-dev
am: 4ab4966e7a

Change-Id: I323a94bc867d7575bd7ec7e34c506dd8e78ec2d1
2017-07-27 18:21:16 +00:00
Soroosh Mariooryad
3376642472 Merge "Merge "Update suggestion ranking model coefficients." into oc-dr1-dev am: c3bb4cd8c0 am: 6f0e9273f8" into oc-mr1-dev-plus-aosp
am: f0184bbc35

Change-Id: Ib1938fb8d3cc5f6b6862a0fee7b5fc2cd124ecff
2017-07-27 18:16:21 +00:00
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