Doris Ling
7499ff71be
Merge "Limit the suggestions to be shown to 5." into oc-dr1-dev am: 70f0013e43 -s ours
...
am: e1b04c987b
2017-07-27 23:56:21 +00:00
Doris Ling
1b2ec4f096
Merge "Limit the suggestions to be shown to 5." into oc-dr1-dev
...
am: 70f0013e43
2017-07-27 23:53:47 +00:00
Doris Ling
e1b04c987b
Merge "Limit the suggestions to be shown to 5." into oc-dr1-dev
...
am: 70f0013e43
2017-07-27 23:53:47 +00:00
jackqdyulei
c50495ba06
Add ResultPayload for Allow notification dots
...
Bug: 62022517
Test: robotests
Change-Id: I86caa1c8604ae8eff27574ca45b5e9f3f6830f8f
Merged-In: I86caa1c8604ae8eff27574ca45b5e9f3f6830f8f
2017-07-27 16:53:40 -07:00
TreeHugger Robot
70f0013e43
Merge "Limit the suggestions to be shown to 5." into oc-dr1-dev
2017-07-27 23:41:35 +00:00
Salvador Martinez
36dbb6e07c
Merge "Change visibility of some UsbBackend fields/methods" into oc-dr1-dev am: 7f87347eb9
...
am: 3bca521f3a
2017-07-27 22:34:00 +00:00
Salvador Martinez
3d869b6324
Merge "Change visibility of some UsbBackend fields/methods" into oc-dr1-dev am: 7f87347eb9
...
am: 8e15db0ec9
2017-07-27 22:31:42 +00:00
Salvador Martinez
3bca521f3a
Merge "Change visibility of some UsbBackend fields/methods" into oc-dr1-dev
...
am: 7f87347eb9
2017-07-27 22:26:58 +00:00
Salvador Martinez
8e15db0ec9
Merge "Change visibility of some UsbBackend fields/methods" into oc-dr1-dev
...
am: 7f87347eb9
2017-07-27 22:24:27 +00:00
Fan Zhang
578207f109
Update condition tile action button text color am: 951decebb4
...
am: 4748098d10
2017-07-27 22:20:55 +00:00
Fan Zhang
f01de6015f
Update condition tile action button text color am: 951decebb4
...
am: a5dc1d2470
2017-07-27 22:16:58 +00:00
TreeHugger Robot
7f87347eb9
Merge "Change visibility of some UsbBackend fields/methods" into oc-dr1-dev
2017-07-27 22:16:48 +00:00
Fan Zhang
a5dc1d2470
Update condition tile action button text color
...
am: 951decebb4
2017-07-27 22:10:35 +00:00
Fan Zhang
4748098d10
Update condition tile action button text color
...
am: 951decebb4
2017-07-27 22:10:35 +00:00
Ajay Nadathur
d48d323e13
Remove extra steps in fingerprint flow
...
bug: 63900851
Test: Manually tested and verified
Change-Id: Ic7ff0b21dac971edf40a9a9398aef68c2fccd971
(cherry picked from commit e24f1ab745
2017-07-27 21:57:55 +00:00
Doris Ling
a374e1062c
Merge "Limit the suggestions to be shown to 5." into oc-mr1-dev
...
am: 1f34a5cf46
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
Doris Ling
2798c24deb
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.
Change-Id: I3bbc08bb67c411ff5671a837efa40da0ac885983
Merged-In: I1efabeb2a805c670007c631d3ccb0fdfbde7b55a
Fix: 64072051
Test: make RunSettingsRoboTests
2017-07-27 12:50:47 -07:00
Fan Zhang
951decebb4
Update condition tile action button text color
...
Text color needs to be darker for accessibility reasons.
Change-Id: I3ff37f36281d70dd180c0747a707b597139157c2
Fix: 64068145
Test: visual
2017-07-27 19:29:36 +00:00
Salvador Martinez
d67f9a17ed
Change visibility of some UsbBackend fields/methods
...
Some utility methods in UsbBackend were needed elsewhere so this CL
increases their visibility slightly rather than copying the code.
Test: Robotests still pass
Bug: 62271803
Change-Id: If8ac5494e306ac7f4f6d8eeef75f516308c78026
2017-07-27 11:35:19 -07:00
jackqdyulei
e4c555fcb8
Merge "Don't update the header when toggle menu" into oc-dr1-dev am: 4ab4966e7a
...
am: 8541d8905a
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
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
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
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
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
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
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
