Jian Zhou
86535a3d15
Merge "Settings: Fix SparseArray null pointer issue in monkey issues" am: 41b4d908bb
...
am: 3aee5e1ad0
2017-07-27 18:24:10 +00:00
Ryusuke Sawa
6b46a9df49
Merge "Show Error dialog when WPS is interrupted" am: fd7dec5d4a
...
am: b0e008841f
2017-07-27 18:23:51 +00:00
Jian Zhou
3aee5e1ad0
Merge "Settings: Fix SparseArray null pointer issue in monkey issues"
...
am: 41b4d908bb
2017-07-27 18:22:21 +00:00
Ryusuke Sawa
b0e008841f
Merge "Show Error dialog when WPS is interrupted"
...
am: fd7dec5d4a
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
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
2017-07-27 18:21:16 +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
Doris Ling
d53a3128e8
Fix null pointer exception when updating action bar shadow.
...
Check for valid activity when trying to access the action bar as the
activity can become null when in monkey test.
Change-Id: I684d873b9eabb9d8461e99bb4385d411a48c0c52
Fix: 64084651
Test: make RunSettingsRoboTests
2017-07-27 11:14:44 -07: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
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
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
2017-07-27 17:56:43 +00:00
Soroosh Mariooryad
6f0e9273f8
Merge "Update suggestion ranking model coefficients." into oc-dr1-dev
...
am: c3bb4cd8c0
2017-07-27 17:54:48 +00:00
Soroosh Mariooryad
e993ab19fc
Merge "Update suggestion ranking model coefficients." into oc-dr1-dev
...
am: c3bb4cd8c0
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
Soroosh Mariooryad
c3bb4cd8c0
Merge "Update suggestion ranking model coefficients." into oc-dr1-dev
2017-07-27 17:39:04 +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
2017-07-27 12:45:52 +00:00
Julia Reynolds
81eb0697da
Merge "Revert string change" into oc-dr1-dev am: 4b8f2c9ad5
...
am: d6ab7dee09
2017-07-27 12:45:50 +00:00
Julia Reynolds
d6ab7dee09
Merge "Revert string change" into oc-dr1-dev
...
am: 4b8f2c9ad5
2017-07-27 12:43:21 +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
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
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
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
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
